New installers: 2018-03-12

* Closes #13 -> add missing libjasper and libjpeg dlls

README.md

@@ -1,53 +1,57 @@
 GTK+ for Windows Runtime Environment Installer: 64-bit
 ======================================================
 
+[![PayPal](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/tomschoonjans/10)   [![Amazon Wish list](https://img.shields.io/badge/Amazon-Wishlist-green.svg)](http://amzn.eu/8ml3d0c)
+
 This repository is a fork of the  [GTK+ for Windows Runtime Environment Installer](http://gtk-win.sourceforge.net) that was originally created
 by Alexander Shaduri.
-My efforts here will focus on creating a **64-bit version** of the GTK+-2 runtime that he has been providing so far, using up to date versions of GTK+ and its dependencies. Recently I have also created a 64-bit **GTK+-3 runtime package**. All packages now contain **Gtkmm** and its dependencies too. Since the GTK+ developers recently dropped support for stock icons (a mistake of epic proportions IMHO...), I added the Adwaita icon theme to the GTK+-3 runtime, so you can still enjoy pretty filechooserdialogs etc! I have also added a couple of commonly used libraries such as libxml++, libxslt and gtksourceview.
+My efforts here will focus on creating a **64-bit version** of the GTK+-2 runtime that he has been providing so far, using up to date versions of GTK+ and its dependencies. Recently I have also created a 64-bit **GTK+-3 runtime package**. All packages now contain **Gtkmm** and its dependencies too. Since the GTK+ developers recently dropped support for stock icons (a mistake of epic proportions IMHO...), I added the Adwaita icon theme to the GTK+-3 runtime, so you can still enjoy pretty filechooserdialogs etc! I have also added a couple of commonly used libraries such as libxml++, libxslt, gtksourceview, libsoup and sqlite.
 
-The installers can be found [here](http://lvserver.ugent.be/gtk-win64/).
+The installers can be found in the [releases section](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases).
 
-**[Keep in mind though that these packages are experimental. Binary compatibility between versions is not guaranteed!!!.](http://www.gtk.org/download/win64.php)** 
-
-The current releases ([gtk2-runtime-2.24.31-2017-03-09-ts-win64.exe](http://lvserver.ugent.be/gtk-win64/gtk2-runtime/gtk2-runtime-2.24.31-2017-03-09-ts-win64.exe) and [gtk3-runtime-3.22.8-2017-03-09-ts-win64.exe](http://lvserver.ugent.be/gtk-win64/gtk3-runtime/gtk3-runtime-3.22.8-2017-03-09-ts-win64.exe)) were obtained entirely from the excellent [MSYS2 project](www.msys2.org), and were **not** compiled by myself, as was the case for previous releases. Users who want to compile against this runtime are strongly encouraged to set up a MSYS2 installation themselves, and install the required packages (compiled with the mingw-w64-x86\_64 toolchain!!!).
+The current releases ([gtk2-runtime-2.24.32-2018-03-12-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2018-03-12/gtk2-runtime-2.24.32-2018-03-12-ts-win64.exe) and [gtk3-runtime-3.22.28-2018-03-12-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2018-03-12/gtk3-runtime-3.22.28-2018-03-12-ts-win64.exe)) were obtained entirely from the excellent [MSYS2 project](www.msys2.org), and were **not** compiled by myself, as was the case for releases made before 2017. Users who want to compile against this runtime are strongly encouraged to set up a MSYS2 installation themselves, and install the required packages (compiled with the mingw-w64-x86\_64 toolchain!!!).
 
 The following packages are included in the current GTK+-2/3 installers
 
-* [adwaita icon theme](http://ftp.gnome.org/pub/GNOME/sources/adwaita-icon-theme/) (3.22.0)
-* [atk](http://ftp.gnome.org/pub/GNOME/sources/atk/) (2.22.0)
-* [atkmm](http://ftp.gnome.org/pub/GNOME/sources/atkmm/) (2.24.2)
-* [cairo](http://cairographics.org/releases/) (1.15.4)
+* [adwaita icon theme](http://ftp.gnome.org/pub/GNOME/sources/adwaita-icon-theme/) (3.26.1)
+* [atk](http://ftp.gnome.org/pub/GNOME/sources/atk/) (2.26.1)
+* [atkmm](http://ftp.gnome.org/pub/GNOME/sources/atkmm/) (2.26.0)
+* [cairo](http://cairographics.org/releases/) (1.15.10)
 * [cairomm](http://cairographics.org/releases/) (1.12.0)
-* [fontconfig](http://www.freedesktop.org/software/fontconfig/release/) (2.12.1)
-* [freetype](http://www.freetype.org/download.html) (2.7.1)
-* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.36.5)
+* [fontconfig](http://www.freedesktop.org/software/fontconfig/release/) (2.12.6)
+* [freetype](http://www.freetype.org/download.html) (2.9)
+* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.36.11)
 * [gettext](http://ftp.gnu.org/pub/gnu/gettext/) (0.19.8.1)
-* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.50.3)
-* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.50.0)
-* [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.31)
-* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.22.9)
+* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.54.3)
+* [glib-networking](http://ftp.gnome.org/pub/GNOME/sources/glib-networking/) (2.54.1)
+* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.54.1)
+* [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.32)
+* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.22.28)
 * [gtkmm2](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (2.24.4)
 * [gtkmm3](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (3.22.0)
 * [gtksourceview2](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (2.10.5)
-* [gtksourceview3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (3.20.4)
+* [gtksourceview3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (3.24.6)
 * ~~[gtksourceviewmm2](http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/) (2.10.3)~~ (currently unavailable)
-* [gtksourceviewmm3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/) (3.18.0)
-* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (1.4.4)
+* [gtksourceviewmm3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/) (3.21.3)
+* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (1.7.5)
 * [hicolor-icon-theme](http://icon-theme.freedesktop.org/releases/) (0.15)
-* [json-glib](http://ftp.gnome.org/pub/gnome/sources/json-glib/) (1.2.2)
-* [libepoxy](https://github.com/anholt/libepoxy) (1.3.1)
+* [json-glib](http://ftp.gnome.org/pub/gnome/sources/json-glib/) (1.4.2)
+* [libepoxy](https://github.com/anholt/libepoxy) (1.5.0)
 * [libffi](http://sourceware.org/libffi/) (3.2.1)
 * [libiconv](https://ftp.gnu.org/pub/gnu/libiconv/) (1.15)
-* [libpng](http://sourceforge.net/project/showfiles.php?group_id=5624) (1.6.28)
+* [libpng](http://sourceforge.net/project/showfiles.php?group_id=5624) (1.6.34)
+* [librsvg](http://ftp.gnome.org/pub/GNOME/sources/librsvg/) (2.40.20)
 * [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.0)
-* [libxml2](http://xmlsoft.org/sources/) (2.9.4)
+* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.60.3)
+* [libxml2](http://xmlsoft.org/sources/) (2.9.7)
 * [libxml++2](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (2.40.0)
 * [libxml++3](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (3.0.0)
-* [libxslt](http://xmlsoft.org/sources/) (1.1.29)
-* [pango](http://ftp.gnome.org/pub/GNOME/sources/pango/) (1.40.3)
+* [libxslt](http://xmlsoft.org/sources/) (1.1.32)
+* [pango](http://ftp.gnome.org/pub/GNOME/sources/pango/) (1.40.11)
 * [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.40.0)
-* [pcre](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) (8.40)
+* [pcre](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) (8.41)
 * [pixman](http://cairographics.org/releases/) (0.34.0)
+* [sqlite](https://www.sqlite.org) (3.21.0)
 * [zlib](http://www.zlib.net) (1.2.11)
 
 For all other information regarding how to use the installer, the reader is kindly referred to [Alexander Shaduri's website](http://gtk-win.sourceforge.net) of the GTK for Windows runtime environment installer. The only difference with the installers found at his website is that mine DO NOT have the `compatdlls` option, but this should present no problems to any user.  
@@ -56,4 +60,6 @@ Personally I use this installer in my [XMI-MSIM project](http://github.com/xmims
 
 Those interested in scientific plotting using Gtkmm3 may want to have a look at my project [Gtkmm-PLplot](https://github.com/tschoonj/gtkmm-plplot). Documentation and examples can be found [here](http://tschoonj.github.io/gtkmm-plplot)
 
+If you have enjoyed using this project, please consider making a donation or buying something off my Amazon Wish list. 
+
 Tom Schoonjans

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
@@ -99,8 +102,23 @@ cp $INSTALL_SRC_MSYS2_BIN/libbz2-1.dll $INSTALL_SRC_BIN
 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
+cp $INSTALL_SRC_MSYS2_BIN/libjasper-4.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libjpeg-8.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/libidn2-0.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 +143,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 +151,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 +174,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/gtk2-runtime.ts.nsi

@@ -12,9 +12,9 @@
 ; should be installable side by side with this package.
 
 
-!define GTK_VERSION "2.24.31"
+!define GTK_VERSION "2.24.32"
 !define GTK_BIN_VERSION "2.10.0"
-!define PRODUCT_VERSION "${GTK_VERSION}-2017-03-09-ts-win64"
+!define PRODUCT_VERSION "${GTK_VERSION}-2018-03-12-ts-win64"
 !define PRODUCT_NAME "GTK2-Runtime Win64"
 !define PRODUCT_PUBLISHER "Tom Schoonjans"
 !define PRODUCT_WEB_SITE "https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer"
@@ -270,6 +270,9 @@ SectionIn 1 2 RO
 	File bin\libpangomm-1.4-1.dll
 	File bin\libpixman-1-0.dll  ; libpixman, needed by cairo
 	File bin\libpng16-16.dll  ; for gdk_pixbuf loader.
+	File bin\libjasper-4.dll  ; for gdk_pixbuf loader.
+	File bin\libjpeg-8.dll  ; for gdk_pixbuf loader.
+	File bin\libtiff-5.dll  ; for gdk_pixbuf loader.
 	File bin\libxml++-2.6-2.dll  ; fontconfig needs this
 	File bin\libxml++-3.0-1.dll
 	File bin\libpcre-1.dll
@@ -280,7 +283,8 @@ SectionIn 1 2 RO
 	File bin\libbz2-1.dll			; required by fontconfig
 	File bin\libgraphite2.dll		; required by harfbuzz
 	File bin\librsvg-2-2.dll		; required by adwaita-icon-theme
-	File bin\libtiff-5.dll			; required by gdk-pixbuf2
+	File bin\libcroco-0.6-3.dll		; required by adwaita-icon-theme
+	File bin\liblzma-5.dll		; required by adwaita-icon-theme
 	File bin\libstdc++-6.dll
 	File bin\libgcc_s_seh-1.dll
 	File bin\libwinpthread-1.dll
@@ -626,6 +630,9 @@ Function un.DeleteDlls
 	Delete $LIB_INSTDIR\libpangomm-1.4-1.dll
 	Delete $LIB_INSTDIR\libpixman-1-0.dll  ; libpixman, needed by cairo
 	Delete $LIB_INSTDIR\libpng16-16.dll  ; for gdk_pixbuf loader.
+	Delete $LIB_INSTDIR\libjasper-4.dll  ; for gdk_pixbuf loader.
+	Delete $LIB_INSTDIR\libjpeg-8.dll  ; for gdk_pixbuf loader.
+	Delete $LIB_INSTDIR\libtiff-5.dll  ; for gdk_pixbuf loader.
 	Delete $LIB_INSTDIR\libxml2-2.dll  ; fontconfig needs this
 	Delete $LIB_INSTDIR\libxslt-1.dll  ; fontconfig needs this
 	Delete $LIB_INSTDIR\libxml++-2.6-2.dll  ; fontconfig needs this
@@ -636,7 +643,8 @@ Function un.DeleteDlls
 	Delete $LIB_INSTDIR\libbz2-1.dll
 	Delete $LIB_INSTDIR\libgraphite2.dll
 	Delete $LIB_INSTDIR\librsvg-2-2.dll
-	Delete $LIB_INSTDIR\libtiff-5.dll
+	Delete $LIB_INSTDIR\libcroco-0.6-3.dll
+	Delete $LIB_INSTDIR\liblzma-5.dll
 	Delete $LIB_INSTDIR\libstdc++-6.dll
 	Delete $LIB_INSTDIR\libgcc_s_seh-1.dll
 	Delete $LIB_INSTDIR\libwinpthread-1.dll

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

@@ -11,9 +11,9 @@
 ; Directory and package names: gtk3-runtime.
 
 
-!define GTK_VERSION "3.22.9"
+!define GTK_VERSION "3.22.28"
 !define GTK_BIN_VERSION "3.0.0"
-!define PRODUCT_VERSION "${GTK_VERSION}-2017-03-09-ts-win64"
+!define PRODUCT_VERSION "${GTK_VERSION}-2018-03-12-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"
@@ -272,6 +272,8 @@ SectionIn 1 2 RO
 	File bin\libpangomm-1.4-1.dll
 	File bin\libpixman-1-0.dll  	; libpixman, needed by cairo
 	File bin\libpng16-16.dll  		; required by gdk-pixbuf2
+	File bin\libjpeg-8.dll  		; required by gdk-pixbuf2
+	File bin\libjasper-4.dll  		; required by gdk-pixbuf2
 	File bin\libxml++-2.6-2.dll  ; fontconfig needs this
 	File bin\libxml++-3.0-1.dll
 	File bin\libxml2-2.dll			; fontconfig needs this
@@ -286,6 +288,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\libidn2-0.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 +329,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
@@ -632,6 +652,8 @@ Function un.DeleteDlls
 	Delete $LIB_INSTDIR\libpangomm-1.4-1.dll
 	Delete $LIB_INSTDIR\libpixman-1-0.dll  ; libpixman, needed by cairo
 	Delete $LIB_INSTDIR\libpng16-16.dll  ; for gdk_pixbuf loader.
+	Delete $LIB_INSTDIR\libjasper-4.dll  ; for gdk_pixbuf loader.
+	Delete $LIB_INSTDIR\libjpeg-8.dll  ; for gdk_pixbuf loader.
 	Delete $LIB_INSTDIR\libxslt-1.dll  ; fontconfig needs this
 	Delete $LIB_INSTDIR\libpcre-1.dll  ; fontconfig needs this
 	Delete $LIB_INSTDIR\libxml2-2.dll  ; fontconfig needs this
@@ -646,6 +668,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\libidn2-0.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 +817,14 @@ 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"
+
+	Delete "$INSTDIR\ssl\certs\ca-bundle.crt"
+	Delete "$INSTDIR\ssl\certs\ca-bundle.trust.crt"
+	RMDir "$INSTDIR\ssl\certs"
+	RMDir "$INSTDIR\ssl"
 
 	; 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.5
+# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.36.11
 #
 # LoaderDir = C:\msys64\mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders
 #
@@ -35,12 +35,25 @@
 "  \001   " "zz znz" 100
 "  \002   " "zz znz" 100
 
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-jasper.dll"
+"jpeg2000" 4 "gdk-pixbuf" "JPEG 2000" "LGPL"
+"image/jp2" "image/jpeg2000" "image/jpx" ""
+"jp2" "jpc" "jpx" "j2k" "jpf" ""
+"    jP" "!!!!  " 100
+"\377O\377Q" "" 100
+
 "lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-jpeg.dll"
 "jpeg" 5 "gdk-pixbuf" "JPEG" "LGPL"
 "image/jpeg" ""
 "jpeg" "jpe" "jpg" ""
 "\377\330" "" 100
 
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-png.dll"
+"png" 5 "gdk-pixbuf" "PNG" "LGPL"
+"image/png" ""
+"png" ""
+"\211PNG\r\n\032\n" "" 100
+
 "lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-pnm.dll"
 "pnm" 4 "gdk-pixbuf" "PNM/PBM/PGM/PPM" "LGPL"
 "image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""

gtk-nsis-pack/lib/gtk-2.0/2.10.0/immodules.cache

@@ -1,6 +1,6 @@
 # GTK+ Input Method Modules file
 # Automatically generated file, do not edit
-# Created by C:\msys64\mingw64\bin\gtk-query-immodules-2.0.exe from gtk+-2.24.31
+# Created by C:\msys64\mingw64\bin\gtk-query-immodules-2.0.exe from gtk+-2.24.32
 #
 # ModulesPath = C:\msys64\home\schoon\.gtk-2.0\2.10.0\x86_64-w64-mingw32\immodules;C:\msys64\home\schoon\.gtk-2.0\2.10.0\immodules;C:\msys64\home\schoon\.gtk-2.0\x86_64-w64-mingw32\immodules;C:\msys64\home\schoon\.gtk-2.0\immodules;C:\msys64\mingw64\lib\gtk-2.0\2.10.0\x86_64-w64-mingw32\immodules;C:\msys64\mingw64\lib\gtk-2.0\2.10.0\immodules;C:\msys64\mingw64\lib\gtk-2.0\x86_64-w64-mingw32\immodules;C:\msys64\mingw64\lib\gtk-2.0\immodules
 #

gtk-nsis-pack/share/glib-2.0/schemas/gschema.dtd

@@ -1,4 +1,4 @@
-<!ELEMENT schemalist (schema|enum)* >
+<!ELEMENT schemalist (schema|enum|flags)* >
 <!ATTLIST schemalist gettext-domain CDATA #IMPLIED >
 
 <!ELEMENT schema (key|child|override)* >
@@ -47,7 +47,8 @@
 
 <!-- range is only allowed for keys with numeric type -->
 <!ELEMENT range EMPTY >
-<!-- min and max must be parseable as values of the key type and min < max -->
+<!-- min and max must be parseable as values of the key type and
+     min must be less than or equal to max -->
 <!ATTLIST range min CDATA #REQUIRED
                 max CDATA #REQUIRED >
 

gtk-nsis-pack/share/glib-2.0/schemas/org.gtk.Settings.EmojiChooser.gschema.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+
+  <schema id='org.gtk.Settings.EmojiChooser' path='/org/gtk/settings/emoji-chooser/'>
+    <key name='recent-emoji' type='a((auss)u)'>
+      <default>[]</default>
+      <summary>Recently used Emoji</summary>
+      <description>
+        An array of Emoji definitions to show in the Emoji chooser. Each Emoji is
+        specified as an array of codepoints, name and shortname. The extra integer after this
+        pair is the code of the Fitzpatrick modifier to use in place of a 0 in the
+        codepoint array.
+      </description>
+    </key>
+  </schema>
+
+</schemalist>