From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S1jeM-00016x-FC for garchives@archives.gentoo.org; Sun, 26 Feb 2012 19:20:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA6C2E130A; Sun, 26 Feb 2012 19:20:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 75C74E130A for ; Sun, 26 Feb 2012 19:20:40 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E0491B4011 for ; Sun, 26 Feb 2012 19:20:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D84A9E53FD for ; Sun, 26 Feb 2012 19:20:37 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1330284003.c8910f26e19546ce609d0049c0266188b1e00065.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch net-libs/webkit-gtk/files/webkit-gtk-1.7.5-linguas.patch net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-hack.patch net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.patch net-libs/webkit-gtk/webkit-gtk-1.7.5-r200.ebuild net-libs/webkit-gtk/webkit-gtk-1.7.5-r300.ebuild net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: c8910f26e19546ce609d0049c0266188b1e00065 X-VCS-Branch: master Date: Sun, 26 Feb 2012 19:20:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ca0cbf8a-0910-4788-9ff7-ecb883c6a084 X-Archives-Hash: 5a74b5eaf4a32699e69dd9873589bb25 commit: c8910f26e19546ce609d0049c0266188b1e00065 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Sun Feb 26 17:06:57 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Sun Feb 26 19:20:03 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dc8910f26 net-libs/webkit-gtk: 1.7.5 =E2=86=92 1.7.90 Bump and sync with gx86. Add ugly workaround for parallel make issues, disable failing tests, add patch to respect LINGUAS (bug #403049), work around USE=3Ddoc file collisions (bug #402699). Enable webgl by default per upstream recommendation. --- ....patch =3D> webkit-gtk-1.6.1-darwin-quartz.patch} | 72 ++++++++----= ------- .../files/webkit-gtk-1.7.5-linguas.patch | 47 ++++++++++++ .../webkit-gtk-1.7.90-parallel-make-hack.patch | 21 ++++++ ...webkit-gtk-1.7.90-test_garbage_collection.patch | 18 +++++ ...5-r200.ebuild =3D> webkit-gtk-1.7.90-r200.ebuild} | 75 ++++++++++++= ++------ ...5-r300.ebuild =3D> webkit-gtk-1.7.90-r300.ebuild} | 68 ++++++++++++= ------ 6 files changed, 213 insertions(+), 88 deletions(-) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.pat= ch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch similarity index 50% rename from net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patc= h rename to net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch index fe1ebc4..5ad357e 100644 --- a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch @@ -1,39 +1,21 @@ +Original from: http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch= -quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=3Dtxt http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch= -quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=3Dtxt =20 ---- WebCore/plugins/gtk/gtk2xtbin.c.orig 2010-09-10 06:20:33.000000000 -= 0700 -+++ WebCore/plugins/gtk/gtk2xtbin.c 2010-10-06 09:45:37.000000000 -0700 -@@ -41,7 +41,7 @@ - * The GtkXtBin widget allows for Xt toolkit code to be used - * inside a GTK application. =20 - */ -- -+#if 0 - #include "GtkVersioning.h" - #include "xembed.h" - #include "gtk2xtbin.h" -@@ -951,3 +951,4 @@ -=20 - return; - } -+#endif ---- WebCore/plugins/gtk/PluginViewGtk.cpp.orig 2010-09-10 06:20:33.00000= 0000 -0700 -+++ WebCore/plugins/gtk/PluginViewGtk.cpp 2010-10-06 09:45:37.000000000 = -0700 -@@ -60,10 +60,13 @@ - #include "runtime_root.h" - #include - #include -+#include "NotImplemented.h" -=20 - #include +Adapted for 1.6.1 + +--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp ++++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp +@@ -70,6 +70,8 @@ + #endif #include =20 +#undef XP_UNIX + #if defined(XP_UNIX) + #include "RefPtrCairo.h" #include "gtk2xtbin.h" - #define Bool int // this got undefined somewhere -@@ -441,9 +444,9 @@ +@@ -439,9 +441,9 @@ event->setDefaultHandled(); } =20 @@ -41,10 +23,10 @@ http://trac.macports.org/browser/trunk/dports/www/web= kit-gtk/files/patch-quartz- void PluginView::handleFocusInEvent() { +#if defined(XP_UNIX) - XEvent npEvent; - initXEvent(&npEvent); + if (!m_isStarted || m_status !=3D PluginStatusLoadedSuccessfully) + return; =20 -@@ -453,10 +456,12 @@ +@@ -454,10 +456,12 @@ event.detail =3D NotifyDetailNone; =20 dispatchNPEvent(npEvent); @@ -54,10 +36,10 @@ http://trac.macports.org/browser/trunk/dports/www/web= kit-gtk/files/patch-quartz- void PluginView::handleFocusOutEvent() { +#if defined(XP_UNIX) - XEvent npEvent; - initXEvent(&npEvent); + if (!m_isStarted || m_status !=3D PluginStatusLoadedSuccessfully) + return; =20 -@@ -466,8 +471,8 @@ +@@ -470,8 +474,8 @@ event.detail =3D NotifyDetailNone; =20 dispatchNPEvent(npEvent); @@ -67,13 +49,19 @@ http://trac.macports.org/browser/trunk/dports/www/web= kit-gtk/files/patch-quartz- =20 void PluginView::setParent(ScrollView* parent) { -@@ -797,8 +802,8 @@ - } -=20 - if (m_isWindowed) { --#if defined(XP_UNIX) - GtkWidget* pageClient =3D m_parentFrame->view()->hostWindow()->= platformPageClient(); -+#if defined(XP_UNIX) +--- Source/WebCore/plugins/gtk/gtk2xtbin.c ++++ Source/WebCore/plugins/gtk/gtk2xtbin.c +@@ -41,7 +41,7 @@ + * The GtkXtBin widget allows for Xt toolkit code to be used + * inside a GTK application. =20 + */ +- ++#if 0 + #include "GtkVersioning.h" + #include "xembed.h" + #include "gtk2xtbin.h" +@@ -966,3 +966,4 @@ =20 - if (m_needsXEmbed) { - // If our parent is not anchored the startup process will + return; + } ++#endif diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.5-linguas.patch b/n= et-libs/webkit-gtk/files/webkit-gtk-1.7.5-linguas.patch new file mode 100644 index 0000000..df14a5c --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.7.5-linguas.patch @@ -0,0 +1,47 @@ +Respect intltool's LINGUAS variable for building translations. + +--- a/webkit-1.7.5/GNUmakefile.am ++++ b/webkit-1.7.5/GNUmakefile.am +@@ -54,6 +54,9 @@ + IDL_BINDINGS :=3D + TEST_PROGS :=3D + POFILES :=3D ++PO_LINGUAS :=3D ++USER_LINGUAS :=3D ++USE_LINGUAS :=3D + MOFILES :=3D + dom_binding_idls :=3D + wtf_cppflags:=3D +--- a/webkit-1.7.5/Source/WebKit/gtk/po/GNUmakefile.am ++++ b/webkit-1.7.5/Source/WebKit/gtk/po/GNUmakefile.am +@@ -27,7 +27,15 @@ +=20 + POFILES +=3D $(shell ls $(srcdir)/Source/WebKit/gtk/po/*.po) +=20 +-MOFILES +=3D $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcdir)/= ,,g" | sed 's/\.po/.mo/g') ++PO_LINGUAS +=3D $(patsubst $(srcdir)/Source/WebKit/gtk/po/%.po,%,$(POFI= LES)) ++ ++USER_LINGUAS +=3D $(filter $(LINGUAS),$(PO_LINGUAS)) ++ ++USE_LINGUAS +=3D $(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)= "; then LLINGUAS=3D"$(USER_LINGUAS)"; else LLINGUAS=3D"$(PO_LINGUAS)"; fi= ; for lang in $$LLINGUAS; do printf "$$lang "; done) ++ ++MOFILES +=3D $(USE_LINGUAS:%=3DSource/WebKit/gtk/po/%.mo) ++ ++ALL_MOFILES :=3D $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcd= ir)/,,g" | sed 's/\.po/.mo/g') +=20 + .po.mo: + test -d Source/WebKit/gtk/po/ || mkdir -p Source/WebKit/gtk/po/ +@@ -124,11 +132,11 @@ + $(top_builddir)/stamp-po +=20 + MAINTAINERCLEANFILES +=3D \ +- $(MOFILES) \ ++ $(ALL_MOFILES) \ + $(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot +=20 + DISTCLEANFILES +=3D \ +- $(MOFILES) \ ++ $(ALL_MOFILES) \ + $(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot +=20 + po-install-data-local: all diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-ha= ck.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-hack= .patch new file mode 100644 index 0000000..b632ca2 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-hack.patc= h @@ -0,0 +1,21 @@ +Horrible failure of a hack to enable workaround for +https://bugs.webkit.org/show_bug.cgi?id=3D79498 + +--- a/GNUmakefile.am ++++ b/GNUmakefile.am +@@ -285,6 +285,15 @@ + all-local: stamp-po + $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources +=20 ++# 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) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_col= lection.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_= collection.patch new file mode 100644 index 0000000..577c249 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection= .patch @@ -0,0 +1,18 @@ +Garbage collection test fails intermittently if icedtea browser plugin i= s +installed. + +--- a/Source/WebKit/gtk/tests/testdomdocument.c ++++ b/Source/WebKit/gtk/tests/testdomdocument.c +@@ -353,12 +353,6 @@ + test_dom_document_get_links, + dom_document_fixture_teardown); +=20 +- g_test_add("/webkit/domdocument/test_garbage_collection", +- DomDocumentFixture, HTML_DOCUMENT_LINKS, +- dom_document_fixture_setup, +- test_dom_document_garbage_collection, +- dom_document_fixture_teardown); +- + return g_test_run(); + } +=20 diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.5-r200.ebuild b/net-libs/= webkit-gtk/webkit-gtk-1.7.90-r200.ebuild similarity index 62% rename from net-libs/webkit-gtk/webkit-gtk-1.7.5-r200.ebuild rename to net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild index b4b0f8b..4e44011 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.7.5-r200.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.7.90-r200.ebuild @@ -5,7 +5,7 @@ EAPI=3D"4" =20 # Don't define PYTHON_DEPEND: python only needed at build time -inherit autotools eutils flag-o-matic eutils python virtualx +inherit autotools eutils flag-o-matic eutils python virtualx gnome2-util= s =20 MY_P=3D"webkit-${PV}" DESCRIPTION=3D"Open source web browser engine" @@ -18,7 +18,7 @@ SLOT=3D"2" KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" # geoclue -IUSE=3D"aqua coverage debug +gstreamer +introspection +jit spell webgl" +IUSE=3D"aqua coverage debug +gstreamer +introspection +jit spell +webgl" # bug 372493 REQUIRED_USE=3D"introspection? ( gstreamer )" =20 @@ -30,12 +30,12 @@ RDEPEND=3D" virtual/jpeg >=3Dmedia-libs/libpng-1.4:0 >=3Dx11-libs/cairo-1.10 - >=3Ddev-libs/glib-2.27.90:2 + >=3Ddev-libs/glib-2.31.2:2 >=3Dx11-libs/gtk+-2.13:2[aqua=3D,introspection?] >=3Ddev-libs/icu-3.8.1-r1 >=3Dnet-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 - >=3Dx11-libs/pango-1.12 + >=3Dx11-libs/pango-1.21 x11-libs/libXrender =20 gstreamer? ( @@ -49,15 +49,17 @@ RDEPEND=3D" webgl? ( virtual/opengl ) " DEPEND=3D"${RDEPEND} + dev-lang/perl =3Ddev-lang/python-2* + sys-devel/bison >=3Dsys-devel/flex-2.5.33 sys-devel/gettext - virtual/yacc dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am test? ( x11-themes/hicolor-icon-theme ) " +# Need real bison, not yacc =20 S=3D"${WORKDIR}/${MY_P}" =20 @@ -72,25 +74,44 @@ src_prepare() { =20 # FIXME: Fix unaligned accesses on ARM, IA64 and SPARC # https://bugs.webkit.org/show_bug.cgi?id=3D19775 - use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch + # TODO: FAILS TO APPLY! + #use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch =20 # intermediate MacPorts hack while upstream bug is not fixed properly # https://bugs.webkit.org/show_bug.cgi?id=3D28727 - use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch + use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch =20 - # Fix build on Darwin8 (10.4 Tiger) - # XXX: Fails to apply - #epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch + # Bug #403049, https://bugs.webkit.org/show_bug.cgi?id=3D79605 + epatch "${FILESDIR}/${PN}-1.7.5-linguas.patch" =20 - # Don't force -O2 - sed -i 's/-O2//g' "${S}"/configure.ac - - # Don't build tests if not needed, part of bug #343249 - # XXX: Fails to apply - #epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch" + # Drop DEPRECATED flags + sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || d= ie =20 - # Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=3D69085 - mkdir -p DerivedSources/ANGLE + # Don't force -O2 + sed -i 's/-O2//g' "${S}"/configure.ac || die + + # We need to reset some variables to prevent permissions problems and f= ailures + # like https://bugs.webkit.org/show_bug.cgi?id=3D35471 and bug #323669 + gnome2_environment_reset + + # https://bugs.webkit.org/show_bug.cgi?id=3D79498 + epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch" + + # XXX: failing tests + # https://bugs.webkit.org/show_bug.cgi?id=3D79599 + # https://bugs.webkit.org/show_bug.cgi?id=3D50744 + # testkeyevents is interactive + # mimehandling test sometimes fails under Xvfb (works fine manually) + sed -e '/Programs\/unittests\/testwebview/ d' \ + -e '/Programs\/unittests\/testwebinspector/ d' \ + -e '/Programs\/unittests\/testkeyevents/ d' \ + -e '/Programs\/unittests\/testmimehandling/ d' \ + -i Source/WebKit/gtk/GNUmakefile.am || die + # garbage collection test fails intermittently if icedtea-web is instal= led + epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch" + + # Respect CC, otherwise fails on prefix #395875 + tc-export CC =20 # Prevent maintainer mode from being triggered during make AT_M4DIR=3DSource/autotools eautoreconf @@ -132,17 +153,21 @@ src_configure() { } =20 src_compile() { - # Fix sandbox error with USE=3D"introspection" - # https://bugs.webkit.org/show_bug.cgi?id=3D35471 - emake XDG_DATA_HOME=3D"${T}/.local" + # Horrible failure of a hack to work around parallel make problems, + # see https://bugs.webkit.org/show_bug.cgi?id=3D79498 + emake all-built-sources-local + emake all-ltlibraries-local + emake all-programs-local + use introspection && emake WebKit-1.0.gir + emake all-data-local + default } =20 src_test() { unset DISPLAY # Tests need virtualx, bug #294691, bug #310695 - # Set XDG_DATA_HOME for introspection tools, bug #323669 # Parallel tests sometimes fail - Xemake -j1 check XDG_DATA_HOME=3D"${T}/.local" + Xemake -j1 check } =20 src_install() { @@ -155,4 +180,8 @@ src_install() { =20 # Remove .la files find "${D}" -name '*.la' -exec rm -f '{}' + + + # File collisions with slot 3 + # bug #402699, https://bugs.webkit.org/show_bug.cgi?id=3D78134 + rm -rf "${ED}usr/share/gtk-doc" || die } diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.5-r300.ebuild b/net-libs/= webkit-gtk/webkit-gtk-1.7.90-r300.ebuild similarity index 65% rename from net-libs/webkit-gtk/webkit-gtk-1.7.5-r300.ebuild rename to net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild index 8dd0c8c..bf6320a 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.7.5-r300.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.7.90-r300.ebuild @@ -5,7 +5,7 @@ EAPI=3D"4" =20 # Don't define PYTHON_DEPEND: python only needed at build time -inherit autotools eutils flag-o-matic eutils python virtualx +inherit autotools eutils flag-o-matic eutils python virtualx gnome2-util= s =20 MY_P=3D"webkit-${PV}" DESCRIPTION=3D"Open source web browser engine" @@ -15,10 +15,9 @@ SRC_URI=3D"http://www.webkitgtk.org/${MY_P}.tar.xz" =20 LICENSE=3D"LGPL-2 LGPL-2.1 BSD" SLOT=3D"3" -KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd -~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~= x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" # geoclue -IUSE=3D"aqua coverage debug doc +gstreamer +introspection +jit spell web= gl" +IUSE=3D"aqua coverage debug doc +gstreamer +introspection +jit spell +we= bgl" # bug 372493 REQUIRED_USE=3D"introspection? ( gstreamer )" =20 @@ -32,12 +31,12 @@ RDEPEND=3D" virtual/jpeg >=3Dmedia-libs/libpng-1.4:0 >=3Dx11-libs/cairo-1.10 - >=3Ddev-libs/glib-2.27.90:2 + >=3Ddev-libs/glib-2.31.2:2 >=3Dx11-libs/gtk+-3.0:3[aqua=3D,introspection?] >=3Ddev-libs/icu-3.8.1-r1 >=3Dnet-libs/libsoup-2.37.2.1:2.4[introspection?] dev-db/sqlite:3 - >=3Dx11-libs/pango-1.12 + >=3Dx11-libs/pango-1.21 x11-libs/libXrender =20 gstreamer? ( @@ -51,16 +50,18 @@ RDEPEND=3D" webgl? ( virtual/opengl ) " DEPEND=3D"${RDEPEND} + dev-lang/perl =3Ddev-lang/python-2* + sys-devel/bison >=3Dsys-devel/flex-2.5.33 sys-devel/gettext - virtual/yacc dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=3Ddev-util/gtk-doc-1.10 ) test? ( x11-themes/hicolor-icon-theme ) " +# Need real bison, not yacc =20 S=3D"${WORKDIR}/${MY_P}" =20 @@ -75,25 +76,42 @@ src_prepare() { =20 # FIXME: Fix unaligned accesses on ARM, IA64 and SPARC # https://bugs.webkit.org/show_bug.cgi?id=3D19775 - use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch + # TODO: FAILS TO APPLY! + #use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch =20 # intermediate MacPorts hack while upstream bug is not fixed properly # https://bugs.webkit.org/show_bug.cgi?id=3D28727 - use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch + use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch =20 - # Fix build on Darwin8 (10.4 Tiger) - # XXX: Fails to apply - #epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch + # Bug #403049, https://bugs.webkit.org/show_bug.cgi?id=3D79605 + epatch "${FILESDIR}/${PN}-1.7.5-linguas.patch" + + # Drop DEPRECATED flags + sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || d= ie =20 # Don't force -O2 - sed -i 's/-O2//g' "${S}"/configure.ac + sed -i 's/-O2//g' "${S}"/configure.ac || die + + # We need to reset some variables to prevent permissions problems and f= ailures + # like https://bugs.webkit.org/show_bug.cgi?id=3D35471 and bug #323669 + gnome2_environment_reset =20 - # Don't build tests if not needed, part of bug #343249 - # XXX: Fails to apply - #epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch" + # https://bugs.webkit.org/show_bug.cgi?id=3D79498 + epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch" =20 - # Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=3D69085 - mkdir -p DerivedSources/ANGLE + # XXX: failing tests + # https://bugs.webkit.org/show_bug.cgi?id=3D50744 + # testkeyevents is interactive + # mimehandling test sometimes fails under Xvfb (works fine manually) + sed -e '/Programs\/unittests\/testwebinspector/ d' \ + -e '/Programs\/unittests\/testkeyevents/ d' \ + -e '/Programs\/unittests\/testmimehandling/ d' \ + -i Source/WebKit/gtk/GNUmakefile.am || die + # garbage collection test fails intermittently if icedtea-web is instal= led + epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch" + + # Respect CC, otherwise fails on prefix #395875 + tc-export CC =20 # Prevent maintainer mode from being triggered during make AT_M4DIR=3DSource/autotools eautoreconf @@ -134,17 +152,21 @@ src_configure() { } =20 src_compile() { - # Fix sandbox error with USE=3D"introspection" - # https://bugs.webkit.org/show_bug.cgi?id=3D35471 - emake XDG_DATA_HOME=3D"${T}/.local" + # Horrible failure of a hack to work around parallel make problems, + # see https://bugs.webkit.org/show_bug.cgi?id=3D79498 + emake all-built-sources-local + emake all-ltlibraries-local + emake all-programs-local + use introspection && emake WebKit-3.0.gir + emake all-data-local + default } =20 src_test() { unset DISPLAY # Tests need virtualx, bug #294691, bug #310695 - # Set XDG_DATA_HOME for introspection tools, bug #323669 # Parallel tests sometimes fail - Xemake -j1 check XDG_DATA_HOME=3D"${T}/.local" + Xemake -j1 check } =20 src_install() {