[Lunar-commits] <moonbase> webkit: Version bump to 1.4.2. Still not PSAFE (too bad). Removing the gather docs

[Dennis `stumbles` Veatch]

commit 3e46783d60a95303bf59fc808dcca71c9155409c
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Tue Aug 30 08:27:05 2011 -0400

    webkit: Version bump to 1.4.2. Still not PSAFE (too bad). Removing the gather docs
    
    from BUILD and the other stuff. Adjusting the DEPENDSD< no more ruby switch. Adding
    some more mquery to CONFIGURE.
    
    Midori, kde dependent modules and a few otheres compiled fine with this version.
---
 web/webkit/BUILD     |   13 +------------
 web/webkit/CONFIGURE |    9 +++++++++
 web/webkit/DEPENDS   |    2 +-
 web/webkit/DETAILS   |   12 ++++--------
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/web/webkit/BUILD b/web/webkit/BUILD
index 77c0fca..abb41c1 100644
--- a/web/webkit/BUILD
+++ b/web/webkit/BUILD
@@ -1,14 +1,6 @@
 (
 
-  patch_it $SOURCE_CACHE/$SOURCE2 0 &&
 
-  #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 &&
-
-# Fix an icu4c problem.
-  sedit "s:class TextBreakIterator;:typedef struct UBreakIterator TextBreakIterator;:" WebCore/platform/text/TextBreakIterator.h &&
-
-  # defaults using 'with' flags
   OPTS+=" --with-target=x11             \
           --with-unicode-backend=icu    \
           --with-font-backend=freetype  \
@@ -18,14 +10,11 @@
           --enable-svg-fonts            \
           --enable-svg-foreign-object   \
           --enable-svg-as-image         \
-          --enable-3D-transforms        \
           --enable-optimizations        \
           --disable-gtk-doc-html"      &&
 
   default_build &&
 
-  install 'Programs/GtkLauncher' '/usr/bin/GtkLauncher' &&
-
-  cp WebKit/gtk/NEWS .
+  install 'Programs/GtkLauncher' '/usr/bin/GtkLauncher' 
 
 ) > $C_FIFO 2>&1
diff --git a/web/webkit/CONFIGURE b/web/webkit/CONFIGURE
index 3a05ef9..44d9c33 100644
--- a/web/webkit/CONFIGURE
+++ b/web/webkit/CONFIGURE
@@ -1 +1,10 @@
 mquery WEBSOCKETS "Enable web socket support?" y "--enable-web-sockets" "--disable-web-sockets"
+mquery ENABLE_SPELL "Enable support for spellcheck?" y "--enable-spellcheck" "--disable-spellcheck"
+mquery ENABLE_3D "Enable support for 3D transforms" y "--enable-3d-transforms" "--disable-3d-transforms"
+mquery ENABLE_WEBGL "Enable support for WebGL (experimental)?" y "--enable-webgl" "--disable-webgl"
+mquery ENABLE_GRID "Enable HTML5 datagrid support?" y "--enable-datagrid" "--disable-datagrid"
+mquery ENABLE_TRANSFER  "Enable HTML5 data transfer items support?" y "--enable-data-transfer-items" "--disable-data-transfer-items"
+mquery ENABLE_INDEX "Enable the indexed database API?" y "--enable-indexed-database" "--disable-indexed-database"
+mquery ENABLE_SPEECH "Enable the speech input API?" y "--enable-input-speech" "--disable-input-speech"
+mquery ENABLE_RESIZE "Enable image resizer?" y "--enable-image-resizer" "--disable-image-resizer"
+mquery ENABLE_WEB_AUDIO "Enable support for Web Audio ?" y " --enable-web-audio" "--disable-web-audio"
diff --git a/web/webkit/DEPENDS b/web/webkit/DEPENDS
index af33177..a9eefa2 100644
--- a/web/webkit/DEPENDS
+++ b/web/webkit/DEPENDS
@@ -14,6 +14,6 @@ depends gst-plugins-base
 depends Switch
 
 optional_depends "gst-plugins-good"      "--enable-video"         "--disable-video"         "for HTML5 video support"
-optional_depends "ruby"                  "--enable-ruby"          "--disable-ruby"          "for HTML5 ruby support"
 optional_depends "geoclue"               "--enable-geolocation"   "--disable-geolocation"   "for geolocation support"
 optional_depends "gobject-introspection" "--enable-introspection" "--disable-introspection" "say Y for Epiphany, and possibly others"
+optional_depends "librsvg"               "--enable-svg"           "--disable-svg"           "for svg graphics support"
diff --git a/web/webkit/DETAILS b/web/webkit/DETAILS
index fe710ba..a751430 100644
--- a/web/webkit/DETAILS
+++ b/web/webkit/DETAILS
@@ -1,18 +1,14 @@
           MODULE=webkit
-         VERSION=1.2.7
+         VERSION=1.4.2
           SOURCE=$MODULE-$VERSION.tar.gz
-         # From http://repos.archlinux.org/wsvn/packages/libwebkit/trunk/introspection.patch
-         SOURCE2=webkit-1.2.5-introspection-1.2.patch
       SOURCE_URL=http://www.webkitgtk.org
-     SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:e9afc573d2459794c3749ba404f2187f9dcc9ed3
-     SOURCE2_VFY=sha1:7a8dc56304a57d4e4a9819e61ab7a97cfee0f3ee
+      SOURCE_VFY=sha1:675ae0bfef56b8519f3f00b04fc7baf72215bd3b
         WEB_SITE=http://www.webkit.org
          ENTERED=20070919
-         UPDATED=20110208
+         UPDATED=20110830
            SHORT="gtk+ web rendering engine"
-           PSAFE=no
 
+PSAFE=no
 cat << EOF
 WebKitGTK+ is a web content engine, derived from KHTML and KJS from KDE,
 and used primarily in Apple's Safari browser. It is made to be embedded