Date: Thursday, March 8, 2012 @ 12:13:48 Author: ibiru Revision: 152681
update to 1.7.91 Added: libwebkit/trunk/python.patch libwebkit/trunk/webkit-gtk-1.7.90-parallel-make-hack.patch Modified: libwebkit/trunk/PKGBUILD --------------------------------------------+ PKGBUILD | 31 ++++++++++++++++++++------- python.patch | 12 ++++++++++ webkit-gtk-1.7.90-parallel-make-hack.patch | 21 ++++++++++++++++++ 3 files changed, 57 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-03-08 13:28:23 UTC (rev 152680) +++ PKGBUILD 2012-03-08 17:13:48 UTC (rev 152681) @@ -3,21 +3,28 @@ pkgbase=libwebkit pkgname=(libwebkit libwebkit3) -pkgver=1.6.3 +pkgver=1.7.91 pkgrel=1 pkgdesc="An opensource web content engine" arch=('i686' 'x86_64') url="http://webkitgtk.org/" license=('custom') -depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant') -makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3') +depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant' 'libgl') +makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa' 'gtk-doc') options=('!libtool' '!emptydirs') install=libwebkit.install -source=(http://webkitgtk.org/webkit-$pkgver.tar.xz) -sha256sums=('12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3') +source=(http://webkitgtk.org/webkit-$pkgver.tar.xz + webkit-gtk-1.7.90-parallel-make-hack.patch + python.patch) +sha256sums=('9d9de6968c466b973988ce97e4f2f53535dd4f72356bd7b29b03ba9dab937545' + 'e20d7d45e6230308f7d4a7aac1095cb1fe8d9c7eb0f3e65b061acf8bc4bbaf73' + '29b82e47277d982bc57a7ba967d28ae76e07556986627c2e456694b699ae0e09') build() { cd "$srcdir/webkit-$pkgver" + patch -Np1 -i $srcdir/webkit-gtk-1.7.90-parallel-make-hack.patch + patch -Np1 -i $srcdir/python.patch + autoreconf -I Source/autotools -fi mkdir build-gtk{2,3} ( cd build-gtk2 && _build --with-gtk=2.0 ) @@ -29,8 +36,15 @@ --enable-introspection \ --with-font-backend=freetype \ --with-unicode-backend=icu \ + --enable-geolocation=no \ --enable-spellcheck "$@" - make all stamp-po +# make all stamp-po +# until parallel building is fixed + make all-built-sources-local + make all-ltlibraries-local + make all-programs-local + make all-data-local + make stamp-po } package_libwebkit() { @@ -38,7 +52,7 @@ depends+=(gtk2) cd "$srcdir/webkit-$pkgver/build-gtk2" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE" } @@ -50,3 +64,6 @@ make DESTDIR="$pkgdir" install install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE" } + + + Added: python.patch =================================================================== --- python.patch (rev 0) +++ python.patch 2012-03-08 17:13:48 UTC (rev 152681) @@ -0,0 +1,12 @@ +diff -Nur webkit-1.7.91.orig/Tools/GNUmakefile.am webkit-1.7.91/Tools/GNUmakefile.am +--- webkit-1.7.91.orig/Tools/GNUmakefile.am 2012-03-08 12:37:34.221447643 +0000 ++++ webkit-1.7.91/Tools/GNUmakefile.am 2012-03-08 12:53:28.713523074 +0000 +@@ -326,7 +326,7 @@ + fi; \ + fi + endif +- $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR} ++ $(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR} + + uninstall-local: + @DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \ Added: webkit-gtk-1.7.90-parallel-make-hack.patch =================================================================== --- webkit-gtk-1.7.90-parallel-make-hack.patch (rev 0) +++ webkit-gtk-1.7.90-parallel-make-hack.patch 2012-03-08 17:13:48 UTC (rev 152681) @@ -0,0 +1,21 @@ +Horrible failure of a hack to enable workaround for +https://bugs.webkit.org/show_bug.cgi?id=79498 + +--- a/GNUmakefile.am ++++ b/GNUmakefile.am +@@ -285,6 +285,15 @@ + all-local: stamp-po + $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources + ++# Horrible hack to enable workaround for parallel make failure ++all-built-sources-local: $(BUILT_SOURCES) autotoolsconfig.h ++ ++all-ltlibraries-local: GNUmakefile $(LTLIBRARIES) ++ ++all-programs-local: GNUmakefile $(PROGRAMS) ++ ++all-data-local: GNUmakefile $(DATA) ++ + # remove built sources and program directories + clean-local: + -rm -rf $(GENPROGRAMS)