Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (a1d9dd4491bf73932687163452869a0b338c128a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (a1d9dd4491bf73932687163452869a0b338c128a)
  • Date: Sat, 17 Apr 2010 17:08:52 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

http/webkitgtk/HISTORY | 3
http/webkitgtk/PRE_BUILD | 5 +
http/webkitgtk/webkit-icu44.patch | 136
++++++++++++++++++++++++++++++++++++++
3 files changed, 144 insertions(+)

New commits:
commit f29f676f9dba2916a4c8c7d0d124695b68b0bc70
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

webkitgtk: apply patch from upstream when icu 4.4 is installed

diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index e6680cf..8e7082d 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2010-04-18 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD, webkit-icu44.patch: added patch to fix icu 4.4 issues
+
2010-04-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.0
* DEPENDS: used devel dependencies for both stable and devel now
diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
new file mode 100755
index 0000000..f7ec6ef
--- /dev/null
+++ b/http/webkitgtk/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+if [ "$(installed_version icu)" == '4.4' ]; then
+ patch -p1 < "${SCRIPT_DIRECTORY}/webkit-icu44.patch"
+fi
diff --git a/http/webkitgtk/webkit-icu44.patch
b/http/webkitgtk/webkit-icu44.patch
new file mode 100644
index 0000000..3ff1d6f
--- /dev/null
+++ b/http/webkitgtk/webkit-icu44.patch
@@ -0,0 +1,136 @@
+diff -Naur webkit-1.2.0/WebCore/ChangeLog
webkit-1.2.0.fixed/WebCore/ChangeLog
+--- webkit-1.2.0/WebCore/ChangeLog 2010-04-05 14:51:20.000000000 +0200
++++ webkit-1.2.0.fixed/WebCore/ChangeLog 2010-04-08 15:40:42.227947390
+0200
+@@ -1,3 +1,24 @@
++2010-03-20 Darin Adler <darin AT apple.com>
++
++ Reviewed by NOBODY (OOPS!).
++
++ TextBreakIteratorICU.cpp is incompatible with new UBreakIterator
type in ICU 4.4
++ https://bugs.webkit.org/show_bug.cgi?id=36381
++
++ * platform/text/TextBreakIteratorICU.cpp:
++ (WebCore::setUpIterator): Use reinterpret_cast instead of
static_cast or relying
++ on conversion to void*.
++ (WebCore::textBreakFirst): Ditto.
++ (WebCore::textBreakLast): Ditto.
++ (WebCore::textBreakNext): Ditto.
++ (WebCore::textBreakPrevious): Ditto.
++ (WebCore::textBreakPreceding): Ditto.
++ (WebCore::textBreakFollowing): Ditto.
++ (WebCore::textBreakCurrent): Ditto.
++ (WebCore::isTextBreak): Ditto.
++ (WebCore::setUpIteratorWithRules): Ditto.
++
++
+ 2010-04-01 MORITA Hajime <morrita AT google.com>
+
+ Reviewed by Darin Adler.
+diff -Naur webkit-1.2.0/WebCore/platform/text/TextBreakIteratorICU.cpp
webkit-1.2.0.fixed/WebCore/platform/text/TextBreakIteratorICU.cpp
+--- webkit-1.2.0/WebCore/platform/text/TextBreakIteratorICU.cpp
2010-04-05 14:51:20.000000000 +0200
++++ webkit-1.2.0.fixed/WebCore/platform/text/TextBreakIteratorICU.cpp
2010-04-08 15:38:04.705203914 +0200
+@@ -24,7 +24,6 @@
+
+ #include "PlatformString.h"
+ #include "TextBreakIteratorInternalICU.h"
+-
+ #include <unicode/ubrk.h>
+ #include <wtf/Assertions.h>
+
+@@ -38,7 +37,7 @@
+
+ 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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+ 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;
+



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (a1d9dd4491bf73932687163452869a0b338c128a), Arjan Bouter, 04/17/2010

Archive powered by MHonArc 2.6.24.

Top of Page