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

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     4cad3e96653a1c2801b5475b1adfb00c2fce3b7c
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 21:59:38 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Thu Mar  3 08:57:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4cad3e96

net-libs/webkit-gtk: sync with tree

---
 .../files/webkit-gtk-1.1.15.2-unaligned.patch      |  139 --------------------
 .../files/webkit-gtk-1.2.5-darwin-quartz.patch     |   79 +++++++++++
 .../files/webkit-gtk-1.2.5-darwin8.patch           |   33 +++++
 .../files/webkit-gtk-1.2.5-tests-build.patch       |   22 +++
 net-libs/webkit-gtk/webkit-gtk-1.3.12-r1.ebuild    |   59 +++++----
 net-libs/webkit-gtk/webkit-gtk-1.3.12-r200.ebuild  |   69 ++++++----
 6 files changed, 212 insertions(+), 189 deletions(-)

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.1.15.2-unaligned.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.1.15.2-unaligned.patch
deleted file mode 100644
index ae2d921..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.1.15.2-unaligned.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- webkit-1.1.16.orig/JavaScriptCore/wtf/Platform.h
-+++ webkit-1.1.16/JavaScriptCore/wtf/Platform.h
-@@ -347,6 +347,23 @@
- #define WTF_PLATFORM_X86_64 1
- #endif
- 
-+/* PLATFORM(IA64) */
-+#if defined(__ia64__)
-+#define WTF_PLATFORM_IA64 1
-+#endif
-+
-+/* PLATFORM(ALPHA) */
-+#if defined(__alpha__)
-+#define WTF_PLATFORM_ALPHA 1
-+#endif
-+
-+/* PLATFORM(SPARC) */
-+#if   defined(__sparc__) \
-+   || defined(__sparc)
-+#define WTF_PLATFORM_SPARC 1
-+#define WTF_PLATFORM_BIG_ENDIAN 1
-+#endif
-+
- /* PLATFORM(SH4) */
- #if defined(__SH4__)
- #define WTF_PLATFORM_SH4 1
-@@ -372,6 +389,16 @@
- #   endif
- #endif
- 
-+/* For undefined platforms */
-+#if !defined(WTF_PLATFORM_BIG_ENDIAN) && !defined(WTF_PLATFORM_MIDDLE_ENDIAN)
-+#include <sys/param.h>
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+#define WTF_PLATFORM_BIG_ENDIAN 1
-+#elif  __BYTE_ORDER == __PDP_ENDIAN
-+#define WTF_PLATFORM_MIDDLE_ENDIAN 1
-+#endif
-+#endif
-+
- /* Compiler */
- 
- /* COMPILER(MSVC) */
-@@ -703,7 +730,7 @@
- #endif
- 
- #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX))
-+#if (PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(FREEBSD))) || PLATFORM(IA64) || PLATFORM(ALPHA)
- #define WTF_USE_JSVALUE64 1
- #elif PLATFORM(ARM) || PLATFORM(PPC64)
- #define WTF_USE_JSVALUE32 1
---- webkit-1.1.16.orig/JavaScriptCore/wtf/ListHashSet.h
-+++ webkit-1.1.16/JavaScriptCore/wtf/ListHashSet.h
-@@ -127,7 +127,7 @@
-             : m_freeList(pool())
-             , m_isDoneWithInitialFreeList(false)
-         { 
--            memset(m_pool.pool, 0, sizeof(m_pool.pool));
-+            memset(m_pool, 0, sizeof(m_pool));
-         }
- 
-         Node* allocate()
-@@ -171,7 +171,7 @@
-         }
- 
-     private:
--        Node* pool() { return reinterpret_cast<Node*>(m_pool.pool); }
-+        Node* pool() { return reinterpret_cast<Node*>(m_pool); }
-         Node* pastPool() { return pool() + m_poolSize; }
- 
-         bool inPool(Node* node)
-@@ -182,10 +182,7 @@
-         Node* m_freeList;
-         bool m_isDoneWithInitialFreeList;
-         static const size_t m_poolSize = 256;
--        union {
--            char pool[sizeof(Node) * m_poolSize];
--            double forAlignment;
--        } m_pool;
-+        uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)];
-     };
- 
-     template<typename ValueArg> struct ListHashSetNode {
---- webkit-1.1.16.orig/JavaScriptCore/wtf/FastMalloc.cpp
-+++ webkit-1.1.16/JavaScriptCore/wtf/FastMalloc.cpp
-@@ -2259,13 +2259,13 @@
- 
- // Page-level allocator
- static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
--static void* pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(void*) - 1) / sizeof(void*)];
-+static uint64_t pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
- static bool phinited = false;
- 
- // Avoid extra level of indirection by making "pageheap" be just an alias
- // of pageheap_memory.
- typedef union {
--    void* m_memory;
-+    uint64_t* m_memory;
-     TCMalloc_PageHeap* m_pageHeap;
- } PageHeapUnion;
- 
---- webkit-1.1.16.orig/WebCore/platform/text/AtomicString.cpp
-+++ webkit-1.1.16/WebCore/platform/text/AtomicString.cpp
-@@ -103,7 +103,7 @@
-     if (string->length() != length)
-         return false;
- 
--#if PLATFORM(ARM) || PLATFORM(SH4)
-+#if PLATFORM(ARM) || PLATFORM(SPARC) || PLATFORM(SH4)
-     const UChar* stringCharacters = string->characters();
-     for (unsigned i = 0; i != length; ++i) {
-         if (*stringCharacters++ != *characters++)
---- webkit-1.1.16.orig/WebCore/platform/text/StringHash.h
-+++ webkit-1.1.16/WebCore/platform/text/StringHash.h
-@@ -47,6 +47,15 @@
-             if (aLength != bLength)
-                 return false;
- 
-+#if PLATFORM(ARM) || PLATFORM(SPARC)
-+            const UChar* aChars = a->characters();
-+            const UChar* bChars = b->characters();
-+            for (unsigned i = 0; i != aLength; ++i)
-+                if (*aChars++ != *bChars++)
-+                    return false;
-+
-+            return true;
-+#else
-             const uint32_t* aChars = reinterpret_cast<const uint32_t*>(a->characters());
-             const uint32_t* bChars = reinterpret_cast<const uint32_t*>(b->characters());
- 
-@@ -59,6 +68,7 @@
-                 return false;
- 
-             return true;
-+#endif
-         }
- 
-         static unsigned hash(const RefPtr<StringImpl>& key) { return key->hash(); }
\ No newline at end of file

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.2.5-darwin-quartz.patch
new file mode 100644
index 0000000..fe1ebc4
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin-quartz.patch
@@ -0,0 +1,79 @@
+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>
+ #include <gtk/gtk.h>
+ 
++#undef XP_UNIX
++
+ #if defined(XP_UNIX)
+ #include "gtk2xtbin.h"
+ #define Bool int // this got undefined somewhere
+@@ -441,9 +444,9 @@
+         event->setDefaultHandled();
+ }
+ 
+-#if defined(XP_UNIX)
+ void PluginView::handleFocusInEvent()
+ {
++#if defined(XP_UNIX)
+     XEvent npEvent;
+     initXEvent(&npEvent);
+ 
+@@ -453,10 +456,12 @@
+     event.detail = NotifyDetailNone;
+ 
+     dispatchNPEvent(npEvent);
++#endif
+ }
+ 
+ void PluginView::handleFocusOutEvent()
+ {
++#if defined(XP_UNIX)
+     XEvent npEvent;
+     initXEvent(&npEvent);
+ 
+@@ -466,8 +471,8 @@
+     event.detail = NotifyDetailNone;
+ 
+     dispatchNPEvent(npEvent);
+-}
+ #endif
++}
+ 
+ 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)
+ 
+         if (m_needsXEmbed) {
+             // If our parent is not anchored the startup process will

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch
new file mode 100644
index 0000000..cf25b5d
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-darwin8.patch
@@ -0,0 +1,33 @@
+https://bugs.webkit.org/show_bug.cgi?id=39847
+
+additionally, also on Darwin8 glib stuff includes system headers that
+use isascii, so we can't have it die on that.
+
+--- JavaScriptCore/wtf/FastMalloc.cpp
++++ JavaScriptCore/wtf/FastMalloc.cpp
+@@ -1381,14 +1381,12 @@
+   // Bytes allocated from system
+   uint64_t system_bytes_;
+ 
+-#if USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY
+   // Number of pages kept in free lists that are still committed.
+   Length free_committed_pages_;
+ 
+   // Minimum number of free committed pages since last scavenge. (Can be 0 if
+   // we've committed new pages since the last scavenge.)
+   Length min_free_committed_pages_since_last_scavenge_;
+-#endif
+ 
+   bool GrowHeap(Length n);
+ 
+--- WebCore/config.h
++++ WebCore/config.h
+@@ -125,7 +125,7 @@
+ // this breaks compilation of <QFontDatabase>, at least, so turn it off for now
+ // Also generates errors on wx on Windows, presumably because these functions
+ // are used from wx headers.
+-#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM)
++#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !defined(BUILDING_ON_TIGER)
+ #include <wtf/DisallowCType.h>
+ #endif
+ 

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch
new file mode 100644
index 0000000..0d9e144
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.2.5-tests-build.patch
@@ -0,0 +1,22 @@
+Do not build tests if not requested to.
+
+--- a/GNUmakefile.am	2010-12-21 17:23:58.000000000 +0100
++++ b/GNUmakefile.am	2010-12-21 17:24:28.000000000 +0100
+@@ -46,7 +46,8 @@
+ 
+ # Libraries and support components
+ bin_PROGRAMS :=
++check_PROGRAMS :=
+ noinst_PROGRAMS :=
+ noinst_HEADERS :=
+ noinst_LTLIBRARIES :=
+ lib_LIBRARIES :=
+@@ -541,7 +541,7 @@
+ include WebKit/gtk/po/GNUmakefile.am
+ 
+ # Build unit tests
+-noinst_PROGRAMS += $(TEST_PROGS)
++check_PROGRAMS += $(TEST_PROGS)
+ 
+ webkit_tests_cflags = \
+ 	-fno-strict-aliasing \

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.3.12-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.3.12-r1.ebuild
index 6c259f3..5a0d593 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.3.12-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.3.12-r1.ebuild
@@ -19,18 +19,17 @@ IUSE="coverage debug doc +gstreamer +introspection +jit spell"
 
 # use sqlite, svg by default
 # dependency on >=x11-libs/gtk+-2.13:2 for gail
-# XXX: Quartz patch does not apply
-# >=x11-libs/gtk+-2.13:2[aqua=]
+# Aqua support in gtk3 is untested
 RDEPEND="
-	dev-libs/libxml2
+	dev-libs/libxml2:2
 	dev-libs/libxslt
-	media-libs/jpeg:0
-	media-libs/libpng
+	virtual/jpeg
+	media-libs/libpng:0
 	x11-libs/cairo
-	>=dev-libs/glib-2.27.90
+	>=dev-libs/glib-2.27.90:2
 	>=x11-libs/gtk+-3.0:3
 	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.33.6
+	>=net-libs/libsoup-2.33.6:2.4
 	>=dev-db/sqlite-3
 	>=x11-libs/pango-1.12
 
@@ -44,32 +43,40 @@ RDEPEND="
 	spell? (
 		>=app-text/enchant-0.22 )"
 
-
 DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.33
 	sys-devel/gettext
 	dev-util/gperf
 	dev-util/pkgconfig
 	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.10 )"
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	test? ( x11-themes/hicolor-icon-theme )"
 
 S="${WORKDIR}/${MY_P}"
 
 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.1.15.2-unaligned.patch
+	use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
 
 	epatch "${FILESDIR}/${P}-utf-decode-v1.patch"
 	epatch "${FILESDIR}/${P}-utf-decode-v2.patch"
 
-	# Darwin/Aqua build is broken, needs autoreconf
-	# XXX: BROKEN. Patch does not apply anymore.
+	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	#epatch "${FILESDIR}"/${PN}-1.1.15.4-darwin-quartz.patch
+	use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch
+
+	# Fix build on Darwin8 (10.4 Tiger)
+	# XXX: Fails to apply
+	#epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch
 
 	# Don't force -O2
 	sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed"
+
+	# Don't build tests if not needed, part of bug #343249
+	# XXX: Fails to apply
+	#epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
+
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
 }
@@ -78,13 +85,15 @@ src_configure() {
 	# It doesn't compile on alpha without this in LDFLAGS
 	use alpha && append-ldflags "-Wl,--no-relax"
 
-	# Sigbuses on SPARC with mcpu
+	# Sigbuses on SPARC with mcpu and co.
 	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
 
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
 	local myconf
 
 	# XXX: Check Web Audio support
-	# XXX: websockets disabled due to security issue in protocol
 	# XXX: webgl fails compilation
 	# XXX: Wtf is WebKit2?
 	myconf="
@@ -98,24 +107,28 @@ src_configure() {
 		--with-gtk=3.0
 		--disable-webkit2
 		--disable-web-sockets"
-		# quartz patch above does not apply anymore
-		#$(use aqua && echo "--with-target=quartz")"
+		# Aqua support in gtk3 is untested
+		#$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+		# Disable web-sockets per bug #326547
 
 	econf ${myconf}
 }
 
-src_test() {
-	unset DISPLAY
-	# Tests will fail without it, bug 294691, bug 310695
-	Xemake check || die "Test phase failed"
-}
-
 src_compile() {
 	# XXX: This step is required so we properly build gettext catalogs
 	emake update-po || die "Compile failed"
+	# Fix sandbox error with USE="introspection"
+	# https://bugs.webkit.org/show_bug.cgi?id=35471
 	emake XDG_DATA_HOME="${T}/.local" || die "Compile failed"
 }
 
+src_test() {
+	unset DISPLAY
+	# Tests need virtualx, bug #294691, bug #310695
+	# Set XDG_DATA_HOME for introspection tools, bug #323669
+	Xemake check XDG_DATA_HOME="${T}/.local" || die "Test phase failed"
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "Install failed"
 	dodoc Source/WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed"

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.3.12-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.3.12-r200.ebuild
index 869c130..ab64243 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.3.12-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.3.12-r200.ebuild
@@ -14,23 +14,21 @@ SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
 LICENSE="LGPL-2 LGPL-2.1 BSD"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-# aqua, geoclue
-IUSE="coverage debug doc spell +gstreamer +introspection +jit"
+# geoclue
+IUSE="aqua coverage debug doc spell +gstreamer +introspection +jit"
 
 # use sqlite, svg by default
 # dependency on >=x11-libs/gtk+-2.13:2 for gail
-# XXX: Quartz patch does not apply
-# >=x11-libs/gtk+-2.13:2[aqua=]
 RDEPEND="
-	dev-libs/libxml2
+	dev-libs/libxml2:2
 	dev-libs/libxslt
-	media-libs/jpeg:0
-	media-libs/libpng
+	virtual/jpeg
+	media-libs/libpng:0
 	x11-libs/cairo
-	>=dev-libs/glib-2.27.90
-	>=x11-libs/gtk+-2.13:2
+	>=dev-libs/glib-2.27.90:2
+	>=x11-libs/gtk+-2.13:2[aqua=]
 	>=dev-libs/icu-3.8.1-r1
-	>=net-libs/libsoup-2.33.6
+	>=net-libs/libsoup-2.33.6:2.4
 	>=dev-db/sqlite-3
 	>=x11-libs/pango-1.12
 
@@ -50,7 +48,8 @@ DEPEND="${RDEPEND}
 	dev-util/gperf
 	dev-util/pkgconfig
 	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.10 )"
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	test? ( x11-themes/hicolor-icon-theme )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -59,13 +58,24 @@ src_prepare() {
 	# https://bugs.webkit.org/show_bug.cgi?id=19775
 	use sparc && epatch "${FILESDIR}"/${PN}-1.1.15.2-unaligned.patch
 
-	# Darwin/Aqua build is broken, needs autoreconf
-	# XXX: BROKEN. Patch does not apply anymore.
+	epatch "${FILESDIR}/${P}-utf-decode-v1.patch"
+	epatch "${FILESDIR}/${P}-utf-decode-v2.patch"
+
+	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	#epatch "${FILESDIR}"/${PN}-1.1.15.4-darwin-quartz.patch
+	use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+
+	# Fix build on Darwin8 (10.4 Tiger)
+	# XXX: Fails to apply
+	#epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch
 
 	# Don't force -O2
 	sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed"
+
+	# Don't build tests if not needed, part of bug #343249
+	# XXX: Fails to apply
+	#epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
+
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
 }
@@ -74,15 +84,17 @@ src_configure() {
 	# It doesn't compile on alpha without this in LDFLAGS
 	use alpha && append-ldflags "-Wl,--no-relax"
 
-	# Sigbuses on SPARC with mcpu
+	# Sigbuses on SPARC with mcpu and co.
 	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
 
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
 	local myconf
 
 	# XXX: Check Web Audio support
-	# XXX: websockets disabled due to security issue in protocol
+	# XXX: webgl fails compilation
 	# XXX: Wtf is WebKit2?
-	# XXX: WebGL fails to compile
 	myconf="
 		$(use_enable coverage)
 		$(use_enable debug)
@@ -90,28 +102,31 @@ src_configure() {
 		$(use_enable introspection)
 		$(use_enable gstreamer video)
 		$(use_enable jit)
-		--with-gtk=2.0
 		--disable-webgl
+		--with-gtk=2.0
 		--disable-webkit2
-		--disable-web-sockets"
-		# quartz patch above does not apply anymore
-		#$(use aqua && echo "--with-target=quartz")"
+		--disable-web-sockets
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+		# Disable web-sockets per bug #326547
 
 	econf ${myconf}
 }
 
-src_test() {
-	unset DISPLAY
-	# Tests will fail without it, bug 294691, bug 310695
-	Xemake check || die "Test phase failed"
-}
-
 src_compile() {
 	# XXX: This step is required so we properly build gettext catalogs
 	emake update-po || die "Compile failed"
+	# Fix sandbox error with USE="introspection"
+	# https://bugs.webkit.org/show_bug.cgi?id=35471
 	emake XDG_DATA_HOME="${T}/.local" || die "Compile failed"
 }
 
+src_test() {
+	unset DISPLAY
+	# Tests need virtualx, bug #294691, bug #310695
+	# Set XDG_DATA_HOME for introspection tools, bug #323669
+	Xemake check XDG_DATA_HOME="${T}/.local" || die "Test phase failed"
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "Install failed"
 	dodoc Source/WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed"