[Lunar-commits] <moonbase-other> webkit: flag cleanup and changed gst-plugins-good to hard dependency

[v4hn]

commit 76c78687fb920bb8cf2e0cbccfd4c48f5b78ad54
Author: v4hn <me at v4hn.de>
Date: Sun, 05 Aug 2012 05:02:06 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/76c78687fb920bb8cf2e0cbccfd4c48f5b78ad54

webkit: flag cleanup and changed gst-plugins-good to hard dependency
---
  web/webkit/BUILD                                             +5/-8     
  web/webkit/CONFIGURE                                         +3/-2     
  web/webkit/DEPENDS                                           +5/-2     
  web/webkit/DETAILS                                           +2/-0     
  4 files changed, 15 insertions (+), 12 deletions (-)

--- a/web/webkit/BUILD
+++ b/web/webkit/BUILD
@@ -5,23 +5,20 @@
           --with-unicode-backend=icu    \
           --with-font-backend=freetype  \
           --enable-xslt                 \
-          --enable-svg                  \
-          --enable-svg-animation        \
-          --enable-svg-fonts            \
-          --enable-svg-foreign-object   \
-          --enable-svg-as-image         \
           --enable-optimizations        \
-	  --disable-glibtest            \
+          --disable-glibtest            \
           --with-gtk=2.0                \
+          --enable-video                \
+          --disable-web-audio           \
           --disable-gtk-doc-html"      &&
 
   #make build work even if gtk-doc is not installed
   if ! module_installed gtk-doc ; then
-    sed -i '/gtkdoc --rebase/s:^:# :' GNUmakefile.in 
+    sed -i '/gtkdoc --rebase/s:^:# :' GNUmakefile.in
   fi &&
 
   #stolen from blfs, avoid race condition in build with multiple makes
-  default_config && 
+  default_config &&
   error_count=0 &&
   until default_make
   do
--- a/web/webkit/CONFIGURE
+++ b/web/webkit/CONFIGURE
@@ -1,10 +1,11 @@
 mquery WEBSOCKETS "Enable web socket support?" y "--enable-web-sockets" "--disable-web-sockets"
 mquery ENABLE_SPELL "Enable support for spellcheck?" n "--enable-spellcheck" "--disable-spellcheck"
-mquery ENABLE_3D "Enable support for 3D transforms" n "--enable-3d-transforms" "--disable-3d-transforms"
 mquery ENABLE_WEBGL "Enable support for WebGL (experimental)?" n "--enable-webgl" "--disable-webgl"
 mquery ENABLE_GRID "Enable HTML5 datagrid support?" n "--enable-datagrid" "--disable-datagrid"
 mquery ENABLE_TRANSFER  "Enable HTML5 data transfer items support?" n "--enable-data-transfer-items" "--disable-data-transfer-items"
 mquery ENABLE_INDEX "Enable the indexed database API?" n "--enable-indexed-database" "--disable-indexed-database"
 mquery ENABLE_SPEECH "Enable the speech input API?" n "--enable-input-speech" "--disable-input-speech"
 mquery ENABLE_RESIZE "Enable image resizer?" n "--enable-image-resizer" "--disable-image-resizer"
-mquery ENABLE_WEB_AUDIO "Enable support for Web Audio ?" n " --enable-web-audio" "--disable-web-audio"
+
+# y to this breaks build with 1.8.2 so --disable is in BUILD for now
+#mquery ENABLE_WEB_AUDIO "Enable support for Web Audio ?" n " --enable-web-audio" "--disable-web-audio"
--- a/web/webkit/DEPENDS
+++ b/web/webkit/DEPENDS
@@ -13,7 +13,10 @@ depends gst-plugins-base
 # workaround for make_names.pl
 depends Switch
 
-optional_depends "gst-plugins-good"      "--enable-video"         "--disable-video"         "for HTML5 video support"
+# compile fails without this for 1.8.2 so --enable is in BUILD for now
+#optional_depends "gst-plugins-good"      "--enable-video"         "--disable-video"         "for HTML5 video support"
+depends "gst-plugins-good"
+
 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"
+optional_depends "librsvg"      "--enable-svg --enable-svg-fonts" "--disable-svg"           "for svg graphics support"
--- a/web/webkit/DETAILS
+++ b/web/webkit/DETAILS
@@ -1,3 +1,5 @@
+# WHEN BUMPING THIS MODULE PLEASE CHECK IF ANY OF THE COMMENTED
+# BUILD OPTIONS IN CONFIGURE/DEPENDS WORK AGAIN!
           MODULE=webkit
          VERSION=1.8.2
           SOURCE=$MODULE-$VERSION.tar.xz