New installers: 2019-04-26

Closes #23

README.md

@@ -1,6 +1,7 @@
 GTK+ for Windows Runtime Environment Installer: 64-bit
 ======================================================
 
+[![Github Downloads All Releases](https://img.shields.io/github/downloads/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/total.svg)](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases)
    [![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
@@ -9,54 +10,54 @@ My efforts here will focus on creating a **64-bit version** of the GTK+-2 runtim
 
 The installers can be found in the [releases section](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases).
 
-The current releases ([gtk2-runtime-2.24.32-2018-08-01-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2018-08-01/gtk2-runtime-2.24.32-2018-08-01-ts-win64.exe) and [gtk3-runtime-3.22.30-2018-08-01-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2018-08-01/gtk3-runtime-3.22.30-2018-08-01-ts-win64.exe)) were obtained entirely from the excellent [MSYS2 project](https://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 current releases ([gtk2-runtime-2.24.32-2019-04-26-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2019-04-26/gtk2-runtime-2.24.32-2019-04-26-ts-win64.exe) and [gtk3-runtime-3.24.8-2019-04-26-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2019-04-26/gtk3-runtime-3.24.8-2019-04-26-ts-win64.exe)) were obtained entirely from the excellent [MSYS2 project](https://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.28.0)
-* [atk](http://ftp.gnome.org/pub/GNOME/sources/atk/) (2.28.1)
-* [atkmm](http://ftp.gnome.org/pub/GNOME/sources/atkmm/) (2.24.2)
-* [cairo](http://cairographics.org/releases/) (1.15.12)
+* [adwaita icon theme](http://ftp.gnome.org/pub/GNOME/sources/adwaita-icon-theme/) (3.32.0)
+* [atk](http://ftp.gnome.org/pub/GNOME/sources/atk/) (2.32.0)
+* [atkmm](http://ftp.gnome.org/pub/GNOME/sources/atkmm/) (2.28.0)
+* [cairo](http://cairographics.org/releases/) (1.16.0)
 * [cairomm](http://cairographics.org/releases/) (1.12.2)
-* [fontconfig](http://www.freedesktop.org/software/fontconfig/release/) (2.13.0)
-* [freetype](http://www.freetype.org/download.html) (2.9.1)
-* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.36.12)
+* [fontconfig](http://www.freedesktop.org/software/fontconfig/release/) (2.13.1)
+* [freetype](http://www.freetype.org/download.html) (2.10.0)
+* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.38.1)
 * [gettext](http://ftp.gnu.org/pub/gnu/gettext/) (0.19.8.1)
-* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.56.1)
-* [glib-networking](http://ftp.gnome.org/pub/GNOME/sources/glib-networking/) (2.56.1)
-* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.56.0)
+* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.60.1)
+* [glib-networking](http://ftp.gnome.org/pub/GNOME/sources/glib-networking/) (2.60.1)
+* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.60.0)
 * [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.32)
-* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.22.30)
+* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.24.8)
 * [gtkmm2](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (2.24.5)
-* [gtkmm3](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (3.22.2)
+* [gtkmm3](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (3.24.1)
 * [gtksourceview2](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (2.10.5)
-* [gtksourceview3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (3.24.6)
+* [gtksourceview3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (3.24.10)
 * ~~[gtksourceviewmm2](http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/) (2.10.3)~~ (currently unavailable)
 * [gtksourceviewmm3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/) (3.21.3)
-* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (1.8.4)
-* [hicolor-icon-theme](http://icon-theme.freedesktop.org/releases/) (0.15)
-* [json-glib](http://ftp.gnome.org/pub/gnome/sources/json-glib/) (1.4.2)
-* [libepoxy](https://github.com/anholt/libepoxy) (1.5.2)
+* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (2.4.0)
+* [hicolor-icon-theme](http://icon-theme.freedesktop.org/releases/) (0.17)
+* [json-glib](http://ftp.gnome.org/pub/gnome/sources/json-glib/) (1.4.4)
+* [libepoxy](https://github.com/anholt/libepoxy) (1.5.3)
 * [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.35)
+* [libpng](http://sourceforge.net/project/showfiles.php?group_id=5624) (1.6.37)
 * [librsvg](http://ftp.gnome.org/pub/GNOME/sources/librsvg/) (2.40.20)
-* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.0)
-* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.62.2)
-* [libxml2](http://xmlsoft.org/sources/) (2.9.8)
+* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.1)
+* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.66.1)
+* [libxml2](http://xmlsoft.org/sources/) (2.9.9)
 * [libxml++2](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (2.40.1)
 * [libxml++3](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (3.0.1)
-* [libxslt](http://xmlsoft.org/sources/) (1.1.32)
-* [pango](http://ftp.gnome.org/pub/GNOME/sources/pango/) (1.42.3)
-* [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.40.1)
-* [pcre](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) (8.42)
-* [pixman](http://cairographics.org/releases/) (0.34.0)
-* [sqlite](https://www.sqlite.org) (3.24.0)
+* [libxslt](http://xmlsoft.org/sources/) (1.1.33)
+* [pango](http://ftp.gnome.org/pub/GNOME/sources/pango/) (1.43.0)
+* [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.42.0)
+* [pcre](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) (8.43)
+* [pixman](http://cairographics.org/releases/) (0.38.2)
+* [sqlite](https://www.sqlite.org) (3.28.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.  
 
-Personally I use this installer in my [XMI-MSIM project](http://github.com/xmimsim). You may want to have a look at my Inno Setup ([new](https://github.com/tschoonj/xmimsim/blob/master/windows/xmimsim.iss)) and NSIS ([old](https://github.com/tschoonj/xmimsim/blob/XMI-MSIM-4.0/nsis/xmimsim-win64.nsi.in)) based installers. 
+Personally I use this installer in my [XMI-MSIM project](http://github.com/tschoonj/xmimsim). You may want to have a look at my Inno Setup ([new](https://github.com/tschoonj/xmimsim/blob/master/windows/xmimsim.iss)) and NSIS ([old](https://github.com/tschoonj/xmimsim/blob/XMI-MSIM-4.0/nsis/xmimsim-win64.nsi.in)) based installers. 
 
 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)
 

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

@@ -88,6 +88,8 @@ cp $INSTALL_SRC_MSYS2_BIN/libpangoft2-1.0-0.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libpangomm-1.4-1.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libpixman-1-0.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libpng16-16.dll  $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libthai-0.dll  $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libdatrie-1.dll  $INSTALL_SRC_BIN
 
 # No need for this IMHO, at least fontconfig is not dependent on these
 cp $INSTALL_SRC_MSYS2_BIN/libxml++-2.6-2.dll $INSTALL_SRC_BIN
@@ -120,6 +122,8 @@ 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
+cp $INSTALL_SRC_MSYS2_BIN/libproxy-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libpsl-5.dll $INSTALL_SRC_BIN
 
 # Standard MSYS2 libraries
 cp $INSTALL_SRC_MSYS2_BIN/libstdc++-6.dll $INSTALL_SRC_BIN

gtk-nsis-pack/etc/fonts/conf.d/90-synthetic.conf

@@ -42,9 +42,9 @@
  -->
 
 	<match target="font">
-		<!-- check to see if the font is just regular -->
+		<!-- check to see if the weight in the font is less than medium which possibly need emboldening -->
 		<test name="weight" compare="less_eq">
-			<const>regular</const>
+			<const>medium</const>
 		</test>
 		<!-- check to see if the pattern requests bold -->
 		<test target="pattern" name="weight" compare="more_eq">

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

@@ -14,7 +14,7 @@
 
 !define GTK_VERSION "2.24.32"
 !define GTK_BIN_VERSION "2.10.0"
-!define PRODUCT_VERSION "${GTK_VERSION}-2018-08-01-ts-win64"
+!define PRODUCT_VERSION "${GTK_VERSION}-2019-04-26-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"
@@ -277,6 +277,8 @@ SectionIn 1 2 RO
 	File bin\libxml++-2.6-2.dll  ; fontconfig needs this
 	File bin\libxml++-3.0-1.dll
 	File bin\libpcre-1.dll
+	File bin\libthai-0.dll
+	File bin\libdatrie-1.dll
 	File bin\libxml2-2.dll  ; fontconfig needs this
 	File bin\libxslt-1.dll  ; fontconfig needs this
 	File bin\zlib1.dll  ; png and many others need this
@@ -317,7 +319,7 @@ SectionIn 1 2 RO
 	SetOutPath "$INSTDIR\lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}"
 	File lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}\loaders.cache
 
-	SetOutPath "$INSTDIR\lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}\loaders"
+	SetOutPath "$INSTDIR\lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}\"
 	File /r lib\gdk-pixbuf-2.0\${GTK_BIN_VERSION}\loaders
 
 	SetOutPath "$INSTDIR\lib\gtk-2.0\modules"
@@ -641,6 +643,8 @@ Function un.DeleteDlls
 	Delete $LIB_INSTDIR\libxml++-2.6-2.dll  ; fontconfig needs this
 	Delete $LIB_INSTDIR\libxml++-3.0-1.dll
 	Delete $LIB_INSTDIR\libpcre-1.dll
+	Delete $LIB_INSTDIR\libthai-0.dll
+	Delete $LIB_INSTDIR\libdatrie-1.dll
 	Delete $LIB_INSTDIR\zlib1.dll  ; png and many others need this
 	Delete $LIB_INSTDIR\libexpat-1.dll
 	Delete $LIB_INSTDIR\libbz2-1.dll

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

@@ -11,9 +11,9 @@
 ; Directory and package names: gtk3-runtime.
 
 
-!define GTK_VERSION "3.22.30"
+!define GTK_VERSION "3.24.8"
 !define GTK_BIN_VERSION "3.0.0"
-!define PRODUCT_VERSION "${GTK_VERSION}-2018-08-01-ts-win64"
+!define PRODUCT_VERSION "${GTK_VERSION}-2019-04-26-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"
@@ -280,6 +280,8 @@ SectionIn 1 2 RO
 	File bin\libxml2-2.dll			; fontconfig needs this
 	File bin\libxslt-1.dll			; fontconfig needs this
 	File bin\libpcre-1.dll			; fontconfig needs this
+	File bin\libthai-0.dll			; fontconfig needs this
+	File bin\libdatrie-1.dll			; fontconfig needs this
 	File bin\zlib1.dll				; png and many others need this
 	File bin\libexpat-1.dll			; required by fontconfig
 	File bin\libbz2-1.dll			; required by fontconfig
@@ -292,6 +294,7 @@ SectionIn 1 2 RO
 	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\libpsl-5.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
@@ -300,6 +303,7 @@ SectionIn 1 2 RO
 	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
+	File bin\libproxy-1.dll	; glib-networking dependency
 
 	; We install this into the same place as the DLLs to avoid any PATH manipulation.
 	SetOutPath "$LIB_INSTDIR"
@@ -333,6 +337,8 @@ SectionIn 1 2 RO
 
 	SetOutPath "$INSTDIR\lib\gio\modules"
 	File lib\gio\modules\libgiognutls.dll
+	File lib\gio\modules\libgiognomeproxy.dll
+	File lib\gio\modules\libgiolibproxy.dll
 
 	SetOutPath "$INSTDIR\ssl\certs"
 	File ssl\certs\ca-bundle.crt
@@ -659,6 +665,8 @@ Function un.DeleteDlls
 	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\libthai-0.dll  ; fontconfig needs this
+	Delete $LIB_INSTDIR\libdatrie-1.dll  ; fontconfig needs this
 	Delete $LIB_INSTDIR\libxml2-2.dll  ; fontconfig needs this
 	Delete $LIB_INSTDIR\libxml++-2.6-2.dll  ; fontconfig needs this
 	Delete $LIB_INSTDIR\libxml++-3.0-1.dll
@@ -674,6 +682,7 @@ Function un.DeleteDlls
 	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\libpsl-5.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
@@ -682,6 +691,7 @@ Function un.DeleteDlls
 	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
+	Delete $LIB_INSTDIR\libproxy-1.dll	; glib-networking dependency
 
 
 FunctionEnd
@@ -817,6 +827,8 @@ Section Uninstall
 
 
 	Delete "$INSTDIR\lib\gio\modules\libgiognutls.dll"
+	Delete "$INSTDIR\lib\gio\modules\libgiognomeproxy.dll"
+	Delete "$INSTDIR\lib\gio\modules\libgiolibproxy.dll"
 	RMDir "$INSTDIR\lib\gio\modules"
 	RMDir "$INSTDIR\lib\gio"
 

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.12
+# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.38.1
 #
 # LoaderDir = C:\msys64\mingw64\lib\gdk-pixbuf-2.0\2.10.0\loaders
 #