underlinking patch is not needed as it was already applied by upstream, bug #384181 by Lance Poore, Hilco, Albert W. Hopkins, S.Holzbach and maby others.

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

4 files changed, 12 insertions, 101 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 27164371cc20..55432e55ee9c 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,11 @@
 # 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.120 2011/09/22 18:42:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.121 2011/09/24 13:53:13 pacho Exp $
+
+  24 Sep 2011; Pacho Ramos <pacho@gentoo.org> webkit-gtk-1.4.3-r300.ebuild,
+  -files/webkit-gtk-1.4.3-underlinking.patch:
+  underlinking patch is not needed as it was already applied by upstream, bug
+  #384181 by Lance Poore, Hilco, Albert W. Hopkins, S.Holzbach and maby others.
 
 *webkit-gtk-1.4.3-r300 (22 Sep 2011)
 *webkit-gtk-1.4.3-r200 (22 Sep 2011)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 2bde1e4ba2b7..06bf401b4cd8 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -7,7 +7,6 @@ AUX webkit-gtk-1.2.5-darwin8.patch 1152 RMD160 a546515b8a088f8f11e532662833c3e41
 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.4.3-underlinking.patch 3205 RMD160 2e7e7fea7c3e2817f8eda09982432b7f4006c89f SHA1 677e48ff18409fdaad6a03a34dac4cd45afc65a4 SHA256 dd67fa8d728fc4ba8377cb4107ac28a2daf36ab89c87ccd66f8f5e7093c50d49
 DIST webkit-1.2.7.tar.gz 6615990 RMD160 f36b3ae05693e0eeb4d1936ceee52b6fe1517e57 SHA1 e9afc573d2459794c3749ba404f2187f9dcc9ed3 SHA256 228a80b3f0132db1342708e8ef7738996f05e30393e0187acf4cab987283718b
 DIST webkit-1.4.2.tar.gz 8504310 RMD160 e1de3cd5576d7ccc771475cda8c0e3b59aba1af7 SHA1 675ae0bfef56b8519f3f00b04fc7baf72215bd3b SHA256 dee6336b5366e952f67a18a66dca2edce95a8e70f591dbc7fc30cf30b5fdb9ba
 DIST webkit-1.4.3.tar.gz 8512387 RMD160 43d1fd1cfd0cbf9fc83b107f05442e2d531c03aa SHA1 a24adee9583d66ebc93ac61ce9881947a54c569d SHA256 b808ace6b3edad76aba57cc746a430051abfedf301c969628b989a1128dd37e4
@@ -15,13 +14,13 @@ EBUILD webkit-gtk-1.2.7.ebuild 3407 RMD160 29ef994a54ba6e32f0530b45c3927eb2940a9
 EBUILD webkit-gtk-1.4.2-r200.ebuild 3672 RMD160 0be69c14bbd395a8e1940b2ca9469e27d4963c3b SHA1 ba9d7ff375539bccf9cc96970b8627ca8a4c623b SHA256 0e19f480dbdbde9bc93d4e43ac9a50984a1446a3fcd325642e0c26fb192394ac
 EBUILD webkit-gtk-1.4.2-r300.ebuild 3744 RMD160 24a4953d4953077b0d32c000bce4d900efa0cf92 SHA1 5eb1b725d5c42c0d58e4b0c279b4283af007b1a7 SHA256 33212de6d2d14ca705e9fcb88b9909a28ab43a9b4b23a2ba98c884ada69ca4a7
 EBUILD webkit-gtk-1.4.3-r200.ebuild 3669 RMD160 7aa23fce2bbfb55de31a47d3c6954b7b9aad4a84 SHA1 cd15e18cb0a6cbe175b3585252908ea953b0a5b1 SHA256 8977f50d8949702d37305d56780c9fcde2a24d245bdc05168af20d36760a92cf
-EBUILD webkit-gtk-1.4.3-r300.ebuild 3854 RMD160 7a8e4fc9c9f7833255e7ab329efa3e1f50b68cc9 SHA1 b8c8d4c77974f624fc161b5889dac29819b74fdd SHA256 a9185817e2d5c6cc8f0fc81e9e28b6a14fd9d5727abe1237654e857c12c6c66e
-MISC ChangeLog 23565 RMD160 a81dd339abafcabecd078b8cd12c7e80280f334a SHA1 fe97c72ff62b45d0a27e703233970e62ed40e721 SHA256 c861fe9aeb50de2808e8a433e956db3f98e2fb50935446407d507f1f931e1565
+EBUILD webkit-gtk-1.4.3-r300.ebuild 3741 RMD160 840086a04bf632860ba526225d415e0ac9f52972 SHA1 a269d6923995850cf8228f0222b405a96f34b37f SHA256 d742de60ad3e143601858f26f1ab9e30a20277bf9d147fa80eaf9bea00b728ca
+MISC ChangeLog 23846 RMD160 a8fd971541352a91d3a74dea904f6ebea653980f SHA1 4815abe960370ee40fbf13de709a3945e05a66a2 SHA256 060d04e50b71db7d8c752832ceb38381e36992e1aaef7da58e656caab87e2c3a
 MISC metadata.xml 439 RMD160 ed901542890ff2bf45ff3302f79b48cc0ba9e5f8 SHA1 746abe4ff5e3911f962a40f23fe1c521d32adca8 SHA256 57260da7cdd67c9be679d44a3deba705ff381fde47433b5d22ccd1402ecabdf3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk57gYgACgkQCaWpQKGI+9Q7MwCcD7022f26ZyehnSQQ3IIC+fDE
-0EUAniHpFyBW0QpUdAIARsuI+GRS2AVi
-=AIk1
+iEYEARECAAYFAk594M4ACgkQCaWpQKGI+9S1GACcCnFzQ2vUrDF6KOptskNpdU8c
+nPQAn2gqxhBupCs7hmHuz7FbyiakYBmH
+=+zU7
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.4.3-underlinking.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.4.3-underlinking.patch
deleted file mode 100644
index f53053102fc7..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.4.3-underlinking.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Index: /trunk/ChangeLog

-===================================================================

---- /trunk/ChangeLog	(revision 82570)

-+++ /trunk/ChangeLog	(revision 82599)

-@@ -1,2 +1,16 @@

-+2011-03-31  Xan Lopez  <xlopez@igalia.com>

-+

-+        Reviewed by Martin Robinson.

-+

-+        [GTK] Link explicitly with XRender on Linux/Unix

-+        https://bugs.webkit.org/show_bug.cgi?id=57558

-+

-+        Some linkers, like GNU Gold, require explicit linkage of all the

-+        libraries used instead of relying on our dependencies to bring

-+        them in. In this case, the build fails because we use XRender in

-+        the plugin code but don't link directly to it.

-+

-+        * configure.ac: check for XRender on UNIX.

-+

- 2011-03-31  Vamshikrishna.Yellenki  <vamshi@motorola.com> and Alejandro G. Castro  <alex@igalia.com>

- 

-Index: /trunk/Source/WebKit/gtk/GNUmakefile.am

-===================================================================

---- /trunk/Source/WebKit/gtk/GNUmakefile.am	(revision 80561)

-+++ /trunk/Source/WebKit/gtk/GNUmakefile.am	(revision 82599)

-@@ -103,4 +103,5 @@

- 	$(SQLITE3_LIBS) \

- 	$(UNICODE_LIBS) \

-+	$(XRENDER_LIBS) \

- 	$(XT_LIBS) \

- 	$(WINMM_LIBS) \

-Index: /trunk/Source/WebKit/gtk/ChangeLog

-===================================================================

---- /trunk/Source/WebKit/gtk/ChangeLog	(revision 82582)

-+++ /trunk/Source/WebKit/gtk/ChangeLog	(revision 82599)

-@@ -1,2 +1,11 @@

-+2011-03-31  Xan Lopez  <xlopez@igalia.com>

-+

-+        Reviewed by Martin Robinson.

-+

-+        [GTK] Link explicitly with XRender on Linux/Unix

-+        https://bugs.webkit.org/show_bug.cgi?id=57558

-+

-+        * GNUmakefile.am: add XRender LIBS.

-+

- 2011-03-31  Evan Martin  <evan@chromium.org>

- 

-Index: /trunk/Source/WebCore/ChangeLog

-===================================================================

---- /trunk/Source/WebCore/ChangeLog	(revision 82597)

-+++ /trunk/Source/WebCore/ChangeLog	(revision 82599)

-@@ -1,2 +1,11 @@

-+2011-03-31  Xan Lopez  <xlopez@igalia.com>

-+

-+        Reviewed by Martin Robinson.

-+

-+        [GTK] Link explicitly with XRender on Linux/Unix

-+        https://bugs.webkit.org/show_bug.cgi?id=57558

-+

-+        * GNUmakefile.am: add XRender CFLAGS.

-+

- 2011-03-31  Eric Seidel  <eric@webkit.org>

- 

-Index: /trunk/Source/WebCore/GNUmakefile.am

-===================================================================

---- /trunk/Source/WebCore/GNUmakefile.am	(revision 82580)

-+++ /trunk/Source/WebCore/GNUmakefile.am	(revision 82599)

-@@ -5111,4 +5111,5 @@

- 	$(SQLITE3_CFLAGS) \

- 	$(UNICODE_CFLAGS) \

-+	$(XRENDER_CFLAGS) \

- 	$(XT_CFLAGS)

- 

-Index: /trunk/configure.ac

-===================================================================

---- /trunk/configure.ac	(revision 81641)

-+++ /trunk/configure.ac	(revision 82599)

-@@ -937,4 +937,12 @@

-     AC_SUBST([GEOCLUE_CFLAGS])

-     AC_SUBST([GEOCLUE_LIBS])

-+fi

-+

-+# check for XRender under Linux/Unix. Some linkers require explicit

-+# linkage (like GNU Gold), so we cannot rely on GTK+ pulling XRender

-+if test "$os_win32" = "no"; then

-+   PKG_CHECK_MODULES([XRENDER], [xrender])

-+   AC_SUBST([XRENDER_CFLAGS])

-+   AC_SUBST([XRENDER_LIBS])

- fi

- 

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.4.3-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.4.3-r300.ebuild
index 20ee32842999..a6199bc34dec 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.4.3-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.4.3-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.4.3-r300.ebuild,v 1.1 2011/09/22 18:42:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.4.3-r300.ebuild,v 1.2 2011/09/24 13:53:13 pacho Exp $
 
 EAPI="4"
 
@@ -60,9 +60,6 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	DOCS="Source/WebKit/gtk/NEWS Source/WebKit/gtk/ChangeLog"
 
-	# Link explicitly with XRender on Linux/Unix, bug #371751
-	epatch "${FILESDIR}/${PN}-1.4.3-underlinking.patch"
-
 	# 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