[gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/

[Alexandre Restovtsev]

commit:     c8910f26e19546ce609d0049c0266188b1e00065
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 17:06:57 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Feb 26 19:20:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c8910f26

net-libs/webkit-gtk: 1.7.5 → 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=doc file collisions (bug #402699). Enable webgl by default
per upstream recommendation.

---
 ....patch => 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 => webkit-gtk-1.7.90-r200.ebuild} |   75 ++++++++++++++------
 ...5-r300.ebuild => 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.patch 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.patch
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=txt
 http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt
 
---- 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.  
-  */
--
-+#if 0
- #include "GtkVersioning.h"
- #include "xembed.h"
- #include "gtk2xtbin.h"
-@@ -951,3 +951,4 @@
- 
-   return;
- }
-+#endif
---- WebCore/plugins/gtk/PluginViewGtk.cpp.orig	2010-09-10 06:20:33.000000000 -0700
-+++ WebCore/plugins/gtk/PluginViewGtk.cpp	2010-10-06 09:45:37.000000000 -0700
-@@ -60,10 +60,13 @@
- #include "runtime_root.h"
- #include <runtime/JSLock.h>
- #include <runtime/JSValue.h>
-+#include "NotImplemented.h"
- 
- #include <gdkconfig.h>
+Adapted for 1.6.1
+
+--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
++++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
+@@ -70,6 +70,8 @@
+ #endif
  #include <gtk/gtk.h>
  
 +#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();
  }
  
@@ -41,10 +23,10 @@ http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-
  void PluginView::handleFocusInEvent()
  {
 +#if defined(XP_UNIX)
-     XEvent npEvent;
-     initXEvent(&npEvent);
+     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
+         return;
  
-@@ -453,10 +456,12 @@
+@@ -454,10 +456,12 @@
      event.detail = NotifyDetailNone;
  
      dispatchNPEvent(npEvent);
@@ -54,10 +36,10 @@ http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-
  void PluginView::handleFocusOutEvent()
  {
 +#if defined(XP_UNIX)
-     XEvent npEvent;
-     initXEvent(&npEvent);
+     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
+         return;
  
-@@ -466,8 +471,8 @@
+@@ -470,8 +474,8 @@
      event.detail = NotifyDetailNone;
  
      dispatchNPEvent(npEvent);
@@ -67,13 +49,19 @@ http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-
  
  void PluginView::setParent(ScrollView* parent)
  {
-@@ -797,8 +802,8 @@
-     }
- 
-     if (m_isWindowed) {
--#if defined(XP_UNIX)
-         GtkWidget* pageClient = 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.  
+  */
+-
++#if 0
+ #include "GtkVersioning.h"
+ #include "xembed.h"
+ #include "gtk2xtbin.h"
+@@ -966,3 +966,4 @@
  
-         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/net-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 :=
+ TEST_PROGS :=
+ POFILES :=
++PO_LINGUAS :=
++USER_LINGUAS :=
++USE_LINGUAS :=
+ MOFILES :=
+ dom_binding_idls :=
+ wtf_cppflags:=
+--- 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 @@
+ 
+ POFILES += $(shell ls $(srcdir)/Source/WebKit/gtk/po/*.po)
+ 
+-MOFILES += $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcdir)/,,g" | sed 's/\.po/.mo/g')
++PO_LINGUAS += $(patsubst $(srcdir)/Source/WebKit/gtk/po/%.po,%,$(POFILES))
++
++USER_LINGUAS += $(filter $(LINGUAS),$(PO_LINGUAS))
++
++USE_LINGUAS += $(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else LLINGUAS="$(PO_LINGUAS)"; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
++
++MOFILES += $(USE_LINGUAS:%=Source/WebKit/gtk/po/%.mo)
++
++ALL_MOFILES := $(shell echo $(POFILES) | tr ' ' '\n' | sed "s,^$(srcdir)/,,g" | sed 's/\.po/.mo/g')
+ 
+ .po.mo:
+ 	test -d Source/WebKit/gtk/po/ || mkdir -p Source/WebKit/gtk/po/
+@@ -124,11 +132,11 @@
+ 	$(top_builddir)/stamp-po
+ 
+ MAINTAINERCLEANFILES += \
+-	$(MOFILES) \
++	$(ALL_MOFILES) \
+ 	$(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot
+ 
+ DISTCLEANFILES += \
+-	$(MOFILES) \
++	$(ALL_MOFILES) \
+ 	$(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot
+ 
+ po-install-data-local: all

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-parallel-make-hack.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.patch
@@ -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)

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.90-test_garbage_collection.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 is
+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);
+ 
+-    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();
+ }
+ 

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="4"
 
 # 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-utils
 
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -18,7 +18,7 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 # geoclue
-IUSE="aqua coverage debug +gstreamer +introspection +jit spell webgl"
+IUSE="aqua coverage debug +gstreamer +introspection +jit spell +webgl"
 # bug 372493
 REQUIRED_USE="introspection? ( gstreamer )"
 
@@ -30,12 +30,12 @@ RDEPEND="
 	virtual/jpeg
 	>=media-libs/libpng-1.4:0
 	>=x11-libs/cairo-1.10
-	>=dev-libs/glib-2.27.90:2
+	>=dev-libs/glib-2.31.2:2
 	>=x11-libs/gtk+-2.13:2[aqua=,introspection?]
 	>=dev-libs/icu-3.8.1-r1
 	>=net-libs/libsoup-2.33.6:2.4[introspection?]
 	dev-db/sqlite:3
-	>=x11-libs/pango-1.12
+	>=x11-libs/pango-1.21
 	x11-libs/libXrender
 
 	gstreamer? (
@@ -49,15 +49,17 @@ RDEPEND="
 	webgl? ( virtual/opengl )
 "
 DEPEND="${RDEPEND}
+	dev-lang/perl
 	=dev-lang/python-2*
+	sys-devel/bison
 	>=sys-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
 
 S="${WORKDIR}/${MY_P}"
 
@@ -72,25 +74,44 @@ src_prepare() {
 
 	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
 	# https://bugs.webkit.org/show_bug.cgi?id=19775
-	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
 
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch
+	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
 
-	# 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=79605
+	epatch "${FILESDIR}/${PN}-1.7.5-linguas.patch"
 
-	# 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 || die
 
-	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
-	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 failures
+	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
+	gnome2_environment_reset
+
+	# https://bugs.webkit.org/show_bug.cgi?id=79498
+	epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch"
+
+	# XXX: failing tests
+	# https://bugs.webkit.org/show_bug.cgi?id=79599
+	# https://bugs.webkit.org/show_bug.cgi?id=50744
+	# 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 installed
+	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
+
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
 
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
@@ -132,17 +153,21 @@ src_configure() {
 }
 
 src_compile() {
-	# Fix sandbox error with USE="introspection"
-	# https://bugs.webkit.org/show_bug.cgi?id=35471
-	emake XDG_DATA_HOME="${T}/.local"
+	# Horrible failure of a hack to work around parallel make problems,
+	# see https://bugs.webkit.org/show_bug.cgi?id=79498
+	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
 }
 
 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="${T}/.local"
+	Xemake -j1 check
 }
 
 src_install() {
@@ -155,4 +180,8 @@ src_install() {
 
 	# 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=78134
+	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="4"
 
 # 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-utils
 
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
@@ -15,10 +15,9 @@ SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2 LGPL-2.1 BSD"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 # geoclue
-IUSE="aqua coverage debug doc +gstreamer +introspection +jit spell webgl"
+IUSE="aqua coverage debug doc +gstreamer +introspection +jit spell +webgl"
 # bug 372493
 REQUIRED_USE="introspection? ( gstreamer )"
 
@@ -32,12 +31,12 @@ RDEPEND="
 	virtual/jpeg
 	>=media-libs/libpng-1.4:0
 	>=x11-libs/cairo-1.10
-	>=dev-libs/glib-2.27.90:2
+	>=dev-libs/glib-2.31.2:2
 	>=x11-libs/gtk+-3.0:3[aqua=,introspection?]
 	>=dev-libs/icu-3.8.1-r1
 	>=net-libs/libsoup-2.37.2.1:2.4[introspection?]
 	dev-db/sqlite:3
-	>=x11-libs/pango-1.12
+	>=x11-libs/pango-1.21
 	x11-libs/libXrender
 
 	gstreamer? (
@@ -51,16 +50,18 @@ RDEPEND="
 	webgl? ( virtual/opengl )
 "
 DEPEND="${RDEPEND}
+	dev-lang/perl
 	=dev-lang/python-2*
+	sys-devel/bison
 	>=sys-devel/flex-2.5.33
 	sys-devel/gettext
-	virtual/yacc
 	dev-util/gperf
 	dev-util/pkgconfig
 	dev-util/gtk-doc-am
 	doc? ( >=dev-util/gtk-doc-1.10 )
 	test? ( x11-themes/hicolor-icon-theme )
 "
+# Need real bison, not yacc
 
 S="${WORKDIR}/${MY_P}"
 
@@ -75,25 +76,42 @@ src_prepare() {
 
 	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
 	# https://bugs.webkit.org/show_bug.cgi?id=19775
-	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
 
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch
+	use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
 
-	# 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=79605
+	epatch "${FILESDIR}/${PN}-1.7.5-linguas.patch"
+
+	# Drop DEPRECATED flags
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
 
 	# 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 failures
+	# like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669
+	gnome2_environment_reset
 
-	# 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=79498
+	epatch "${FILESDIR}/${PN}-1.7.90-parallel-make-hack.patch"
 
-	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
-	mkdir -p DerivedSources/ANGLE
+	# XXX: failing tests
+	# https://bugs.webkit.org/show_bug.cgi?id=50744
+	# 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 installed
+	epatch "${FILESDIR}/${PN}-1.7.90-test_garbage_collection.patch"
+
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
 
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
@@ -134,17 +152,21 @@ src_configure() {
 }
 
 src_compile() {
-	# Fix sandbox error with USE="introspection"
-	# https://bugs.webkit.org/show_bug.cgi?id=35471
-	emake XDG_DATA_HOME="${T}/.local"
+	# Horrible failure of a hack to work around parallel make problems,
+	# see https://bugs.webkit.org/show_bug.cgi?id=79498
+	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
 }
 
 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="${T}/.local"
+	Xemake -j1 check
 }
 
 src_install() {