http/webkitgtk3: removed bash shortcuts, fixed building with added hyphen

                 option, reformatted some files

4 files changed, 35 insertions, 16 deletions

diff --git a/http/webkitgtk3/BUILD b/http/webkitgtk3/BUILD
index a8369b8de0..2dd60ae44a 100755
--- a/http/webkitgtk3/BUILD
+++ b/http/webkitgtk3/BUILD
@@ -1,6 +1,7 @@
 OPTS="$WEBKIT_OPTS $OPTS" &&
 sed -i '30i#include <unicode/utf8.h>' \
-    Source/WebCore/platform/text/TextCodecUTF8.h &&
+    Source/WebCore/platform/text/TextCodecUTF8.h \
+    Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp &&
 sed -i '30i#include <unicode/utf16.h>' \
     Source/WTF/wtf/text/StringBuilder.h &&
 sed -i '26i#include <unicode/utf16.h>' \
diff --git a/http/webkitgtk3/CONFIGURE b/http/webkitgtk3/CONFIGURE
index 87e576f027..97ef3e41fc 100755
--- a/http/webkitgtk3/CONFIGURE
+++ b/http/webkitgtk3/CONFIGURE
@@ -1,8 +1,11 @@
 config_query_option WEBKIT_OPTS "Enable support for WebGL" y \
-                    -DENABLE_WEBGL={ON,OFF} &&
+                                "-DENABLE_WEBGL=ON" \
+                                "-DENABLE_WEBGL=OFF" &&
 
 config_query_option WEBKIT_OPTS "Enable JIT compilation?" y \
-                    -DENABLE_JIT={ON,OFF} &&
+                                "-DENABLE_JIT=ON" \
+                                "-DENABLE_JIT=OFF" &&
 
 config_query_option WEBKIT_OPTS "Enable Media statistics?" n \
-                    -DENABLE_MEDIA_STATISTICS={ON,OFF}
+                                "-DENABLE_MEDIA_STATISTICS=ON" \
+                                "-DENABLE_MEDIA_STATISTICS=OFF"
diff --git a/http/webkitgtk3/DEPENDS b/http/webkitgtk3/DEPENDS
index f21b438374..1b55fbc1a0 100755
--- a/http/webkitgtk3/DEPENDS
+++ b/http/webkitgtk3/DEPENDS
@@ -19,7 +19,7 @@ depends freetype2 &&
 depends -sub ICU harfbuzz &&
 depends cairo &&
 depends pango &&
-depends gtk+3 -DPORT=GTK &&
+depends gtk+3 "-DPORT=GTK" &&
 depends gdk-pixbuf2 &&
 depends libsoup &&
 depends at-spi2-core &&
@@ -36,37 +36,46 @@ if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
 fi &&
 
 optional_depends enchant \
-                 -DENABLE_SPELLCHECK={ON,OFF} \
+                 "-DENABLE_SPELLCHECK=ON" \
+                 "-DENABLE_SPELLCHECK=OFF" \
                  "Enable spellchecking support?" &&
 
+optional_depends hyphen \
+                 "-DUSE_LIBHYPHEN=ON" \
+                 "-DUSE_LIBHYPHEN=OFF" \
+                 "Enable default automatic hyphenation?"
+
 optional_depends libsecret \
-                 -DENABLE_CREDENTIAL_STORAGE={1,0} \
+                 "-DENABLE_CREDENTIAL_STORAGE=1" \
+                 "-DENABLE_CREDENTIAL_STORAGE=0" \
                  "Enable support for credential storage?" &&
 
-optional_depends gobject-introspection "" "" \
+optional_depends gobject-introspection \
+                 "-DENABLE_INTROSPECTION=ON" \
+                 "-DENABLE_INTROSPECTION=OFF" \
                  "Enable GObject introspection?" &&
 
 optional_depends geoclue \
-                 -DENABLE_GEOLOCATION={ON,OFF} \
+                 "-DENABLE_GEOLOCATION=ON" \
+                 "-DENABLE_GEOLOCATION=OFF" \
                  "Enable geolocation support?" &&
 
 optional_depends gstreamer-1.0 \
                  "-DENABLE_WEB_AUDIO=ON -DENABLE_VIDEO=ON" \
                  "-DENABLE_WEB_AUDIO=OFF -DENABLE_VIDEO=OFF" \
-                 "Enable support for enable HTML5 video and Web Audio?" &&
+                 "Enable support for HTML5 video and Web Audio?" &&
 
 if is_depends_enabled $SPELL gstreamer-1.0 ; then
    depends gst-plugins-base-1.0
 fi &&
 
 optional_depends upower \
-                 -DENABLE_BATTERY_STATUS={ON,OFF} \
+                 "-DENABLE_BATTERY_STATUS=ON" \
+                 "-DENABLE_BATTERY_STATUS=OFF" \
                  "Enable support for Battery Status API?" &&
 
 optional_depends gtk-doc \
-                 -DENABLE_GTKDOC={ON,OFF} \
-                 "Build documentation with gtk-doc?" &&
+                 "-DENABLE_GTKDOC=ON" \
+                 "-DENABLE_GTKDOC=OFF" \
+                 "Build documentation with gtk-doc?"
 
-optional_depends gobject-introspection \
-                 -DENABLE_INTROSPECTION={ON,OFF} \
-                 "Enable introspection?"
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index 04b68555ec..38a7bceecd 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,9 @@
+2016-03-25 Pavel Vinogradov <public@sourcemage.org>
+	* BUILD: added fix to build with hyphen
+	* CONFIGURE: expanded bash shortcuts, reformatted
+	* DEPENDS: removed shortcuts and extra gobject-introspection entry
+	  from previous commit, added hyphen as option, fixed typo
+
 2016-03-22 Pavel Vinogradov <public@sourcemage.org>
 	* DETAILS: updated spell to 2.12.0
 	* DEPENDS: x86_64 version needs llvm, added optional