[gtk-osx] Bug 779725 - Cannot build using local modulesets

[John Ralls <jralls src gnome org>]

commit 7a75f52c93db3d4516f4eddb9bf0599afbe5db64
Author: John Ralls <jralls ceridwen us>
Date:   Tue Mar 7 14:17:15 2017 -0800

    Bug 779725 - Cannot build using local modulesets
    
    Add the javascript and network modulesets to the copy list.

 gtk-osx-build-setup.sh                    |    2 +-
 modulesets-stable/gtk-osx-network.modules |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gtk-osx-build-setup.sh b/gtk-osx-build-setup.sh
index f9ed8c5..3366eef 100755
--- a/gtk-osx-build-setup.sh
+++ b/gtk-osx-build-setup.sh
@@ -103,7 +103,7 @@ if [ ! -f $HOME/.jhbuildrc-custom ]; then
 fi
 
 echo "Installing gtk-osx moduleset files..."
-MODULES="bootstrap.modules gtk-osx-bootstrap.modules gtk-osx.modules gtk-osx-gstreamer.modules 
gtk-osx-gtkmm.modules gtk-osx-python.modules gtk-osx-random.modules gtk-osx-themes.modules 
gtk-osx-unsupported.modules gtk-osx-universal.modules"
+MODULES="bootstrap.modules gtk-osx-bootstrap.modules gtk-osx.modules gtk-osx-gstreamer.modules 
gtk-osx-gtkmm.modules gt-osx-javascript.modules gtk-osx-network.modules gtk-osx-python.modules 
gtk-osx-random.modules gtk-osx-themes.modules gtk-osx-unsupported.modules gtk-osx-universal.modules"
 
 for m in $MODULES; do
     get_moduleset_from_git $m
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index 2b2a38b..1ea3f65 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -42,7 +42,7 @@
 
   <!-- of the many arguments such as prefix and libdir that jhbuild might pass
   to configure, openssl only understands prefix, and only with =. -->
-  <autotools id="openssl" autogen-sh="Configure" autogenargs="shared"
+  <autotools id="openssl" autogen-sh="Configure" autogenargs="shared "
              autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl 
%(autogenargs)s"
              makeinstallargs="install_sw" supports-non-srcdir-builds="no">
     <branch module="openssl-1.0.2f.tar.gz" version="1.0.2f" repo="openssl"
@@ -233,7 +233,7 @@
     USE_LIBHYPHEN: Requires libhyphen. No module for this yet.
   -->
   <cmake id="webkit2gtk3"
-         cmakeargs="-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_TOOLS=ON 
-DENABLE_MINIBROWSER=ON -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF 
-DENABLE_CREDENTIAL_STORAGE=OFF -DENABLE_GEOLOCATION=OFF -DENABLE_OPENGL=OFF -DUSE_LIBNOTIFY=OFF 
-DUSE_LIBHYPHEN=OFF -DCMAKE_CXX_FLAGS='-stdlib=libc++'">
+         cmakeargs='-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_TOOLS=ON 
-DENABLE_MINIBROWSER=ON -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF 
-DENABLE_CREDENTIAL_STORAGE=OFF -DENABLE_GEOLOCATION=OFF -DENABLE_OPENGL=OFF -DUSE_LIBNOTIFY=OFF 
-DUSE_LIBHYPHEN=OFF -DCMAKE_CXX_FLAGS="$CXX_FLAGS -stdlib=libc++"'>
     <branch repo="webkit.org" module="webkitgtk-2.10.2.tar.xz" version="2.10.2">
       <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144561-quartz-backend.patch";
              strip="1"/>