Apply icu patch properly, thanks to Chainsaw for finding the problem.

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

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index d762eb955dcb6b455065199b31f22092f1c890ec..11b16cabe6eccdc5bbfb24cb885ec3a62865b785 100644 (file)
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # 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.72 2010/06/13 21:00:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.73 2010/06/13 21:52:47 pacho Exp $
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> webkit-gtk-1.2.1.ebuild,
+  +files/webkit-gtk-1.2.1-icu-4.4.patch:
+  Apply icu patch properly, thanks to Chainsaw for finding the problem.
 
 *webkit-gtk-1.2.1 (13 Jun 2010)
 

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 72e4d544e5de7445c63a456d3befc34bc2eb4902..04e8eb9dd4395d16723ce87bbd5c2fa577a0adf2 100644 (file)
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -4,16 +4,17 @@ Hash: SHA1
 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-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
 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
 EBUILD webkit-gtk-1.1.15.4.ebuild 2550 RMD160 64a87a310fe47ccb336c66f39b3b86a1fa869d14 SHA1 193e316fe1ba246e32c550992782f0afa360bf46 SHA256 bd88cecc6710e5d52954f5c990ee322b1e18b5b47d04164789b346d2f00ff5c3
-EBUILD webkit-gtk-1.2.1.ebuild 3228 RMD160 1b6a706d1ec3444069abab610b39b270341e9fe2 SHA1 aaa3f5dd0026ee22b8a1c0f66e971d91101d392d SHA256 27488c40830fd7b6a92a09adfb092e7d4474129ebb0868d0db745deaab5ab80e
-MISC ChangeLog 14824 RMD160 87bdd2595b9dfc20100ab78b10e14c50297aa1dd SHA1 985df8b6f17ab42c0811f4f71891c61d3745558c SHA256 0bfd7d47fa7b6fbc5d73209cea515ab637cf159dda0f367221cf425aa163aa35
+EBUILD webkit-gtk-1.2.1.ebuild 3239 RMD160 2a1ad224d71ea7cccefaa5e18aac5fa6dd954d5a SHA1 c2d7a74c77f8eb8703301187361814c56aa57fe4 SHA256 8f0b7bdaab85068d4b308b40ac1a20c43bba50bab5a6629e69c8583f0a03d5ce
+MISC ChangeLog 15009 RMD160 009fa811c974a597c61d36cc41fc59d8752d4096 SHA1 486ac113f005f0703ff90f31d34c8c07a99fb633 SHA256 9e34c2f6033d55bb9e035ffeaedf2144b9a2085a906a9989d70e1c0bed938c56
 MISC metadata.xml 318 RMD160 8779b2915c61a3efda9fdd42f64caa899e3bd2e0 SHA1 6ea9740e1524cbe0bb50316af693bb558fb41ecf SHA256 46a3afd2db9273d4fc19d548ac9935d2bd6ce9e6cf868d8c94331d950898b375
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwVRtwACgkQCaWpQKGI+9TaTACeNKVNHQ0OYKzSXfO4ZpTONFnb
-79IAnAokJ7+UtdUZJlZUt5bj7VUTNV56
-=lzJ/
+iEYEARECAAYFAkwVUzUACgkQCaWpQKGI+9Qy7gCfcnp9ekLhSplcQM/aaRcWo+CU
+zDEAoINOuPU5jMWzhN4nTF5vQ3JdzwSA
+=Vzx8
 -----END PGP SIGNATURE-----

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.1-icu-4.4.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.1-icu-4.4.patch
new file mode 100644 (file)
index 0000000..054430d
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.2.1-icu-4.4.patch
@@ -0,0 +1,109 @@
+diff --git a/WebCore/platform/text/TextBreakIteratorICU.cpp b/WebCore/platform/text/TextBreakIteratorICU.cpp
+index 44423c0..f5575ee 100644
+--- a/WebCore/platform/text/TextBreakIteratorICU.cpp
++++ b/WebCore/platform/text/TextBreakIteratorICU.cpp
+@@ -24,7 +24,6 @@
+ 
+ #include "PlatformString.h"
+ #include "TextBreakIteratorInternalICU.h"
+-
+ #include <unicode/ubrk.h>
+ #include <wtf/Assertions.h>
+ 
+@@ -38,7 +37,7 @@ static TextBreakIterator* setUpIterator(bool& createdIterator, TextBreakIterator
+ 
+     if (!createdIterator) {
+         UErrorCode openStatus = U_ZERO_ERROR;
+-        iterator = static_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
++        iterator = reinterpret_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
+         createdIterator = true;
+         ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
+     }
+@@ -46,7 +45,7 @@ static TextBreakIterator* setUpIterator(bool& createdIterator, TextBreakIterator
+         return 0;
+ 
+     UErrorCode setTextStatus = U_ZERO_ERROR;
+-    ubrk_setText(iterator, string, length, &setTextStatus);
++    ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
+     if (U_FAILURE(setTextStatus))
+         return 0;
+ 
+@@ -85,44 +84,44 @@ TextBreakIterator* sentenceBreakIterator(const UChar* string, int length)
+         staticSentenceBreakIterator, UBRK_SENTENCE, string, length);
+ }
+ 
+-int textBreakFirst(TextBreakIterator* bi)
++int textBreakFirst(TextBreakIterator* iterator)
+ {
+-    return ubrk_first(bi);
++    return ubrk_first(reinterpret_cast<UBreakIterator*>(iterator));
+ }
+ 
+-int textBreakLast(TextBreakIterator* bi)
++int textBreakLast(TextBreakIterator* iterator)
+ {
+-    return ubrk_last(bi);
++    return ubrk_last(reinterpret_cast<UBreakIterator*>(iterator));
+ }
+ 
+-int textBreakNext(TextBreakIterator* bi)
++int textBreakNext(TextBreakIterator* iterator)
+ {
+-    return ubrk_next(bi);
++    return ubrk_next(reinterpret_cast<UBreakIterator*>(iterator));
+ }
+ 
+-int textBreakPrevious(TextBreakIterator* bi)
++int textBreakPrevious(TextBreakIterator* iterator)
+ {
+-    return ubrk_previous(bi);
++    return ubrk_previous(reinterpret_cast<UBreakIterator*>(iterator));
+ }
+ 
+-int textBreakPreceding(TextBreakIterator* bi, int pos)
++int textBreakPreceding(TextBreakIterator* iterator, int pos)
+ {
+-    return ubrk_preceding(bi, pos);
++    return ubrk_preceding(reinterpret_cast<UBreakIterator*>(iterator), pos);
+ }
+ 
+-int textBreakFollowing(TextBreakIterator* bi, int pos)
++int textBreakFollowing(TextBreakIterator* iterator, int pos)
+ {
+-    return ubrk_following(bi, pos);
++    return ubrk_following(reinterpret_cast<UBreakIterator*>(iterator), pos);
+ }
+ 
+-int textBreakCurrent(TextBreakIterator* bi)
++int textBreakCurrent(TextBreakIterator* iterator)
+ {
+-    return ubrk_current(bi);
++    return ubrk_current(reinterpret_cast<UBreakIterator*>(iterator));
+ }
+ 
+-bool isTextBreak(TextBreakIterator* bi, int pos)
++bool isTextBreak(TextBreakIterator* iterator, int position)
+ {
+-    return ubrk_isBoundary(bi, pos);
++    return ubrk_isBoundary(reinterpret_cast<UBreakIterator*>(iterator), position);
+ }
+ 
+ #ifndef BUILDING_ON_TIGER
+@@ -136,7 +135,7 @@ static TextBreakIterator* setUpIteratorWithRules(bool& createdIterator, TextBrea
+         UParseError parseStatus;
+         UErrorCode openStatus = U_ZERO_ERROR;
+         String rules(breakRules);
+-        iterator = static_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
++        iterator = reinterpret_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
+         createdIterator = true;
+         ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
+     }
+@@ -144,7 +143,7 @@ static TextBreakIterator* setUpIteratorWithRules(bool& createdIterator, TextBrea
+         return 0;
+ 
+     UErrorCode setTextStatus = U_ZERO_ERROR;
+-    ubrk_setText(iterator, string, length, &setTextStatus);
++    ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
+     if (U_FAILURE(setTextStatus))
+         return 0;
+ 

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.1.ebuild
index 16f28b6c12446799fc35063f2e0faaf8dea36738..c409b6ee7bee5ca3d4a682d1afb52d17ea67d7bc 100644 (file)
--- a/net-libs/webkit-gtk/webkit-gtk-1.2.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.2.1.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.1.ebuild,v 1.1 2010/06/13 21:00:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.1.ebuild,v 1.2 2010/06/13 21:52:47 pacho Exp $
 
 EAPI="2"
 
@@ -56,7 +56,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
        # Build failure with icu-4.4, bug 308699
-       epatch "${FILESDIR}"/webkit-icu-4.4.patch
+       epatch "${FILESDIR}"/files/${PN}-1.2.1-icu-4.4.patch
 
        # FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
        # https://bugs.webkit.org/show_bug.cgi?id=19775