Add libsoup support and fix gettext language files

gtk-nsis-pack/copy-msys2-files.sh

@@ -4,6 +4,7 @@
 # Set default values to option vars
 # ---------------------------------------------------------------------------
 set -e
+set -x
 INSTALL_SRC_DIR=$(dirname "$0")
 INSTALL_SRC_MSYS2="/mingw64/"
 _DATE=$(date +'%Y-%m-%d')
@@ -19,6 +20,8 @@ INSTALL_SRC_BIN="${INSTALL_SRC_DIR}"/bin
 INSTALL_SRC_LIB="${INSTALL_SRC_DIR}"/lib
 INSTALL_SRC_MSYS2_BIN=${INSTALL_SRC_MSYS2}/bin
 INSTALL_SRC_MSYS2_LIB=${INSTALL_SRC_MSYS2}/lib
+INSTALL_SRC_SSL="${INSTALL_SRC_DIR}"/ssl
+INSTALL_SRC_MSYS2_SSL=${INSTALL_SRC_MSYS2}/ssl
 
 # Create installer file name
 INSTALLER_FILENAME=gtk3-runtime-${_VERSION}-${_DATE}-${_ARCH}.msi
@@ -100,7 +103,20 @@ cp $INSTALL_SRC_MSYS2_BIN/libgraphite2.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/librsvg-2-2.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libtiff-5.dll $INSTALL_SRC_BIN
 
-# Standrard MSYS2 libraries
+# libsoup and its dependencies
+cp $INSTALL_SRC_MSYS2_BIN/libsoup-2.4-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libsoup-gnome-2.4-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libsqlite3-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgnutls-30.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgmp-10.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libhogweed-4.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libnettle-6.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libidn-11.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libp11-kit-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libtasn1-6.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libunistring-2.dll $INSTALL_SRC_BIN
+
+# Standard MSYS2 libraries
 cp $INSTALL_SRC_MSYS2_BIN/libstdc++-6.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libgcc_s_seh-1.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libwinpthread-1.dll $INSTALL_SRC_BIN
@@ -125,7 +141,7 @@ cp $INSTALL_SRC_MSYS2_BIN/gtk-update-icon-cache.exe $INSTALL_SRC_BIN
 cd $INSTALL_SRC_MSYS2_LIB/gtk-2.0
 cp -r ./ $INSTALL_SRC_LIB/gtk-2.0
 # Delete static libraries
-find $INSTALL_SRC_LIB/gtk-2.0 -name *.dll.a -type f -delete
+find $INSTALL_SRC_LIB/gtk-2.0 -name *.a -type f -delete
 
 # Copy lib/gdk-pixbuf-2.0 folder 
 cd $INSTALL_SRC_MSYS2_LIB/gdk-pixbuf-2.0
@@ -133,8 +149,16 @@ cp -r ./ $INSTALL_SRC_LIB/gdk-pixbuf-2.0
 # Delete static libraries
 find $INSTALL_SRC_LIB/gdk-pixbuf-2.0 -name *.a -type f -delete
 
+# Copy lib/gio/modules folder 
+cd $INSTALL_SRC_MSYS2_LIB/gio
+mkdir -p $INSTALL_SRC_LIB/gio
+cp -r modules $INSTALL_SRC_LIB/gio/
+# Delete static libraries
+find $INSTALL_SRC_LIB/gio/modules -name *.a -type f -delete
+
 # Copy /share/locale/locale.alias
-cp $INSTALL_SRC_MSYS2/share/locale/locale.alias $INSTALL_SRC_DIR/share/locale
+rm -r $INSTALL_SRC_DIR/share/locale
+cp -r $INSTALL_SRC_MSYS2/share/locale $INSTALL_SRC_DIR/share/
 
 # Copy /share/themes/default
 cp -r $INSTALL_SRC_MSYS2/share/themes/default/gtk-3.0 $INSTALL_SRC_DIR/share/themes/default/
@@ -148,6 +172,12 @@ cp -r $INSTALL_SRC_MSYS2/share/glib-2.0/schemas $INSTALL_SRC_DIR/share/glib-2.0/
 # Copy /share/icons
 cp -r $INSTALL_SRC_MSYS2/share/icons $INSTALL_SRC_DIR/share/
 
+# Copy SSL certificate bundle
+mkdir -p $INSTALL_SRC_SSL/certs
+cd $INSTALL_SRC_MSYS2_SSL/certs
+cp ca-bundle.crt ca-bundle.trust.crt $INSTALL_SRC_SSL/certs/
+
+
 # librsvg depends on:
 # gdk-pixbuf2  pango  libcroco
 

gtk-nsis-pack/gtk3-runtime.ts.nsi

@@ -13,7 +13,7 @@
 
 !define GTK_VERSION "3.22.18"
 !define GTK_BIN_VERSION "3.0.0"
-!define PRODUCT_VERSION "${GTK_VERSION}-2017-08-17-ts-win64"
+!define PRODUCT_VERSION "${GTK_VERSION}-2017-09-05-ts-win64"
 !define PRODUCT_NAME "GTK3-Runtime Win64"
 !define PRODUCT_PUBLISHER "Tom Schoonjans"
 !define PRODUCT_WEB_SITE "https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer"
@@ -286,6 +286,17 @@ SectionIn 1 2 RO
 	File bin\libstdc++-6.dll		; standard MSYS2 library
 	File bin\libgcc_s_seh-1.dll		; standard MSYS2 library
 	File bin\libwinpthread-1.dll	; standard MSYS2 library
+	File bin\libsoup-2.4-1.dll      ; libsoup
+	File bin\libsoup-gnome-2.4-1.dll      ; libsoup
+	File bin\libsqlite3-0.dll       ; libsoup dependency
+	File bin\libgnutls-30.dll       ; glib-networking dependency
+	File bin\libgmp-10.dll		; glib-networking dependency
+	File bin\libhogweed-4.dll       ; glib-networking dependency
+	File bin\libnettle-6.dll	; glib-networking dependency
+	File bin\libidn-11.dll		; glib-networking dependency
+	File bin\libp11-kit-0.dll	; glib-networking dependency
+	File bin\libtasn1-6.dll		; glib-networking dependency
+	File bin\libunistring-2.dll	; glib-networking dependency
 
 	; We install this into the same place as the DLLs to avoid any PATH manipulation.
 	SetOutPath "$LIB_INSTDIR"
@@ -316,6 +327,13 @@ SectionIn 1 2 RO
 	SetOutPath "$INSTDIR\lib\gdk-pixbuf-2.0\2.10.0\"
 	File /r lib\gdk-pixbuf-2.0\2.10.0\loaders
 
+	SetOutPath "$INSTDIR\lib\gio\modules"
+	File lib\gio\modules\libgiognutls.dll
+
+	SetOutPath "$INSTDIR\ssl\certs"
+	File ssl\certs\ca-bundle.crt
+	File ssl\certs\ca-bundle.trust.crt
+
 	;SetOutPath "$INSTDIR\lib\gtk-3.0\${GTK_BIN_VERSION}"
 	; no longer in gtk as of 2.14.5.
 	; File /r lib\gtk-2.0\${GTK_BIN_VERSION}\immodules
@@ -646,6 +664,17 @@ Function un.DeleteDlls
 	Delete $LIB_INSTDIR\libstdc++-6.dll
 	Delete $LIB_INSTDIR\libgcc_s_seh-1.dll
 	Delete $LIB_INSTDIR\libwinpthread-1.dll
+	Delete $LIB_INSTDIR\libsoup-2.4-1.dll      ; libsoup
+	Delete $LIB_INSTDIR\libsoup-gnome-2.4-1.dll      ; libsoup
+	Delete $LIB_INSTDIR\libsqlite3-0.dll       ; libsoup dependency
+	Delete $LIB_INSTDIR\libgnutls-30.dll       ; glib-networking dependency
+	Delete $LIB_INSTDIR\libgmp-10.dll		; glib-networking dependency
+	Delete $LIB_INSTDIR\libhogweed-4.dll       ; glib-networking dependency
+	Delete $LIB_INSTDIR\libnettle-6.dll	; glib-networking dependency
+	Delete $LIB_INSTDIR\libidn-11.dll		; glib-networking dependency
+	Delete $LIB_INSTDIR\libp11-kit-0.dll	; glib-networking dependency
+	Delete $LIB_INSTDIR\libtasn1-6.dll		; glib-networking dependency
+	Delete $LIB_INSTDIR\libunistring-2.dll	; glib-networking dependency
 
 
 FunctionEnd
@@ -784,7 +813,9 @@ Section Uninstall
 	RMDir "$INSTDIR\lib\gdk-pixbuf-2.0"  ; not forced
 
 
-	;RMDir /r "$INSTDIR\lib\gtk-2.0\modules"
+	Delete "$INSTDIR\lib\gio\modules\libgiognutls.dll"
+	RMDir "$INSTDIR\lib\gio\modules"
+	RMDir "$INSTDIR\lib\gio"
 
 	; no longer in gtk as of 2.14.5
 	;RMDir /r "$INSTDIR\lib\gtk-3.0\${GTK_BIN_VERSION}\immodules"

gtk-nsis-pack/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache

@@ -1,6 +1,6 @@
 # GdkPixbuf Image Loader Modules file
 # Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.36.6
+# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.36.8
 #
 # LoaderDir = C:\msys64\mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders
 #