Add patch from upstream bugtracker to solve compilation issue on OSX when gtk was built with aqua USE-flag (the default).

Package-Manager: portage-2.2.00.15187-prefix/cvs/SunOS i386

4 files changed, 84 insertions, 4 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 9ce3313f847a..fc3bbde13cd5 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.62 2010/01/19 17:25:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.63 2010/02/03 13:58:49 grobian Exp $
+
+  03 Feb 2010; Fabian Groffen <grobian@gentoo.org>
+  webkit-gtk-1.1.15.4.ebuild,
+  +files/webkit-gtk-1.1.15.4-darwin-quartz.patch:
+  Add patch from upstream bugtracker to solve compilation issue on OSX when
+  gtk was built with aqua USE-flag (the default).
 
   19 Jan 2010; Raúl Porcel <armin76@gentoo.org> webkit-gtk-1.1.15.2.ebuild:
   arm stable
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 82cc24fc6141..0ea94e56b357 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,6 +1,7 @@
 AUX webkit-gtk-0_p40220-gcc44-aliasing.patch 31876 RMD160 19f850df93fd81d1a736dbcc5441d0193929ef35 SHA1 293465980ececa6f2dbdd55787edf2676f628edf SHA256 6aee86b94b443a088502a35d25ffc7f17fa36f6e89dd082dcca11042a7af110f
 AUX webkit-gtk-1.1.10-reduce-gnome-keyring-req.patch 363 RMD160 89f5fb0c5ac6925ba01b2b1eeb67c28784cacbe3 SHA1 ddb49156ffc156930494026195cbfd3d428ae958 SHA256 4824005e4178b78a50b3f0d2bd31f06c8ccc35197f631a60839b613bdc36a491
 AUX webkit-gtk-1.1.15.2-unaligned.patch 4403 RMD160 c9ba117a35e07ed1097787934fdb0750b2baaab5 SHA1 fd1ddaff12705784662002554a76aea67ff70320 SHA256 8b20af7ccad9d91f8d76465843b6a40e80c59c8e9620cf7772ba6f64406b3e68
+AUX webkit-gtk-1.1.15.4-darwin-quartz.patch 2353 RMD160 4293e345e05390cf93b97d381edb7c443ae0cc02 SHA1 f2d67803f59503ff9d408be0a38983ac25439dad SHA256 3aedd95fc50d92b31e6043d1e8df0c50385b96503e94945547b1f65675f21a12
 AUX webkit-gtk-CVE-2009-0945.patch 671 RMD160 a51f2326f44e05146eaeea5b3f0fcc973efdaeca SHA1 2a281b7ee69158daf7d088add2f21f99903506dd SHA256 65ccad453b147067725dac0f9ba8f07cd0d04970ab0f8d85f086ef07a6d0b3c3
 DIST WebKit-r40220.tar.bz2 10307835 RMD160 5700977d5a9a23680e58b1e3952ecb2fe1430e9a SHA1 2aa2bd3a9c60f53a1a1ef0bf810ea2c59b0a80e2 SHA256 223154d0e247336cd3cf808b030cfb00739103b7a258050e71703903df922020
 DIST webkit-1.1.10.tar.gz 6343872 RMD160 c3d5a7b9793318d0fc9f4d170b7aeac7a6f30735 SHA1 8f0637c936b4f62fb21c8d0c35298e5c0317fd0a SHA256 4eb4fc4a3f47edbc18c9dc09d54fd2189954ebaa0e521b0ab97e21087d8c9855
@@ -9,6 +10,6 @@ DIST webkit-1.1.15.4.tar.gz 6093252 RMD160 dcfae86f7a2fc63b478741b370ac620d16595
 EBUILD webkit-gtk-0_p40220-r1.ebuild 2017 RMD160 e0c5faca4ae98256b4b964fde174e932aad08d6e SHA1 6de0cd2a6d02773f13d00232ac66aa2073df17db SHA256 1220f0c9faff1820bcb8ddebaf3a3a0e0b133456fd6497f40311463efbffad69
 EBUILD webkit-gtk-1.1.10.ebuild 2976 RMD160 ecc59930e536131d688ce880f367700c5bcd1e47 SHA1 08ea90e8553cd00f3aa1fc2755b8449f5404525f SHA256 e00bdd4a2374365af63e84773cdb312a2f81ad032070ac9e7229b945b3ff460d
 EBUILD webkit-gtk-1.1.15.2.ebuild 2552 RMD160 837dac1f7b95d3572c8ebad053b21b7f5747067f SHA1 ae8639397b29ed382188206c8d1ef247bb034ae0 SHA256 992e770a8e310d72d0d4ea975d9c9e81a16eb0d67e551e64d9618b277fa0c672
-EBUILD webkit-gtk-1.1.15.4.ebuild 2662 RMD160 cefe3c7107fd29f9443109f02c4a9b117b44959e SHA1 f2564d9b0f992ae6dcd6f41f003cef97cf6db672 SHA256 22c5bc588f9bd770903ca3ff329bdd42dfb3e90c2e8d8740c28751424dd3c2ae
-MISC ChangeLog 13196 RMD160 86b94015d351d0b9c48cd884f1f762032fe8cc8c SHA1 6ccf3330b0edab63edd58654dba69e025db864c9 SHA256 994b2c492304d4cab5fa9d3ec5e833aacd4a723a462af6000252c4c8ec8611ac
+EBUILD webkit-gtk-1.1.15.4.ebuild 2761 RMD160 d5314667d591a7ec162be3146b5d8104de0b01c8 SHA1 5667563e656f203967208e5410ad4ecd0fbfe5df SHA256 8c982257fb3a474ba7a0614e8b54642a0c64237c7354cb356dd1531c253c7aa9
+MISC ChangeLog 13454 RMD160 3d4b33317a2aec92e8712950e2af6fdc0398e288 SHA1 f6063b111bfbf76e0dc141f81f2ddea1e7f92199 SHA256 bfbd3e31c0ae6880be82f496ef36da5b49d69c557d39875a60f1c86b5325671d
 MISC metadata.xml 590 RMD160 10d32e0b262743466f51841611018fc62a85cecd SHA1 2c3116f8d8d4c904c0a55a07caa6f8a0ee2d1892 SHA256 b08781716b9009ce0ed0c492e6bc1d958afd26400ab58b8d42fab67c11cc1046
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.1.15.4-darwin-quartz.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.1.15.4-darwin-quartz.patch
new file mode 100644
index 000000000000..a9eb7d079bcf
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.1.15.4-darwin-quartz.patch
@@ -0,0 +1,70 @@
+https://bugs.webkit.org/show_bug.cgi?id=28727
+https://bugs.webkit.org/attachment.cgi?id=41762
+
+Index: GNUmakefile.am
+===================================================================
+--- GNUmakefile.am	(revision 49997)
++++ GNUmakefile.am	(working copy)
+@@ -115,6 +115,9 @@
+ if !TARGET_WIN32
+ corekit_cppflags += -DXP_UNIX
+ endif
++if TARGET_QUARTZ
++corekit_cppflags += -DQUARTZ
++endif
+ 
+ # Default compiler flags
+ global_cflags += \
+Index: WebCore/plugins/gtk/PluginViewGtk.cpp
+===================================================================
+--- WebCore/plugins/gtk/PluginViewGtk.cpp	(revision 49997)
++++ WebCore/plugins/gtk/PluginViewGtk.cpp	(working copy)
+@@ -59,7 +59,7 @@
+ #include <gdkconfig.h>
+ #include <gtk/gtk.h>
+ 
+-#if defined(XP_UNIX)
++#if defined(XP_UNIX) && not defined(QUARTZ)
+ #include "gtk2xtbin.h"
+ #include <gdk/gdkx.h>
+ #elif defined(GDK_WINDOWING_WIN32)
+@@ -322,7 +322,7 @@
+ 
+     switch (variable) {
+     case NPNVxDisplay:
+-#if defined(XP_UNIX)
++#if defined(XP_UNIX) && not defined(QUARTZ)
+         if (m_needsXEmbed)
+             *(void **)value = (void *)GDK_DISPLAY();
+         else
+@@ -380,7 +380,7 @@
+ #endif
+ 
+         case NPNVnetscapeWindow: {
+-#if defined(XP_UNIX)
++#if defined(XP_UNIX) and not defined(QUARTZ)
+             void* w = reinterpret_cast<void*>(value);
+             *((XID *)w) = GDK_WINDOW_XWINDOW(m_parentFrame->view()->hostWindow()->platformPageClient()->window);
+ #endif
+@@ -456,8 +456,11 @@
+         setPlatformWidget(gtk_socket_new());
+         gtk_container_add(GTK_CONTAINER(m_parentFrame->view()->hostWindow()->platformPageClient()), platformPluginWidget());
+         g_signal_connect(platformPluginWidget(), "plug_removed", G_CALLBACK(plug_removed_cb), NULL);
+-    } else if (m_isWindowed)
++    }
++#ifndef QUARTZ
++     else if (m_isWindowed)
+         setPlatformWidget(gtk_xtbin_new(m_parentFrame->view()->hostWindow()->platformPageClient()->window, 0));
++#endif
+ #else
+     setPlatformWidget(gtk_socket_new());
+     gtk_container_add(GTK_CONTAINER(m_parentFrame->view()->hostWindow()->platformPageClient()), platformPluginWidget());
+@@ -466,7 +469,7 @@
+ 
+     if (m_isWindowed) {
+         m_npWindow.type = NPWindowTypeWindow;
+-#if defined(XP_UNIX)
++#if defined(XP_UNIX) && not defined(QUARTZ)
+         NPSetWindowCallbackStruct *ws = new NPSetWindowCallbackStruct();
+ 
+         ws->type = 0;
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild
index f7531fe93224..775219cf7318 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.1.15.4.ebuild,v 1.4 2010/01/10 16:24:51 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.15.4.ebuild,v 1.5 2010/02/03 13:58:49 grobian Exp $
 
 EAPI="2"
 
@@ -56,6 +56,9 @@ src_prepare() {
 	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
 	use sparc && epatch "${FILESDIR}"/webkit-gtk-1.1.15.2-unaligned.patch
 
+	# Darwin/Aqua build is broken, needs autoreconf
+	epatch "${FILESDIR}"/${P}-darwin-quartz.patch
+
 	# Make it libtool-1 compatible
 	rm -v autotools/lt* autotools/libtool.m4 \
 		|| die "removing libtool macros failed"