diff --git a/webkit-1.3.13-gcc46-preprocessor.patch b/webkit-1.3.13-gcc46-preprocessor.patch new file mode 100644 index 0000000..b34c3b8 --- /dev/null +++ b/webkit-1.3.13-gcc46-preprocessor.patch @@ -0,0 +1,12 @@ +diff -Nur webkit-1.3.13.orig/Source/WebCore/dom/make_names.pl webkit-1.3.13/Source/WebCore/dom/make_names.pl +--- webkit-1.3.13.orig/Source/WebCore/dom/make_names.pl 2011-03-21 12:42:34.000000000 -0600 ++++ webkit-1.3.13/Source/WebCore/dom/make_names.pl 2011-04-15 21:55:42.963217070 -0600 +@@ -65,7 +65,7 @@ + } else { + $gccLocation = "/usr/bin/gcc"; + } +-my $preprocessor = $gccLocation . " -E -P -x c++"; ++my $preprocessor = $gccLocation . " -E -x c++"; + + GetOptions( + 'tags=s' => \$tagsFile, diff --git a/webkitgtk.spec b/webkitgtk.spec index eeb74ec..7a1aca0 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -35,7 +35,7 @@ Name: webkitgtk Version: 1.3.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library Provides: WebKit-gtk = %{version}-%{release} @@ -55,6 +55,7 @@ Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz ## bug. :) Patch1: webkit-1.3.12-no-execmem.patch Patch2: webkit-1.3.10-nspluginwrapper.patch +Patch3: webkit-1.3.13-gcc46-preprocessor.patch BuildRequires: bison BuildRequires: chrpath @@ -80,6 +81,7 @@ BuildRequires: gobject-introspection-devel BuildRequires: pango-devel %else BuildRequires: cairo-devel +BuildRequires: cairo-gobject-devel BuildRequires: fontconfig-devel BuildRequires: freetype-devel %endif @@ -117,6 +119,7 @@ LICENSE, README, and AUTHORS files. %setup -qn "webkit-%{version}" %patch1 -p1 -b .no-execmem %patch2 -p1 -b .nspluginwrapper +%patch3 -p1 -b .gcc46-preprocessor %build %ifarch s390 @@ -205,6 +208,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %changelog +* Fri Apr 15 2011 Kevin Fenzi - 1.3.13-2 +- Fix build issue with gcc 4.6 + * Thu Mar 24 2011 Kevin Fenzi - 1.3.13-1 - Update to 1.3.13