[Lunar-commits] <moonbase> webkit: explicit disable flags and with flags in BUILD

[Christian Krause]

commit 7bd1792a9b98320ae5b171a4cf8c50a27cd30c11
Author: Christian Krause <wookietreiber at lunar-linux.org>
Date:   Tue Jun 21 19:37:10 2011 +0200

    webkit: explicit disable flags and with flags in BUILD
---
 web/webkit/BUILD     |   17 +++++++++++++----
 web/webkit/CONFIGURE |    2 +-
 web/webkit/DEPENDS   |   12 ++++--------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/web/webkit/BUILD b/web/webkit/BUILD
index d9f670e..77c0fca 100644
--- a/web/webkit/BUILD
+++ b/web/webkit/BUILD
@@ -8,10 +8,19 @@
 # Fix an icu4c problem.
   sedit "s:class TextBreakIterator;:typedef struct UBreakIterator TextBreakIterator;:" WebCore/platform/text/TextBreakIterator.h &&
 
-  OPTS+=" --enable-svg --enable-svg-animation      \
-        --enable-svg-fonts --enable-svg-foreign-object \
-        --enable-svg-as-image --enable-3D-transforms   \
-        --enable-optimizations --disable-gtk-doc-html" &&
+  # defaults using 'with' flags
+  OPTS+=" --with-target=x11             \
+          --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-3D-transforms        \
+          --enable-optimizations        \
+          --disable-gtk-doc-html"      &&
 
   default_build &&
 
diff --git a/web/webkit/CONFIGURE b/web/webkit/CONFIGURE
index 455b4b5..3a05ef9 100644
--- a/web/webkit/CONFIGURE
+++ b/web/webkit/CONFIGURE
@@ -1 +1 @@
-mquery  WEBSOCKETS     "Enable web socket support?"  y  "--enable-web-sockets"
+mquery WEBSOCKETS "Enable web socket support?" y "--enable-web-sockets" "--disable-web-sockets"
diff --git a/web/webkit/DEPENDS b/web/webkit/DEPENDS
index 8c92d1f..af33177 100644
--- a/web/webkit/DEPENDS
+++ b/web/webkit/DEPENDS
@@ -13,11 +13,7 @@ depends gst-plugins-base
 # workaround for make_names.pl
 depends Switch
 
-optional_depends  gst-plugins-good  "--enable-video"  ""  \
-                  "For HTML5 video support"
-
-optional_depends  geoclue "--enable-geolocation"  "--disable-geolocation"  \
-                  "For geolocation support"
-
-optional_depends  gobject-introspection  "--enable-introspection"  ""  \
-                  "Say Y for Epiphany, and possibly others"
+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"