rpms/webkitgtk
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build issues, add new needed BuildRequires

Browse Source
This commit is contained in:
Kevin Fenzi 2011-04-16 10:31:57 -06:00
parent 2c2890ac81
commit f8f7d83dc8
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webkit-1.3.13-gcc46-preprocessor.patch Normal file
View File

@ -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,

8
webkitgtk.spec
View File

@ -35,7 +35,7 @@
Name: webkitgtk Name: webkitgtk
Version: 1.3.13 Version: 1.3.13
Release: 1%{?dist} Release: 2%{?dist}
Summary: GTK+ Web content engine library Summary: GTK+ Web content engine library
Provides: WebKit-gtk = %{version}-%{release} Provides: WebKit-gtk = %{version}-%{release}
@ -55,6 +55,7 @@ Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz
## bug. :) ## bug. :)
Patch1: webkit-1.3.12-no-execmem.patch Patch1: webkit-1.3.12-no-execmem.patch
Patch2: webkit-1.3.10-nspluginwrapper.patch Patch2: webkit-1.3.10-nspluginwrapper.patch
Patch3: webkit-1.3.13-gcc46-preprocessor.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: chrpath BuildRequires: chrpath
@ -80,6 +81,7 @@ BuildRequires: gobject-introspection-devel
BuildRequires: pango-devel BuildRequires: pango-devel
%else %else
BuildRequires: cairo-devel BuildRequires: cairo-devel
BuildRequires: cairo-gobject-devel
BuildRequires: fontconfig-devel BuildRequires: fontconfig-devel
BuildRequires: freetype-devel BuildRequires: freetype-devel
%endif %endif
@ -117,6 +119,7 @@ LICENSE, README, and AUTHORS files.
%setup -qn "webkit-%{version}" %setup -qn "webkit-%{version}"
%patch1 -p1 -b .no-execmem %patch1 -p1 -b .no-execmem
%patch2 -p1 -b .nspluginwrapper %patch2 -p1 -b .nspluginwrapper
%patch3 -p1 -b .gcc46-preprocessor
%build %build
%ifarch s390 %ifarch s390
@ -205,6 +208,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%changelog %changelog
* Fri Apr 15 2011 Kevin Fenzi <kevin@tummy.com> - 1.3.13-2
- Fix build issue with gcc 4.6
* Thu Mar 24 2011 Kevin Fenzi <kevin@tummy.com> - 1.3.13-1 * Thu Mar 24 2011 Kevin Fenzi <kevin@tummy.com> - 1.3.13-1
- Update to 1.3.13 - Update to 1.3.13