summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2010-10-11 13:47:37 +0000
committerPacho Ramos <pacho@gentoo.org>2010-10-11 13:47:37 +0000
commitaf7ae62fdadff6f6b2a64f8eb125dc021d540f4c (patch)
treeaff6fb4b7af061ffce91c7ec50732fc0b020c50d /net-libs/webkit-gtk/files
parentStable on amd64 wrt bug #340024 (diff)
downloadgentoo-2-af7ae62fdadff6f6b2a64f8eb125dc021d540f4c.tar.gz
gentoo-2-af7ae62fdadff6f6b2a64f8eb125dc021d540f4c.tar.bz2
gentoo-2-af7ae62fdadff6f6b2a64f8eb125dc021d540f4c.zip
Version bump with multiple security fixes, remove old testing.
(Portage version: 2.1.9.14/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/webkit-gtk/files')
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-1.2.1-icu-4.4.patch109
1 files changed, 0 insertions, 109 deletions
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
deleted file mode 100644
index 054430dcd1d0..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.2.1-icu-4.4.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-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;
-