[SM-Commit] GIT changes to master grimoire by George Sherwood (96b4a9a266e1e067771ad7b5f2add76a52ef3b70)

George Sherwood scm at sourcemage.org
Sat Jun 5 09:53:33 EDT 2010


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

 http/webkitgtk/DETAILS   |    4 ++--
 http/webkitgtk/HISTORY   |    4 ++++
 http/webkitgtk/PRE_BUILD |    3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 96b4a9a266e1e067771ad7b5f2add76a52ef3b70
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    webkitgtk: Updated devel version to 1.3.1.  Devel version doesn't
    need icu patch

diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index d9a0221..15a9797 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,9 +1,9 @@
            SPELL=webkitgtk
 if [[ $WEBKITGTK_NIGHT == "y" ]]; then
-         VERSION=1.2.1
+         VERSION=1.3.1
           SOURCE=webkit-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-     SOURCE_HASH=sha512:a4ab2126406572f0f8f678f378a7bf8777c729569ba2a81738b67bcc20f3f655444d116994fd40cea9c70c48d5cc11f07f1b9096bde6165d757769040be9bc79
+     SOURCE_HASH=sha512:73d652b942a59397d91e8c402ef9df095a5af15e9de63890ecb20c9c889da8c9995a8defb5c92369bcdbd4b7276f1299ca83af02ba97ea1e10127d0ecfc17c2c
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
 else
          VERSION=1.2.1
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 1990e14..747bf37 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,7 @@
+2010-06-05 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 1.3.1
+	* PRE_BUILD: Devel version doesn't need icu patch
+
 2010-05-18 Robert Figura <template at sourcemage.org>
 	* DEPENDS: added libxt
 
diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
index 6c1afc9..3d8a5f2 100755
--- a/http/webkitgtk/PRE_BUILD
+++ b/http/webkitgtk/PRE_BUILD
@@ -1,5 +1,6 @@
 default_pre_build &&
 cd "${SOURCE_DIRECTORY}" &&
-if [ "$(installed_version icu)" = '4.4.1' ]; then
+if [ "$(installed_version icu)" = '4.4.1' ] && \
+   [ "$WEBKITGTK_NIGHT" == "n" ]; then
   patch -p1 < "${SCRIPT_DIRECTORY}/webkit-icu44.patch"
 fi



More information about the SM-Commit mailing list