Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (c7da029170fb4bc1b7b03ecacb7d26b90646ffe4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (c7da029170fb4bc1b7b03ecacb7d26b90646ffe4)
  • Date: Fri, 14 May 2010 21:21:32 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

http/webkitgtk/DETAILS | 8 ++++----
http/webkitgtk/HISTORY | 4 ++++
http/webkitgtk/webkit-icu44.patch | 29 +----------------------------
3 files changed, 9 insertions(+), 32 deletions(-)

New commits:
commit c7da029170fb4bc1b7b03ecacb7d26b90646ffe4
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

webkitgtk: Updated to version 1.2.1. Still not building with
icu 4.4.1. Updated patch.

diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 049d9a2..d9a0221 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,15 +1,15 @@
SPELL=webkitgtk
if [[ $WEBKITGTK_NIGHT == "y" ]]; then
- VERSION=1.2.0
+ VERSION=1.2.1
SOURCE=webkit-$VERSION.tar.gz
SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-
SOURCE_HASH=sha512:21dd811892f867c5f7a203a7f37b9ec9a34dd75c45aacb32d5676ae9d7039496a931019ad795c2a2ba304c1ee19958b724617eee5feca910e59f7d2614294ab6
+
SOURCE_HASH=sha512:a4ab2126406572f0f8f678f378a7bf8777c729569ba2a81738b67bcc20f3f655444d116994fd40cea9c70c48d5cc11f07f1b9096bde6165d757769040be9bc79
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
else
- VERSION=1.2.0
+ VERSION=1.2.1
SOURCE=webkit-$VERSION.tar.gz
SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-
SOURCE_HASH=sha512:21dd811892f867c5f7a203a7f37b9ec9a34dd75c45aacb32d5676ae9d7039496a931019ad795c2a2ba304c1ee19958b724617eee5feca910e59f7d2614294ab6
+
SOURCE_HASH=sha512:a4ab2126406572f0f8f678f378a7bf8777c729569ba2a81738b67bcc20f3f655444d116994fd40cea9c70c48d5cc11f07f1b9096bde6165d757769040be9bc79
SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
fi
WEB_SITE=http://webkitgtk.org/
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index a40c9fd..d06c7e2 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,7 @@
+2010-05-14 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.2.1
+ * webkit-icu44.patch: Updated (Removed ChangeLog) to work with 1.2.1
+
2010-05-07 Arjan Bouter <abouter AT sourcemage.org>
* PRE_BUILD: fixed icu-dev version patch

diff --git a/http/webkitgtk/webkit-icu44.patch
b/http/webkitgtk/webkit-icu44.patch
index 3ff1d6f..787a827 100644
--- a/http/webkitgtk/webkit-icu44.patch
+++ b/http/webkitgtk/webkit-icu44.patch
@@ -1,31 +1,4 @@
-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



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (c7da029170fb4bc1b7b03ecacb7d26b90646ffe4), George Sherwood, 05/14/2010

Archive powered by MHonArc 2.6.24.

Top of Page