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

[Alexandre Restovtsev]

commit:     29fac2b20bd9dcf81ea18991a5d111cbf55faa70
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep  7 20:04:58 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep  7 20:04:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=29fac2b2

net-libs/webkit-gtk: add 1.5.2

Add webkit-gtk-1.5.2 for gnome-3.1.x. Disable mimehandling test since it
fails on ogg audio for some reason. WebKit2 is still disabled because
the tarball does not include the build tools and source needed for it;
see https://bugs.webkit.org/show_bug.cgi?id=66527

---
 .../files/webkit-gtk-1.2.3-fix-pool-sparc.patch    |   65 +++++++
 .../files/webkit-gtk-1.2.5-darwin-quartz.patch     |   79 ++++++++
 .../files/webkit-gtk-1.5.2-deprecations.patch      |  191 ++++++++++++++++++++
 .../files/webkit-gtk-1.5.2-mimehandling-test.patch |   17 ++
 net-libs/webkit-gtk/webkit-gtk-1.5.2-r200.ebuild   |  149 +++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-1.5.2-r300.ebuild   |  153 ++++++++++++++++
 6 files changed, 654 insertions(+), 0 deletions(-)

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.3-fix-pool-sparc.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.3-fix-pool-sparc.patch
new file mode 100644
index 0000000..3b1c5c4
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.2.3-fix-pool-sparc.patch
@@ -0,0 +1,65 @@
+Description: Fixup pool and add sparc support
+--- webkit-1.2.1.orig/JavaScriptCore/wtf/ListHashSet.h
++++ webkit-1.2.1/JavaScriptCore/wtf/ListHashSet.h
+@@ -127,7 +127,7 @@ namespace WTF {
+             : 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 @@ namespace WTF {
+         }
+ 
+     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 @@ namespace WTF {
+         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.2.1.orig/WebCore/platform/text/AtomicString.cpp
++++ webkit-1.2.1/WebCore/platform/text/AtomicString.cpp
+@@ -103,9 +103,9 @@ static inline bool equal(StringImpl* str
+     if (string->length() != length)
+         return false;
+ 
++#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
+     // FIXME: perhaps we should have a more abstract macro that indicates when
+     // going 4 bytes at a time is unsafe
+-#if CPU(ARM) || CPU(SH4)
+     const UChar* stringCharacters = string->characters();
+     for (unsigned i = 0; i != length; ++i) {
+         if (*stringCharacters++ != *characters++)
+--- webkit-1.2.1.orig/WebCore/platform/text/StringHash.h
++++ webkit-1.2.1/WebCore/platform/text/StringHash.h
+@@ -54,13 +54,13 @@ namespace WebCore {
+ 
+             // FIXME: perhaps we should have a more abstract macro that indicates when
+             // going 4 bytes at a time is unsafe
+-#if CPU(ARM) || CPU(SH4)
++#if CPU(ARM) || CPU(SPARC) || CPU(SH4)
+             const UChar* aChars = a->characters();
+             const UChar* bChars = b->characters();
+-            for (unsigned i = 0; i != aLength; ++i) {
++            for (unsigned i = 0; i != aLength; ++i)
+                 if (*aChars++ != *bChars++)
+                     return false;
+-            }
++
+             return true;
+ #else
+             /* Do it 4-bytes-at-a-time on architectures where it's safe */

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.5.2-deprecations.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.5.2-deprecations.patch
new file mode 100644
index 0000000..8102dae
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.5.2-deprecations.patch
@@ -0,0 +1,191 @@
[phone]  Alejandro G. Castro  <alex@××××××.com>
+
+        [GTK] Fix compilation problems with deprecations in gtk+
+        https://bugs.webkit.org/show_bug.cgi?id=66073
+
+        Reviewed by Martin Robinson.
+
+        * platform/gtk/GtkAuthenticationDialog.cpp:
+        (WebCore::GtkAuthenticationDialog::GtkAuthenticationDialog): Added
+        gtk_box_new conditional compilation for gtk+-3.
+        * platform/gtk/RenderThemeGtk3.cpp:
+        (WebCore::RenderThemeGtk::adjustRepaintRect):
+        (WebCore::RenderThemeGtk::paintSliderTrack):
+        (WebCore::RenderThemeGtk::paintSliderThumb):
+        (WebCore::RenderThemeGtk::adjustSliderThumbSize): Now we have have
+        GTK_TYPE_SCALE in gtk+3.
+
[phone]  Alejandro G. Castro  <alex@××××××.com>
+
+        [GTK] Fix compilation problems with deprecations in gtk+
+        https://bugs.webkit.org/show_bug.cgi?id=66073
+
+        Reviewed by Martin Robinson.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (main): G_CONST_RETURN was deprecated
+        * GtkLauncher/main.c:
+        (createWindow): Added gtk_box_new conditional compilation for
+        gtk+-3.
+        * MiniBrowser/gtk/BrowserWindow.c:
+        (browser_window_init): Replaced gtk_vbox_new with gtk_box_new, we
+        are just supporting gtk+-3 for WebKit2.
+
[phone]  Alejandro G. Castro  <alex@××××××.com>
+
+        [GTK] Fix compilation problems with deprecations in gtk+
+        https://bugs.webkit.org/show_bug.cgi?id=66073
+
+        Reviewed by Martin Robinson.
+
+        * WebCoreSupport/FullscreenVideoController.cpp:
+        (FullscreenVideoController::createHud): Added gtk_box_new
+        conditional compilation for gtk+-3.
+
+Index: /trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp
+===================================================================
+--- /trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp	(revision 89044)
++++ /trunk/Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp	(revision 93338)
+@@ -532,5 +532,9 @@
+     g_signal_connect(m_hudWindow, "motion-notify-event", G_CALLBACK(onFullscreenGtkMotionNotifyEvent), this);
+ 
++#ifdef GTK_API_VERSION_2
+     GtkWidget* hbox = gtk_hbox_new(FALSE, 4);
++#else
++    GtkWidget* hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
++#endif
+     gtk_container_add(GTK_CONTAINER(m_hudWindow), hbox);
+ 
+@@ -547,5 +551,9 @@
+ 
+     GtkAdjustment* adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 100.0, 0.1, 1.0, 1.0));
++#ifdef GTK_API_VERSION_2
+     m_timeHScale = gtk_hscale_new(adjustment);
++#else
++    m_timeHScale = gtk_scale_new(GTK_ORIENTATION_HORIZONTAL, adjustment);
++#endif
+     gtk_scale_set_draw_value(GTK_SCALE(m_timeHScale), FALSE);
+     gtk_range_set_show_fill_level(GTK_RANGE(m_timeHScale), TRUE);
+Index: /trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp
+===================================================================
+--- /trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp	(revision 88405)
++++ /trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp	(revision 93338)
+@@ -150,5 +150,5 @@
+     case SliderVerticalPart:
+     case SliderHorizontalPart:
+-        context = getStyleContext(part == SliderThumbHorizontalPart ?  GTK_TYPE_HSCALE : GTK_TYPE_VSCALE);
++        context = getStyleContext(GTK_TYPE_SCALE);
+         break;
+     case ButtonPart:
+@@ -599,5 +599,5 @@
+     ASSERT(part == SliderHorizontalPart || part == SliderVerticalPart || part == MediaVolumeSliderPart);
+ 
+-    GtkStyleContext* context = getStyleContext(part == SliderThumbHorizontalPart ? GTK_TYPE_HSCALE : GTK_TYPE_VSCALE);
++    GtkStyleContext* context = getStyleContext(GTK_TYPE_SCALE);
+     gtk_style_context_save(context);
+ 
+@@ -634,5 +634,5 @@
+     ASSERT(part == SliderThumbHorizontalPart || part == SliderThumbVerticalPart || part == MediaVolumeSliderThumbPart);
+ 
+-    GtkStyleContext* context = getStyleContext(part == SliderThumbHorizontalPart ? GTK_TYPE_HSCALE : GTK_TYPE_VSCALE);
++    GtkStyleContext* context = getStyleContext(GTK_TYPE_SCALE);
+     gtk_style_context_save(context);
+ 
+@@ -675,5 +675,5 @@
+ 
+     gint sliderWidth, sliderLength;
+-    gtk_style_context_get_style(getStyleContext(part == SliderThumbHorizontalPart ? GTK_TYPE_HSCALE : GTK_TYPE_VSCALE),
++    gtk_style_context_get_style(getStyleContext(GTK_TYPE_SCALE),
+                                 "slider-width", &sliderWidth,
+                                 "slider-length", &sliderLength,
+Index: /trunk/Source/WebCore/platform/gtk/GtkAuthenticationDialog.cpp
+===================================================================
+--- /trunk/Source/WebCore/platform/gtk/GtkAuthenticationDialog.cpp	(revision 88800)
++++ /trunk/Source/WebCore/platform/gtk/GtkAuthenticationDialog.cpp	(revision 93338)
+@@ -88,5 +88,9 @@
+ 
+     // Build contents.
++#ifdef GTK_API_VERSION_2
+     GtkWidget* hBox = gtk_hbox_new(FALSE, 12);
++#else
++    GtkWidget* hBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
++#endif
+     gtk_container_set_border_width(GTK_CONTAINER(hBox), 5);
+     gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(dialog)), hBox, TRUE, TRUE, 0);
+@@ -96,5 +100,9 @@
+     gtk_box_pack_start(GTK_BOX(hBox), icon, FALSE, FALSE, 0);
+ 
++#ifdef GTK_API_VERSION_2
+     GtkWidget* mainVBox = gtk_vbox_new(FALSE, 18);
++#else
++    GtkWidget* mainVBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 18);
++#endif
+     gtk_box_pack_start(GTK_BOX(hBox), mainVBox, TRUE, TRUE, 0);
+ 
+@@ -106,5 +114,9 @@
+     gtk_box_pack_start(GTK_BOX(mainVBox), GTK_WIDGET(descriptionLabel), FALSE, FALSE, 0);
+ 
++#ifdef GTK_API_VERSION_2
+     GtkWidget* vBox = gtk_vbox_new(FALSE, 6);
++#else
++    GtkWidget* vBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
++#endif
+     gtk_box_pack_start(GTK_BOX(mainVBox), vBox, FALSE, FALSE, 0);
+ 
+@@ -140,5 +152,9 @@
+ 
+     if (sessionCanSavePasswords(m_session)) {
++#ifdef GTK_API_VERSION_2
+         GtkWidget* rememberBox = gtk_vbox_new(FALSE, 6);
++#else
++        GtkWidget* rememberBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
++#endif
+         gtk_box_pack_start(GTK_BOX(vBox), rememberBox, FALSE, FALSE, 0);
+ 
+Index: /trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
+===================================================================
+--- /trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp	(revision 91707)
++++ /trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp	(revision 93338)
+@@ -65,5 +65,5 @@
+ extern "C" {
+ // This API is not yet public.
+-extern G_CONST_RETURN gchar* webkit_web_history_item_get_target(WebKitWebHistoryItem*);
++extern const gchar* webkit_web_history_item_get_target(WebKitWebHistoryItem*);
+ extern gboolean webkit_web_history_item_is_target_item(WebKitWebHistoryItem*);
+ extern GList* webkit_web_history_item_get_children(WebKitWebHistoryItem*);
+@@ -1168,5 +1168,10 @@
+ 
+     window = gtk_window_new(GTK_WINDOW_POPUP);
++#ifdef GTK_API_VERSION_2
+     container = gtk_hbox_new(TRUE, 0);
++#else
++    container = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
++    gtk_box_set_homogeneous(GTK_BOX(container), TRUE);
++#endif
+     gtk_container_add(GTK_CONTAINER(window), container);
+     gtk_widget_show_all(window);
+Index: /trunk/Tools/MiniBrowser/gtk/BrowserWindow.c
+===================================================================
+--- /trunk/Tools/MiniBrowser/gtk/BrowserWindow.c	(revision 90551)
++++ /trunk/Tools/MiniBrowser/gtk/BrowserWindow.c	(revision 93338)
+@@ -160,5 +160,5 @@
+     gtk_widget_show(GTK_WIDGET(item));
+ 
+-    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
++    GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+     window->mainBox = vbox;
+     gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
+Index: /trunk/Tools/GtkLauncher/main.c
+===================================================================
+--- /trunk/Tools/GtkLauncher/main.c	(revision 89438)
++++ /trunk/Tools/GtkLauncher/main.c	(revision 93338)
+@@ -214,5 +214,9 @@
+     uriEntry = gtk_entry_new();
+ 
++#ifdef GTK_API_VERSION_2
+     vbox = gtk_vbox_new(FALSE, 0);
++#else
++    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
++#endif
+     statusbar = createStatusbar(webView);
+     gtk_box_pack_start(GTK_BOX(vbox), createToolbar(uriEntry, webView), FALSE, FALSE, 0);

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.5.2-mimehandling-test.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.5.2-mimehandling-test.patch
new file mode 100644
index 0000000..70d52e2
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.5.2-mimehandling-test.patch
@@ -0,0 +1,17 @@
+Disable mimehandling test for now. For unknown reasons it fails:
+
+  /webkit/mime/remote-OGG:                                             **
+ERROR:Source/WebKit/gtk/tests/testmimehandling.c:128:mime_type_policy_decision_requested_cb: assertion failed (mime_type == "audio/x-vorbis+ogg"): ("application/octet-stream" == "audio/x-vorbis+ogg")
+FAIL
+
+diff -ur a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakefile.am
+--- a/Source/WebKit/gtk/GNUmakefile.am
++++ b/Source/WebKit/gtk/GNUmakefile.am
+@@ -432,7 +432,6 @@
+ 	Programs/unittests/testhttpbackend \
+ 	Programs/unittests/testloading \
+ 	Programs/unittests/testglobals \
+-	Programs/unittests/testmimehandling \
+ 	Programs/unittests/testnetworkrequest \
+ 	Programs/unittests/testnetworkresponse \
+ 	Programs/unittests/testwebframe \

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.5.2-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.5.2-r200.ebuild
new file mode 100644
index 0000000..4780d01
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.5.2-r200.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.4.2-r200.ebuild,v 1.4 2011/08/14 06:43:26 nirbheek Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic eutils virtualx
+
+MY_P="webkit-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+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 ~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"
+# bug 372493
+REQUIRED_USE="introspection? ( gstreamer )"
+
+# use sqlite, svg by default
+# dependency on >=x11-libs/gtk+-2.13:2 for gail
+RDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	virtual/jpeg
+	>=media-libs/libpng-1.4:0
+	>=x11-libs/cairo-1.10
+	>=dev-libs/glib-2.27.90: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/libXrender
+
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		>=media-libs/gst-plugins-base-0.10.25:0.10 )
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+
+	spell? ( >=app-text/enchant-0.22 )
+"
+DEPEND="${RDEPEND}
+	>=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 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+	# 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
+
+	# 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
+
+	# 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
+
+	# Don't build tests if not needed, part of bug #343249
+	# XXX: Fails to apply
+	#epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
+
+	# FIXME: mimehandling test fails, so disable it for now
+	# assertion failed (mime_type == "audio/x-vorbis+ogg")
+	epatch "${FILESDIR}/${PN}-1.5.2-mimehandling-test.patch"
+
+	# Upstream patch to fix deprecation failures with glib-2.29.x and gtk+-3.1.x
+	epatch "${FILESDIR}/${P}-deprecations.patch"
+
+	# Prevent maintainer mode from being triggered during make
+	AT_M4DIR=Source/autotools eautoreconf
+}
+
+src_configure() {
+	# It doesn't compile on alpha without this in LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# 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: webgl fails compilation
+	# WebKit2 can only be built with gtk3
+	myconf="
+		$(use_enable coverage)
+		$(use_enable debug)
+		$(use_enable debug debug-features)
+		$(use_enable spell spellcheck)
+		$(use_enable introspection)
+		$(use_enable gstreamer video)
+		$(use_enable jit)
+		--disable-webgl
+		--with-gtk=2.0
+		--disable-webkit2
+		--disable-web-sockets
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+		# Disable web-sockets per bug #326547
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Fix sandbox error with USE="introspection"
+	# https://bugs.webkit.org/show_bug.cgi?id=35471
+	emake XDG_DATA_HOME="${T}/.local"
+}
+
+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"
+}
+
+src_install() {
+	default
+
+	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+	newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
+	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
+	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.5.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.5.2-r300.ebuild
new file mode 100644
index 0000000..403bfed
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.5.2-r300.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.4.2-r300.ebuild,v 1.4 2011/08/14 06:43:26 nirbheek Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic eutils virtualx
+
+MY_P="webkit-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
+
+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"
+# geoclue
+IUSE="aqua coverage debug doc +gstreamer +introspection +jit spell"
+# bug 372493
+REQUIRED_USE="introspection? ( gstreamer )"
+
+# use sqlite, svg by default
+# dependency on >=x11-libs/gtk+-2.13:2 for gail
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support
+RDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	virtual/jpeg
+	>=media-libs/libpng-1.4:0
+	>=x11-libs/cairo-1.10
+	>=dev-libs/glib-2.27.90:2
+	>=x11-libs/gtk+-3.0:3[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/libXrender
+
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		>=media-libs/gst-plugins-base-0.10.25:0.10 )
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+
+	spell? ( >=app-text/enchant-0.22 )
+"
+DEPEND="${RDEPEND}
+	>=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 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+	# 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
+
+	# 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
+
+	# 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
+
+	# Don't build tests if not needed, part of bug #343249
+	# XXX: Fails to apply
+	#epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
+
+	# FIXME: mimehandling test fails, so disable it for now
+	# assertion failed (mime_type == "audio/x-vorbis+ogg")
+	epatch "${FILESDIR}/${PN}-1.5.2-mimehandling-test.patch"
+
+	# Upstream patch to fix deprecation failures with glib-2.29.x and gtk+-3.1.x
+	epatch "${FILESDIR}/${P}-deprecations.patch"
+
+	# Prevent maintainer mode from being triggered during make
+	AT_M4DIR=Source/autotools eautoreconf
+}
+
+src_configure() {
+	# It doesn't compile on alpha without this in LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# 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: webgl fails compilation
+	# XXX: files for generating DerivedSources/WebKit2/* are missing, see
+	#      https://bugs.webkit.org/show_bug.cgi?id=66527
+	myconf="
+		$(use_enable coverage)
+		$(use_enable debug)
+		$(use_enable debug debug-features)
+		$(use_enable spell spellcheck)
+		$(use_enable introspection)
+		$(use_enable gstreamer video)
+		$(use_enable jit)
+		--disable-webgl
+		--with-gtk=3.0
+		--disable-webkit2
+		--disable-web-sockets
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+		# Aqua support in gtk3 is untested
+		# Disable web-sockets per bug #326547
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Fix sandbox error with USE="introspection"
+	# https://bugs.webkit.org/show_bug.cgi?id=35471
+	emake XDG_DATA_HOME="${T}/.local"
+}
+
+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"
+}
+
+src_install() {
+	default
+
+	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+	newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
+	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
+	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}