Fix darwin-quartz patch, drop darwin8 patch from ebuild, bug #392385

Package-Manager: portage-2.2.01.19572-prefix/cvs/Darwin i386

7 files changed, 95 insertions, 33 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index af40c5b95fd1..578be69dc4ae 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.131 2011/11/29 13:25:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.132 2011/11/29 19:01:02 grobian Exp $
+
+  29 Nov 2011; Fabian Groffen <grobian@gentoo.org>
+  +files/webkit-gtk-1.6.1-darwin-quartz.patch, webkit-gtk-1.6.1-r300.ebuild,
+  webkit-gtk-1.6.1-r301.ebuild, webkit-gtk-1.6.1-r201.ebuild,
+  files/webkit-gtk-1.2.5-darwin-quartz.patch:
+  Fix darwin-quartz patch, drop darwin8 patch from ebuild, bug #392385
 
 *webkit-gtk-1.6.1-r301 (29 Nov 2011)
 *webkit-gtk-1.6.1-r201 (29 Nov 2011)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index b96ddbb9700f..82e397fda19e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -2,11 +2,12 @@
 Hash: SHA1
 
 AUX webkit-gtk-1.2.3-fix-pool-sparc.patch 2518 RMD160 48ec89fb42403fae1b1533b54917a3311553cc78 SHA1 8c4e6c5e7c0c957ee1743a0d347b50f992460c17 SHA256 aee1f0d846c1e47c225e421a774fe93c49b71b7d31234fc5515d33922f130434
-AUX webkit-gtk-1.2.5-darwin-quartz.patch 1984 RMD160 5995be8598b62aff487726de02ac12b1a79357b4 SHA1 c7f0c5ac74f8a92f93ab36cfa1e1356f6112eac8 SHA256 8f37d606dec60186c10cca8795adc1dd3c8ec4ded86c94bad3036ed955573b78
+AUX webkit-gtk-1.2.5-darwin-quartz.patch 1858 RMD160 a52d2ac9aebe425e455c729be0b30a58def94ea5 SHA1 550ff2ed27f2930ffb43b9c2fd8cc823cfa3f76d SHA256 694ad79c55d737a919f6246566c5c64a0282caf02fbdb6d371152da49bcf233d
 AUX webkit-gtk-1.2.5-darwin8.patch 1152 RMD160 a546515b8a088f8f11e532662833c3e41ad6df83 SHA1 e1e841cae9d5a70940630a918b40ac4b27497c58 SHA256 51e3fb832793cb0be13ceff63d1b4c4ef82efaa7b3151ab53d04ae966d65efa6
 AUX webkit-gtk-1.2.5-tests-build.patch 526 RMD160 c336c7309899169a2691bf3b984fa4df480b2ad4 SHA1 c25129b41dcca46424d58c3796f7207119e4a790 SHA256 aa2875954048318f2a9c5035b670774a1c5ce1b641b067f936fa076f38659383
 AUX webkit-gtk-1.2.7-libpng15.patch 1657 RMD160 19cec5b29437313372b9b25d43029105197a4abf SHA1 2748a46b1a4c9d547094ae2795ad2c812fbf59aa SHA256 0aef21a127b9427cb98684102c91902f38585c7d7642525760c7a7d9f0d39dc7
 AUX webkit-gtk-1.4.1-libpng15.patch 2571 RMD160 427d9746f365f27c66be0c73a41c7034754e2522 SHA1 0481a4039c79414449262392758a63e97157ff93 SHA256 c014d8380270a73d96069f5eac343fab40d1a1112b03c32e5e6365da89ab7705
+AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 RMD160 6c73b491645c0d4626d5a60043159c045bee013f SHA1 e032315b4155a92f18ea43b29a4581655eb34d89 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23
 AUX webkit-gtk-1.6.1-double-conversion.patch 1585 RMD160 2eb508cf95ce16f5a49e7375c46271d85d5280c6 SHA1 70b81cd3bb600fa698487b6fb59459ca24e31b6f SHA256 2b1baadaf694e96d546ae50ce2a4154e4d1f7efbe7566868297cee27e9c08f08
 AUX webkit-gtk-1.6.1-pkgconfig-fix.patch 1297 RMD160 8a83465d74bf34d6fe7cbb6a2767f62c77e33aa2 SHA1 40090e84c3ee7814c14363d8bb790c7ec38d2dbb SHA256 f4a41c4dd1c40347e846b377bd94b2d3ad10b1f110711b5f341f8fd8a5a13014
 DIST webkit-1.4.3.tar.gz 8512387 RMD160 43d1fd1cfd0cbf9fc83b107f05442e2d531c03aa SHA1 a24adee9583d66ebc93ac61ce9881947a54c569d SHA256 b808ace6b3edad76aba57cc746a430051abfedf301c969628b989a1128dd37e4
@@ -14,15 +15,15 @@ DIST webkit-gtk-1.6.1.tar.xz 6416248 RMD160 ab63ea133ed2bd471c5faf012d4d284c324d
 EBUILD webkit-gtk-1.4.3-r200.ebuild 3489 RMD160 60dcca3f8ea8db6398c2e01e96119a44d28a6b80 SHA1 7d25b89803d208c7f0a7799659513ee8ff995966 SHA256 6380b001bf9077c2135453e3e45e947db2cbe9171fc2dcf9364bab1d25c13ac4
 EBUILD webkit-gtk-1.4.3-r300.ebuild 3559 RMD160 a508e11554ad3666d4180e94bfbef671cdfc59be SHA1 0cfa0a81eff8bded59f064fa787fdd716575b63f SHA256 7c94293468e42977281cdf3b7aa78e9c423ec35467256040473eadac17bd2760
 EBUILD webkit-gtk-1.6.1-r200.ebuild 4178 RMD160 5fe6f89c0ee09e69a43a81b9343b007643cd66e1 SHA1 463e74ebcadb4ccef80ec28a24e7f762510c3083 SHA256 ed401ed3a61f95e01e9970562eec6e5cf8784f97fc64baa68abfcce9a202a4fe
-EBUILD webkit-gtk-1.6.1-r201.ebuild 4861 RMD160 107fea07fbb0ca167c869c58dee55653a02a5864 SHA1 993be0a3c61904bfad929582f5a50e6bac5cd4f2 SHA256 7ee6a032edf1ba984a5348fab40522ec34330303dea80b0ba8e103706b79c389
-EBUILD webkit-gtk-1.6.1-r300.ebuild 4607 RMD160 4bbf1076fdf882bf3a65d1a25eec902d6a2b9476 SHA1 b29428a8e47d82823e76cd3a8fb1879444900938 SHA256 da1c4dde2a531631b146ce496f7a25dffb2dc756cdde24cd2676360ccfff2021
-EBUILD webkit-gtk-1.6.1-r301.ebuild 4813 RMD160 0a51ff6bfc909d11c9c00915e88d5536128b372c SHA1 3749216e26eb4d47ce513fc321027161419eee34 SHA256 24d4e784ebeb1f392592fffaffbf193c92bb55f2b78f0152ca244faa0762cf9b
-MISC ChangeLog 25907 RMD160 6b61cc91a0eb494dfe1eb8d4fb41722bc9705f0e SHA1 920398c3152bd4415f163fcac6c6e5705d784b1f SHA256 9263a1b89be32871af50ca461ff2e78c65bf02ac8374eec40e4756a4baf7c3f7
+EBUILD webkit-gtk-1.6.1-r201.ebuild 4830 RMD160 6d55e620258a21e1699cf15f79a876dd9e42bc36 SHA1 f9fd93f3167fc56be9cc12f9bcbce1c9a0e4e97c SHA256 706ca1b3533fc90556f3314ceb6bf682fd829ea11ad631e208162d117c6bcc44
+EBUILD webkit-gtk-1.6.1-r300.ebuild 4309 RMD160 696a1e6861188b138ce3b6e96ffca21c12fb58bb SHA1 5657c69a1309f5708da2686e0a303d71d903e6fb SHA256 1ecfe44612708f55cc3a941fc38f68f5334350e2237d918938837f2c1c64ee7c
+EBUILD webkit-gtk-1.6.1-r301.ebuild 4782 RMD160 e981b83ade2fc0158e524ff9ffc5965ac6fb2efb SHA1 3c01df1d9ec031fa0983d2d6c10df97b44dbeb95 SHA256 9d2d45cc3aff3ce9a819afa0f642bc4580953eb3d4d4dbe0d3b836ec24a895a2
+MISC ChangeLog 26217 RMD160 12755d791ac8ad921a2c4fbfb04e24cafadddcee SHA1 5066a6b202df20616956e8ade1c4624112473ade SHA256 c346560bfad3ad27c52e02fb0eae670811edf9030b4da2bb783c63aa3fc78837
 MISC metadata.xml 539 RMD160 422a84bfd5fd0ca7d32825e204b0a435a980ecd5 SHA1 33fe25bdc890c5e034d5dc02a82b028283e0cc03 SHA256 eb78ad3163ace16c943a2620ef1659d33913985b8a9584a2d734f021a82f7887
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk7U3WEACgkQCaWpQKGI+9Ti9wCcCO3AeaexA78oEw4aRpEr89t3
-nuUAn0QUIaNDoGIYMddmHeCiGCodidfm
-=fJ2T
+iEYEARECAAYFAk7VK/QACgkQX3X2B8XHTokt2ACeILChRASFPKe3hLt49MTLIV/M
+5xoAnirUCupAjwzGo06QSfHqzCO5btKl
+=VEKS
 -----END PGP SIGNATURE-----
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
index fe1ebc4d50a8..5046118af949 100644
--- 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
@@ -1,8 +1,8 @@
 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
+--- 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.  
@@ -17,8 +17,8 @@ http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-
    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
+--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
++++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
 @@ -60,10 +60,13 @@
  #include "runtime_root.h"
  #include <runtime/JSLock.h>
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
new file mode 100644
index 000000000000..5ad357e9eeed
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
@@ -0,0 +1,67 @@
+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
+
+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"
+@@ -439,9 +441,9 @@
+         event->setDefaultHandled();
+ }
+ 
+-#if defined(XP_UNIX)
+ void PluginView::handleFocusInEvent()
+ {
++#if defined(XP_UNIX)
+     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
+         return;
+ 
+@@ -454,10 +456,12 @@
+     event.detail = NotifyDetailNone;
+ 
+     dispatchNPEvent(npEvent);
++#endif
+ }
+ 
+ void PluginView::handleFocusOutEvent()
+ {
++#if defined(XP_UNIX)
+     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
+         return;
+ 
+@@ -470,8 +474,8 @@
+     event.detail = NotifyDetailNone;
+ 
+     dispatchNPEvent(npEvent);
+-}
+ #endif
++}
+ 
+ void PluginView::setParent(ScrollView* parent)
+ {
+--- 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 @@
+ 
+   return;
+ }
++#endif
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
index a5aed44fa4f8..9322f826345a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
@@ -1,6 +1,6 @@
 # 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.6.1-r201.ebuild,v 1.1 2011/11/29 13:25:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild,v 1.2 2011/11/29 19:01:02 grobian Exp $
 
 EAPI="4"
 
@@ -16,8 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 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"
+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"
@@ -81,8 +80,7 @@ src_prepare() {
 
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	# TODO: FAILS TO APPLY!
-	#use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch
+	use aqua && epatch "${FILESDIR}"/${P}-darwin-quartz.patch
 
 	# Skip tests phase: here we will place tests we need to skip, any
 	# skipped test needs to have an upstream report and needs to be
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild
index 025a3c75c086..f035fa593137 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild
@@ -1,6 +1,6 @@
 # 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.6.1-r300.ebuild,v 1.1 2011/09/30 13:52:33 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild,v 1.2 2011/11/29 19:01:02 grobian Exp $
 
 EAPI="4"
 
@@ -70,14 +70,6 @@ src_prepare() {
 	# 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
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
index 5311c0f78128..3c03a91ae7d5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
@@ -1,6 +1,6 @@
 # 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.6.1-r301.ebuild,v 1.1 2011/11/29 13:25:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild,v 1.2 2011/11/29 19:01:02 grobian Exp $
 
 EAPI="4"
 
@@ -16,8 +16,7 @@ SRC_URI="mirror://gentoo/${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"
 
@@ -83,8 +82,7 @@ src_prepare() {
 
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	# TODO: FAILS TO APPLY!
-	#use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch
+	use aqua && epatch "${FILESDIR}"/${P}-darwin-quartz.patch
 
 	# Drop DEPRECATED flags
 	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die