[Lunar-commits] <moonbase> webkit: Version bump and needed to adjust BUILD for icu4c-1.2.0 and the

[Dennis `stumbles` Veatch]

commit b37448f09a038468d9bf6cf7377cfd9763975090
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Wed Apr 28 11:41:52 2010 -0400

    webkit: Version bump and needed to adjust BUILD for icu4c-1.2.0 and the
    
    gnome keyring is not a valid option.
---
 web/webkit/BUILD   |   10 +++++++---
 web/webkit/DEPENDS |    2 --
 web/webkit/DETAILS |    8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/web/webkit/BUILD b/web/webkit/BUILD
index 99f3d85..6e73f91 100644
--- a/web/webkit/BUILD
+++ b/web/webkit/BUILD
@@ -1,13 +1,17 @@
 (
 
   #This next line looks ugly, but allows us to load our plugins
-  sedit 's:paths.append("/usr/lib64/mozilla/plugins");:paths.append("/usr/lib64/mozilla/plugins");\n    paths.append("/opt/lunar/plugins");\n:g'  WebCore/plugins/PluginDatabase.cpp
+  sedit 's:paths.append("/usr/lib64/mozilla/plugins");:paths.append("/usr/lib64/mozilla/plugins");\n    paths.append("/opt/lunar/plugins");\n:g'  WebCore/plugins/PluginDatabase.cpp &&
 
-  OPTS="$OPTS --enable-svg --enable-svg-animation \
+# Fix an icu4c problem.
+  sedit "s:class TextBreakIterator;:typedef struct UBreakIterator TextBreakIterator;:" WebCore/platform/text/TextBreakIterator.h &&
+
+  OPTS="$OPTS --enable-svg --enable-svg-animation      \
         --enable-svg-fonts --enable-svg-foreign-object \
-	--enable-svg-as-image --enable-3D-transforms"
+	--enable-svg-as-image --enable-3D-transforms"  &&
 
   default_build &&
+
   install 'Programs/GtkLauncher' '/usr/bin/GtkLauncher'
 
 ) > $C_FIFO 2>&1
diff --git a/web/webkit/DEPENDS b/web/webkit/DEPENDS
index d5ca007..ef9ee51 100644
--- a/web/webkit/DEPENDS
+++ b/web/webkit/DEPENDS
@@ -15,5 +15,3 @@ optional_depends  gst-plugins-good  "--enable-video"  ""  \
 optional_depends  geoclue "--enable-geolocation"  "--disable-geolocation"  \
                   "For geolocation support"
 
-optional_depends  gnome-keyring  "--enable-gnomekeyring"  ""  \
-                  "For Gnome Keyring support"
diff --git a/web/webkit/DETAILS b/web/webkit/DETAILS
index 0e5f0ed..2328c0d 100644
--- a/web/webkit/DETAILS
+++ b/web/webkit/DETAILS
@@ -1,12 +1,12 @@
           MODULE=webkit
-         VERSION=1.1.15.4
+         VERSION=1.2.0
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://www.webkitgtk.org/
-      SOURCE_VFY=sha1:0778b130720756d880c2bbe9eeef79f35bcf861a
+      SOURCE_VFY=sha1:ac9db7c25471eed9d03ea90cea1c0b3378b6d47e
         WEB_SITE=http://www.webkit.org
          ENTERED=20070919
-         UPDATED=20091202
-           SHORT="a gtk+ web rendering engine"
+         UPDATED=20100428
+           SHORT="gtk+ web rendering engine"
 
 cat << EOF
 WebKitGTK+ is a web content engine, derived from KHTML and KJS from KDE,