gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/9ba53a20 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/9f524789 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/8d412fa8 (commit)



commit 9ba53a2091348b41bf033a8508f069d68200a46a
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 16 12:36:11 2017 -0700

    Make GLIB_VERSION match the glib installation.

diff --git a/defaults.sh b/defaults.sh
index a74a448..ea2a8ec 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -212,7 +212,7 @@ set_default GUILE_PATCH `pwd`/guile-1.8.patch
 set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
 set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
 
-GLIB_VERSION="2.38.2"
+GLIB_VERSION="2.42.2"
 GNUTLS_VERSION="3.2.19"
 set_default BUILD_GNUTLS_FROM_SOURCE "no"
 set_default GNUTLS_URL  "$GC_DEPS_URL/gnutls-3.2.19-minGW.tgz"

commit 9f524789a7ca6d08ba8f35644db0fd2ba2262853
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Apr 15 13:35:42 2017 -0700

    Revert "Temporary kluge to get nightlies building until WebKit is rebuilt."
    
    This reverts commit cff2538da1634fedb98cf8e284f781bfb16eae76.

diff --git a/defaults.sh b/defaults.sh
index 3d8662c..a74a448 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -310,9 +310,8 @@ set_default HH_DIR $GLOBAL_DIR\\hh
 
 set_default BUILD_WEBKIT_FROM_SOURCE no
 set_default WEBKIT_VERSION "1.8.3"
-set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-minGW.tgz"
+set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-minGW-1.tgz"
 set_default WEBKIT_DEV_URL "$SF_MIRROR/gnucash/webkit-${WEBKIT_VERSION}-dev-minGW.tgz"
-set_default PTHREADGC2_URL "$GC_DEPS_URL/pthreadGC2.dll"
 set_default WEBKIT_DIR $GLOBAL_DIR\\webkit
 #NB: The Fedora project maintains a source version that has been patched for building in a Fedora-MinGW cross-compiler. This isn't quite good enough to build in MinGW itself, but it's a lot closer and less work than starting with a tarball direct from the WebKitGtk project.
 set_default WEBKIT_SRC_URL "https://pkgs.fedoraproject.org/repo/pkgs/mingw-webkitgtk/webkit-1.8.3.tar.xz/dcbf9d5e2e6391f857c29a57528b32a6/webkit-1.8.3.tar.xz"
diff --git a/dist-impl.sh b/dist-impl.sh
index 1aa62d6..0a8f5cf 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -236,7 +236,6 @@ function dist_webkit() {
     cp -a ${_LIBXSLT_UDIR}/bin/* ${_DIST_UDIR}/bin
     cp -a ${_ENCHANT_UDIR}/bin/* ${_DIST_UDIR}/bin
     cp -a ${_WEBKIT_UDIR}/bin/* ${_DIST_UDIR}/bin
-    cp -a ${_MINGW_UDIR}/bin/pthreadGC2.dll ${_DIST_UDIR}/bin
 }
 
 function dist_icu4c() {
diff --git a/install-impl.sh b/install-impl.sh
index 7320bb3..3134218 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1167,10 +1167,8 @@ function inst_webkit() {
             qpopd
         else
             mkdir -p $_WEBKIT_UDIR
-            _MINGW_UDIR=`unix_path $MINGW_DIR`
             wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
             wget_unpacked $WEBKIT_DEV_URL $DOWNLOAD_DIR $WEBKIT_DIR
-            smart_wget $PTHREADGC2_URL $_MINGW_UDIR/bin
             fix_libtool_files ${_WEBKIT_UDIR}
         fi
         quiet ${PKG_CONFIG} --exists webkit-1.0 || die "webkit not installed correctly"



Summary of changes:
 defaults.sh     | 5 ++---
 dist-impl.sh    | 1 -
 install-impl.sh | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)