Update to debian patch letting webkit to keep working on sparc. Thanks a lot to RaúPorcel in bug #329107 (by Possum) for finding the fix.

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

4 files changed, 79 insertions, 8 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 8c6b1293b1c5..ffd2dea11d88 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.75 2010/07/18 17:36:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.76 2010/07/26 14:23:26 pacho Exp $
+
+  26 Jul 2010; Pacho Ramos <pacho@gentoo.org> webkit-gtk-1.2.3.ebuild,
+  +files/webkit-gtk-1.2.3-fix-pool-sparc.patch:
+  Update to debian patch letting webkit to keep working on sparc. Thanks a
+  lot to Raúl Porcel in bug #329107 (by Possum) for finding the fix.
 
 *webkit-gtk-1.2.3 (18 Jul 2010)
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 84e419a6fe05..b1b85dcaa479 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -5,18 +5,19 @@ AUX webkit-gtk-1.1.15.2-unaligned.patch 4403 RMD160 c9ba117a35e07ed1097787934fdb
 AUX webkit-gtk-1.1.15.4-darwin-quartz.patch 2353 RMD160 4293e345e05390cf93b97d381edb7c443ae0cc02 SHA1 f2d67803f59503ff9d408be0a38983ac25439dad SHA256 3aedd95fc50d92b31e6043d1e8df0c50385b96503e94945547b1f65675f21a12
 AUX webkit-gtk-1.1.15.4-icu44.patch 4907 RMD160 aec153a9a9cbeb435a0e28ba567daf215380d870 SHA1 c5366b8f1e65105faa170ef8c90c1d94f739fec2 SHA256 75a6f47728436082b5039f961f3dc5a10888c1c49779c2b4dcbb0321cf65ef8e
 AUX webkit-gtk-1.2.1-icu-4.4.patch 4343 RMD160 d1dbf729f96afd672e4d1eb0d7d24c8cc29833c0 SHA1 f5c87bf9436172fcc8263e739e8989ef5d480222 SHA256 8bbaf65397e1bc207b24af13bc3b70e04b099233e9f84a85891f1b9018b26491
+AUX webkit-gtk-1.2.3-fix-pool-sparc.patch 2518 RMD160 48ec89fb42403fae1b1533b54917a3311553cc78 SHA1 8c4e6c5e7c0c957ee1743a0d347b50f992460c17 SHA256 aee1f0d846c1e47c225e421a774fe93c49b71b7d31234fc5515d33922f130434
 DIST webkit-1.1.15.4.tar.gz 6093252 RMD160 dcfae86f7a2fc63b478741b370ac620d1659513e SHA1 0778b130720756d880c2bbe9eeef79f35bcf861a SHA256 ec2511fc1d4a1e64534574cd5f9b2bc552de9bb22d7b3837dd17146fb5f1c90f
 DIST webkit-1.2.1.tar.gz 7577236 RMD160 f8c158b67fbcdfd9977edd530d5f8c15e402da6d SHA1 ced564514f0be0a88c696e7afd6902d967d532a2 SHA256 c9ee551eab4e98730fa06aaa493ce95828e6c6661ec14361e6254bc23795a2dd
 DIST webkit-1.2.3.tar.gz 6740030 RMD160 41fa194de2865867dbf7d1156d0962a7580f2275 SHA1 88c38ebeba187a062272b2aa8ca2bbd0bbb86306 SHA256 ff70b25ea8dedc0031f29f2ea8d9aa226bfa65ebd2f12772390f4e2845306fe1
 EBUILD webkit-gtk-1.1.15.4.ebuild 2550 RMD160 64a87a310fe47ccb336c66f39b3b86a1fa869d14 SHA1 193e316fe1ba246e32c550992782f0afa360bf46 SHA256 bd88cecc6710e5d52954f5c990ee322b1e18b5b47d04164789b346d2f00ff5c3
 EBUILD webkit-gtk-1.2.1.ebuild 3303 RMD160 fb214b06c1bc98e3fd89643e08adb20bdf42ed1a SHA1 9a2a203b72cd8e0ee35216a808f6b50654438c38 SHA256 5b1743f1f426c061b392c5ac3c05233a89e23cd3452fc5e297aec84a62d2b36b
-EBUILD webkit-gtk-1.2.3.ebuild 3225 RMD160 2d318befa88d835f3b7dd2acf6aeb76824fe76de SHA1 660128fad8f66708599ee65755340ad179cb0b9e SHA256 328d3638bee74e6dc02a1f9a4d9791beb24c8634d7b4ba3efc531c4d2ffd7f5e
-MISC ChangeLog 15584 RMD160 02b70e786850c313ec5c84c87b4f52cc02013c05 SHA1 cf0ffe9afdad916d8048ab2d61aa580826db9391 SHA256 68a3a0f3677b260c0b142880521c5237ff45db0fc3026cb68c00d3ff2da3359f
+EBUILD webkit-gtk-1.2.3.ebuild 3227 RMD160 9e8d81ff9333514fe495d0f48d2fffe88c4dd2f1 SHA1 d86de8897666950c2a19b8424217d3116c5714a5 SHA256 2f73c1901bb4164c66716ce0309ca34b27568770314b908b0e68fa1230443529
+MISC ChangeLog 15849 RMD160 04b320f63c2ed28277516f48d29d1576f08b764c SHA1 32cd8d42f00703c093b90a3d612a4e1fae80b5ec SHA256 9710ff73c0edb2c18c5e6c11be75a07903e2a82eb190ce6ee3fc4133de5b7207
 MISC metadata.xml 318 RMD160 8779b2915c61a3efda9fdd42f64caa899e3bd2e0 SHA1 6ea9740e1524cbe0bb50316af693bb558fb41ecf SHA256 46a3afd2db9273d4fc19d548ac9935d2bd6ce9e6cf868d8c94331d950898b375
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkxDO44ACgkQCaWpQKGI+9QvRgCeK2UN9Og9S5a9JhXu1hwoHzgl
-FRwAni1muaQ6dyJPwVfS5n8lDHeiQlwv
-=UM1K
+iEYEARECAAYFAkxNmmYACgkQCaWpQKGI+9Q1TgCdELL5SHW1a5IqwQQaatJGJ1Q2
+CQoAn35ASo3+cJ2WADsQQxxmOMW98+uq
+=Lam7
 -----END PGP SIGNATURE-----
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 000000000000..3b1c5c4351f3
--- /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/webkit-gtk-1.2.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild
index f30e2c21d944..0ae812650ad0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.2.3.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.2.3.ebuild,v 1.1 2010/07/18 17:36:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild,v 1.2 2010/07/26 14:23:26 pacho Exp $
 
 EAPI="2"
 
@@ -57,7 +57,7 @@ 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
 
 	# Darwin/Aqua build is broken, needs autoreconf
 	# XXX: BROKEN. Patch does not apply anymore.