[Lunar-commits] <moonbase-gnome3> Merge branch 'master' of github.com:lunar-linux/moonbase-gnome3

[Florin Braescu]

commit 44b5b67a42bf04a24ca494a67e7bac12a6ff7b4e
Author: Florin Braescu <florin at lunar-linux.org>
Date: Sun, 19 Oct 2014 18:26:26 +0300
URL: https://github.com/lunar-linux/moonbase-gnome3/commit/44b5b67a42bf04a24ca494a67e7bac12a6ff7b4e

Merge branch 'master' of github.com:lunar-linux/moonbase-gnome3
---
  core/ModemManager/DEPENDS | +1/-1     
  libs/webkitgtk3/BUILD     | +2/-2     
  libs/webkitgtk3/CONFIGURE | +2/-3     
  3 files changed, 5 insertions(+), 6 deletions(-)

--- a/core/ModemManager/DEPENDS
+++ b/core/ModemManager/DEPENDS
@@ -5,5 +5,5 @@ depends libmbim
 depends gobject-introspection
 depends vala
 
-optional_depends "usbmodesswitch" "" "" "if your modes shows up as a storage drive"
+optional_depends "usb-modeswitch" "" "" "if your modes shows up as a storage drive"
 
--- a/libs/webkitgtk3/BUILD
+++ b/libs/webkitgtk3/BUILD
@@ -1,12 +1,12 @@
 # breaks without webgl for now
-OPTS+=" --with-target=x11             \
+OPTS+=" --enable-x11-target           \
         --enable-xslt                 \
         --enable-optimizations        \
+        --enable-introspection        \
         --disable-glibtest            \
         --with-gtk=3.0                \
         --enable-video                \
         --enable-webgl                \
-        --disable-web-audio           \
         --disable-gtk-doc-html"      &&
 
 #make build work even if gtk-doc is not installed
--- a/libs/webkitgtk3/CONFIGURE
+++ b/libs/webkitgtk3/CONFIGURE
@@ -1,4 +1,3 @@
 mquery ENABLE_SPELL "Enable support for spellcheck?" n "--enable-spellcheck" "--disable-spellcheck"
-
-# 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"
+mquery ENABLE_WEB_AUDIO "Enable support for Web Audio ?" n " --enable-web-audio" "--disable-web-audio"
+mquery ENABLE_DEBUG_SYMBOLS "Enable debug symbols?" n "--enable-debug-symbols=yes" "--enable-debug-symbols=no"