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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 116 insertions, 3 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index d762eb955dcb..11b16cabe6ec 100644
--- 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/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
index 000000000000..054430dcd1d0
--- /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 16f28b6c1244..c409b6ee7bee 100644
--- 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