rpms/WebKit/devel WebKit-bison24.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 WebKit.spec, 1.21, 1.22 sources, 1.10, 1.11
Peter Gordon
pgordon at fedoraproject.org
Fri Dec 19 07:52:30 UTC 2008
Author: pgordon
Update of /cvs/pkgs/rpms/WebKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10926
Modified Files:
.cvsignore WebKit.spec sources
Added Files:
WebKit-bison24.patch
Log Message:
Update to SVN 39370; add WML conditional; add Bison 2.4 patch; fix %_docdir ownership in doc subpackage.
WebKit-bison24.patch:
--- NEW FILE WebKit-bison24.patch ---
--- WebCore/ChangeLog.bison24~ 2008-12-18 23:36:35.871484273 +0100
+++ WebCore/ChangeLog 2008-12-18 23:39:00.790359155 +0100
@@ -0,0 +1,8 @@
+2008-12-18 Bernhard Rosenkraenzer <bero at arklinux.ch>
+
+ https://bugs.webkit.org/show_bug.cgi?id=22205
+ Fix compatibility with bison 2.4, partially based on older patch by
+ Priit Laes <amd at store20.com>
+
+ * WebCore/css/CSSGrammar.y: Made compatible with bison 2.4
+
--- WebCore/css/CSSGrammar.y.bison24~ 2008-12-05 09:19:52.000000000 +0100
+++ WebCore/css/CSSGrammar.y 2008-12-18 23:23:36.448365221 +0100
@@ -94,6 +94,8 @@ static int cssyylex(YYSTYPE* yylval, voi
%expect 49
+%nonassoc LOWEST_PREC
+
%left UNIMPORTANT_TOK
%token WHITESPACE SGML_CD
@@ -349,7 +351,7 @@ maybe_charset:
closing_brace:
'}'
- | %prec maybe_sgml TOKEN_EOF
+ | %prec LOWEST_PREC TOKEN_EOF
;
charset:
@@ -1355,10 +1357,10 @@ term:
$$.string = $1;
}
/* We might need to actually parse the number from a dimension, but we can't just put something that uses $$.string into unary_term. */
- | DIMEN maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION }
- | unary_operator DIMEN maybe_space { $$.id = 0; $$.string = $2; $$.unit = CSSPrimitiveValue::CSS_DIMENSION }
+ | DIMEN maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; }
+ | unary_operator DIMEN maybe_space { $$.id = 0; $$.string = $2; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; }
| URI maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_URI; }
- | UNICODERANGE maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_UNICODE_RANGE }
+ | UNICODERANGE maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_UNICODE_RANGE; }
| hexcolor { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; }
| '#' maybe_space { $$.id = 0; $$.string = CSSParserString(); $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; } /* Handle error case: "color: #;" */
/* FIXME: according to the specs a function can have a unary_operator in front. I know no case where this makes sense */
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 24 Oct 2008 05:17:51 -0000 1.10
+++ .cvsignore 19 Dec 2008 07:51:59 -0000 1.11
@@ -1 +1 @@
-WebKit-r37790.tar.bz2
+WebKit-r39370.tar.bz2
Index: WebKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/WebKit.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- WebKit.spec 24 Oct 2008 05:21:23 -0000 1.21
+++ WebKit.spec 19 Dec 2008 07:51:59 -0000 1.22
@@ -3,7 +3,7 @@
cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \
echo %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list
-%define svn_revision 37790
+%define svn_revision 39370
## Optional build modifications...
## --with debug: Enable more verbose debugging. Makes runtime a bit slower.
@@ -26,16 +26,21 @@
##
## --with svg: Experimental SVG support (filters)
## (Default: No)
+##
+## --with wml: Build support for WML
+## (Default: No)
+
%bcond_with debug
%bcond_with html5video
%bcond_with jit
%bcond_with libsoup
%bcond_with pango
%bcond_with svg
+%bcond_with wml
Name: WebKit
Version: 1.0.0
-Release: 0.15.svn%{svn_revision}%{?dist}
+Release: 0.16.svn%{svn_revision}%{?dist}
Summary: Web content engine library
Group: Development/Libraries
@@ -44,6 +49,10 @@
Source0: http://nightly.webkit.org/files/trunk/src/WebKit-r%{svn_revision}.tar.bz2
+## Fix compilation issues with Bison 2.4
+## https://bugs.webkit.org/show_bug.cgi?id=22205
+Patch0: %{name}-bison24.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bison
@@ -60,7 +69,6 @@
## Conditional dependencies...
%if %{with html5video}
-BuildRequires: gnome-vfs2-devel
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-base-devel
%endif
@@ -118,6 +126,7 @@
%prep
%setup -qn "%{name}-r%{svn_revision}"
+%patch0 -p0 -b .bison24
%build
@@ -134,7 +143,8 @@
%{?with_jit: --enable-jit } \
%{?with_libsoup: --with-http-backend=soup } \
%{?with_pango: --with-font-backend=pango } \
-%{?with_svg: --enable-svg-filters }
+%{?with_svg: --enable-svg-filters } \
+%{?with_wml: --enable-wml }
make %{?_smp_mflags}
@@ -179,20 +189,34 @@
%doc
%{_bindir}/jsc
%{_libdir}/libwebkit-1.0.so.*
+%{_libdir}/libtestnetscapeplugin.so.*
%{_libexecdir}/WebKit/
%files gtk-devel
%defattr(-,root,root,-)
%exclude %{_libdir}/*.la
+%{_datadir}/webkit-1.0
%{_includedir}/webkit-1.0
%{_libdir}/libwebkit-1.0.so
+%{_libdir}/libtestnetscapeplugin.so
%{_libdir}/pkgconfig/webkit-1.0.pc
+
%files doc -f docfiles.list
%defattr(-,root,root,-)
+%dir %{_docdir}/
%changelog
+* Sat Nov 29 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.16.svn39370
+- Update to new upstream snapshot (SVN 39370)
+- Fix ownership of %%_docdir in the doc subpackage.
+- Resolves: bug 473619 (WebKit : Unowned directories).
+- Adds webinspector data to the gtk-devel subpackage.
+- Add patch from upstream bug 22205 to fix compilation errors with Bison 2.4:
+ + bison24.patch
+- Add build-time conditional for WML support.
+
* Thu Oct 23 2008 Peter Gordon <peter at thecodergeek.com> 1.0.0-0.15.svn37790
- Update to new upstream snapshot (SVN 37790).
- Default to freetype font backend for improved CJK/Unicode support. (#448693)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 24 Oct 2008 05:17:51 -0000 1.10
+++ sources 19 Dec 2008 07:51:59 -0000 1.11
@@ -1 +1 @@
-49873486eeace6611a5fa138845a9abb WebKit-r37790.tar.bz2
+0f5b867df3b660511f01c2c456904da3 WebKit-r39370.tar.bz2
More information about the fedora-extras-commits
mailing list