Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (6d8e21506859ca5789d88d67ed36227280b16880)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (6d8e21506859ca5789d88d67ed36227280b16880)
  • Date: Fri, 16 Jul 2010 02:17:24 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

http/webkitgtk/DETAILS | 4 -
http/webkitgtk/HISTORY | 4 +
http/webkitgtk/PRE_BUILD | 6 --
http/webkitgtk/webkit-icu44.patch | 109
--------------------------------------
4 files changed, 6 insertions(+), 117 deletions(-)

New commits:
commit 6d8e21506859ca5789d88d67ed36227280b16880
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

webkitgtk 1.2.3

casts with icu 4.4.1 without patch

$ gaze version webkitgtk icu
Grimoire Section Spell Grimoire Version Installed Version
-------- ------- ----- ---------------- -----------------
test http webkitgtk 1.2.3 1.2.3
test libs icu 4.4.1 4.4.1

diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 3845421..c4e1fdf 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -6,10 +6,10 @@ if [[ $WEBKITGTK_NIGHT == "y" ]]; then

SOURCE_HASH=sha512:9159f2542a704072b7106ef153126f9ca4926c0cf433662e65732c59115b2793f152ab3d3769398498b0a021fd2604e6d539f7385988080712dea807145da246
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
else
- VERSION=1.2.2
+ VERSION=1.2.3
SOURCE=webkit-$VERSION.tar.gz
SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-
SOURCE_HASH=sha512:460a525b66239c5072c9921e3ef0cb96ea74bd7a1e151ec2c390db43d550ce7049b8812c28da0af444e3cb533784c395d6820355e16c971e7ec841d8141550fa
+
SOURCE_HASH=sha512:d83e38e5a2470e825203b5737955ac7124c649c708aecfe31197c96c6c4e35483113c9889a537ec3a23ffdb8898bbe27ca6b5a583af0bea1cb28f00c3e2d0b05
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
fi
WEB_SITE=http://webkitgtk.org/
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 4257677..7a4786f 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,7 @@
+2010-07-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.2.3
+ * PRE_BUILD, webkit-icu44.patch: removed
+
2010-07-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.3

diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
deleted file mode 100755
index 3d8a5f2..0000000
--- a/http/webkitgtk/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-if [ "$(installed_version icu)" = '4.4.1' ] && \
- [ "$WEBKITGTK_NIGHT" == "n" ]; then
- patch -p1 < "${SCRIPT_DIRECTORY}/webkit-icu44.patch"
-fi
diff --git a/http/webkitgtk/webkit-icu44.patch
b/http/webkitgtk/webkit-icu44.patch
deleted file mode 100644
index 787a827..0000000
--- a/http/webkitgtk/webkit-icu44.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-
-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 Ladislav Hagara (6d8e21506859ca5789d88d67ed36227280b16880), Ladislav Hagara, 07/16/2010

Archive powered by MHonArc 2.6.24.

Top of Page