New installers: 2019-12-19

Closes #24

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://www.paypal.me/tomschoonjans/10

README.md

@@ -1,63 +1,68 @@
 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
 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 in the [releases section](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases).
 
-The current releases ([gtk2-runtime-2.24.31-2017-04-05-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2017-04-05/gtk2-runtime-2.24.31-2017-04-05-ts-win64.exe) and [gtk3-runtime-3.22.10-2017-04-05-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2017-04-05/gtk3-runtime-3.22.10-2017-04-05-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 current releases ([gtk2-runtime-2.24.32-2019-12-19-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2019-12-19/gtk2-runtime-2.24.32-2019-12-19-ts-win64.exe) and [gtk3-runtime-3.24.13-2019-12-19-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2019-12-19/gtk3-runtime-3.24.13-2019-12-19-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.24.0)
-* [atk](http://ftp.gnome.org/pub/GNOME/sources/atk/) (2.24.0)
-* [atkmm](http://ftp.gnome.org/pub/GNOME/sources/atkmm/) (2.24.2)
-* [cairo](http://cairographics.org/releases/) (1.15.4)
-* [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.8)
-* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.36.6)
+* [adwaita icon theme](http://ftp.gnome.org/pub/GNOME/sources/adwaita-icon-theme/) (3.34.3)
+* [atk](http://ftp.gnome.org/pub/GNOME/sources/atk/) (2.34.1)
+* [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.1)
+* [freetype](http://www.freetype.org/download.html) (2.10.1)
+* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.40.0)
 * [gettext](http://ftp.gnu.org/pub/gnu/gettext/) (0.19.8.1)
-* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.52.2)
-* [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.15)
-* [gtkmm2](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (2.24.4)
-* [gtkmm3](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (3.22.0)
+* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.62.2)
+* [glib-networking](http://ftp.gnome.org/pub/GNOME/sources/glib-networking/) (2.62.2)
+* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.62.0)
+* [gobject-introspection](http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/) (1.62.0)
+* [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.32)
+* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.24.13)
+* [gtkmm2](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (2.24.5)
+* [gtkmm3](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (3.24.2)
 * [gtksourceview2](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (2.10.5)
-* [gtksourceview3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (3.24.2)
+* [gtksourceview3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (3.24.11)
 * ~~[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.6)
-* [hicolor-icon-theme](http://icon-theme.freedesktop.org/releases/) (0.15)
-* [json-glib](http://ftp.gnome.org/pub/gnome/sources/json-glib/) (1.2.8)
-* [libepoxy](https://github.com/anholt/libepoxy) (1.4.2)
+* [gtksourceviewmm3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/) (3.21.3)
+* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (2.6.2)
+* [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.4)
 * [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.29)
-* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.0)
-* [libxml2](http://xmlsoft.org/sources/) (2.9.4)
-* [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.5)
-* [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)
-* [pixman](http://cairographics.org/releases/) (0.34.0)
+* [libiconv](https://ftp.gnu.org/pub/gnu/libiconv/) (1.16)
+* [libpeas](http://ftp.gnome.org/pub/gnome/sources/libpeas/) (1.24.1)
+* [libpng](http://sourceforge.net/project/showfiles.php?group_id=5624) (1.6.37)
+* [librsvg](http://ftp.gnome.org/pub/GNOME/sources/librsvg/) (2.46.4)
+* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.2)
+* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.68.3)
+* [libxml2](http://xmlsoft.org/sources/) (2.9.10)
+* [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.34)
+* [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.4)
+* [sqlite](https://www.sqlite.org) (3.30.1)
 * [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)
 
 If you have enjoyed using this project, please consider making a donation or buying something off my Amazon Wish list. 
 
-[![PayPal](https://cdn.rawgit.com/twolfson/paypal-github-button/1.0.0/dist/button.svg)](https://www.paypal.me/tomschoonjans/10)
-
-[![Amazon Wish list](http://manghammath.com/Link%20Icons%202015/Amazon_Wishlist.png)](http://amzn.eu/8ml3d0c)
-
 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,10 @@ 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
+INSTALL_SRC_ETC="${INSTALL_SRC_DIR}"/etc
+INSTALL_SRC_MSYS2_ETC=${INSTALL_SRC_MSYS2}/etc
 
 # Create installer file name
 INSTALLER_FILENAME=gtk3-runtime-${_VERSION}-${_DATE}-${_ARCH}.msi
@@ -43,6 +48,7 @@ cp $INSTALL_SRC_MSYS2_BIN/libexslt-0.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libffi-6.dll  $INSTALL_SRC_BIN 
 cp $INSTALL_SRC_MSYS2_BIN/libfontconfig-1.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libfreetype-6.dll  $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libfribidi-0.dll  $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libgailutil-3-0.dll  $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libgailutil-18.dll  $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libgdk_pixbuf-2.0-0.dll $INSTALL_SRC_BIN
@@ -82,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
@@ -99,13 +107,40 @@ 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/libbrotlidec.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libbrotlicommon.dll $INSTALL_SRC_BIN
+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-5.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libnettle-7.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
+cp $INSTALL_SRC_MSYS2_BIN/libproxy-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libpsl-5.dll $INSTALL_SRC_BIN
+
+# libpeas
+cp $INSTALL_SRC_MSYS2_BIN/libpeas-1.0-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libpeas-gtk-1.0-0.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgirepository-1.0-1.dll $INSTALL_SRC_BIN
+mkdir -p $INSTALL_SRC_LIB/libpeas-1.0/loaders
+cp $INSTALL_SRC_MSYS2_LIB/libpeas-1.0/loaders/libpython3loader.dll $INSTALL_SRC_LIB/libpeas-1.0/loaders
+
+# 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
 
 
+cp $INSTALL_SRC_MSYS2_BIN/gdbus.exe $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/fc-cache.exe $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/fc-cat.exe $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/fc-list.exe $INSTALL_SRC_BIN
@@ -125,7 +160,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 +168,21 @@ 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 lib/girepository-1.0 folder 
+cd $INSTALL_SRC_MSYS2_LIB/girepository-1.0
+mkdir -p $INSTALL_SRC_LIB/girepository-1.0
+cp -r *typelib $INSTALL_SRC_LIB/girepository-1.0/
+
 # 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 +196,17 @@ 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/
+
+# Copy fontconfig stuff (see issue #14)
+mkdir -p $INSTALL_SRC_ETC/fonts
+cd $INSTALL_SRC_MSYS2_ETC/fonts
+cp -a * $INSTALL_SRC_ETC/fonts/
+
+
 # librsvg depends on:
 # gdk-pixbuf2  pango  libcroco