New installers: 2019-10-04

Closes #23

.github/FUNDING.yml

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

README.md

@@ -1,7 +1,8 @@
 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)
+[![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.
@@ -9,54 +10,56 @@ 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.31-2017-11-15-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2017-11-15/gtk2-runtime-2.24.31-2017-11-15-ts-win64.exe) and [gtk3-runtime-3.22.26-2017-11-15-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2017-11-15/gtk3-runtime-3.22.26-2017-11-15-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-10-04-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2019-10-04/gtk2-runtime-2.24.32-2019-10-04-ts-win64.exe) and [gtk3-runtime-3.24.11-2019-10-04-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2019-10-04/gtk3-runtime-3.24.11-2019-10-04-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.26.0)
+* [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.26.1)
+* [atk](http://ftp.gnome.org/pub/GNOME/sources/atk/) (2.34.1)
-* [atkmm](http://ftp.gnome.org/pub/GNOME/sources/atkmm/) (2.26.0)
+* [atkmm](http://ftp.gnome.org/pub/GNOME/sources/atkmm/) (2.28.0)
-* [cairo](http://cairographics.org/releases/) (1.15.6)
+* [cairo](http://cairographics.org/releases/) (1.16.0)
-* [cairomm](http://cairographics.org/releases/) (1.12.0)
+* [cairomm](http://cairographics.org/releases/) (1.12.2)
-* [fontconfig](http://www.freedesktop.org/software/fontconfig/release/) (2.12.6)
+* [fontconfig](http://www.freedesktop.org/software/fontconfig/release/) (2.13.1)
-* [freetype](http://www.freetype.org/download.html) (2.8.1)
+* [freetype](http://www.freetype.org/download.html) (2.10.1)
-* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.36.11)
+* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.38.2)
 * [gettext](http://ftp.gnu.org/pub/gnu/gettext/) (0.19.8.1)
-* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.54.2)
+* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.62.0)
-* [glib-networking](http://ftp.gnome.org/pub/GNOME/sources/glib-networking/) (2.54.1)
+* [glib-networking](http://ftp.gnome.org/pub/GNOME/sources/glib-networking/) (2.60.3)
-* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.54.1)
+* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.60.0)
-* [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.31)
+* [gobject-introspection](http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/) (1.60.2)
-* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.22.26)
+* [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.32)
-* [gtkmm2](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (2.24.4)
+* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.24.11)
-* [gtkmm3](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (3.22.0)
+* [gtkmm2](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (2.24.5)
+* [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.3)
+* [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.24.5)
+* [gtksourceviewmm3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/) (3.21.3)
-* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (1.6.3)
+* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (2.6.2)
-* [hicolor-icon-theme](http://icon-theme.freedesktop.org/releases/) (0.15)
+* [hicolor-icon-theme](http://icon-theme.freedesktop.org/releases/) (0.17)
-* [json-glib](http://ftp.gnome.org/pub/gnome/sources/json-glib/) (1.4.2)
+* [json-glib](http://ftp.gnome.org/pub/gnome/sources/json-glib/) (1.4.4)
-* [libepoxy](https://github.com/anholt/libepoxy) (1.4.3)
+* [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)
+* [libiconv](https://ftp.gnu.org/pub/gnu/libiconv/) (1.16)
-* [libpng](http://sourceforge.net/project/showfiles.php?group_id=5624) (1.6.34)
+* [libpeas](http://ftp.gnome.org/pub/gnome/sources/libpeas/) (1.22.0)
-* [librsvg](http://ftp.gnome.org/pub/GNOME/sources/librsvg/) (2.40.19)
+* [libpng](http://sourceforge.net/project/showfiles.php?group_id=5624) (1.6.37)
-* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.0)
+* [librsvg](http://ftp.gnome.org/pub/GNOME/sources/librsvg/) (2.44.14)
-* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.60.2)
+* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.2)
-* [libxml2](http://xmlsoft.org/sources/) (2.9.6)
+* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.68.1)
-* [libxml++2](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (2.40.0)
+* [libxml2](http://xmlsoft.org/sources/) (2.9.9)
-* [libxml++3](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (3.0.0)
+* [libxml++2](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (2.40.1)
-* [libxslt](http://xmlsoft.org/sources/) (1.1.30)
+* [libxml++3](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (3.0.1)
-* [pango](http://ftp.gnome.org/pub/GNOME/sources/pango/) (1.40.11)
+* [libxslt](http://xmlsoft.org/sources/) (1.1.33)
-* [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.40.0)
+* [pango](http://ftp.gnome.org/pub/GNOME/sources/pango/) (1.43.0)
-* [pcre](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) (8.41)
+* [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.42.0)
-* [pixman](http://cairographics.org/releases/) (0.34.0)
+* [pcre](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) (8.43)
-* [sqlite](https://www.sqlite.org) (3.20.0)
+* [pixman](http://cairographics.org/releases/) (0.38.4)
+* [sqlite](https://www.sqlite.org) (3.29.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

@@ -22,6 +22,8 @@ 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
@@ -46,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
@@ -85,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
@@ -102,6 +107,8 @@ 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
 
 # libsoup and its dependencies
 cp $INSTALL_SRC_MSYS2_BIN/libsoup-2.4-1.dll $INSTALL_SRC_BIN
@@ -109,12 +116,19 @@ 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/libhogweed-5.dll $INSTALL_SRC_BIN
-cp $INSTALL_SRC_MSYS2_BIN/libnettle-6.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
 
 # Standard MSYS2 libraries
 cp $INSTALL_SRC_MSYS2_BIN/libstdc++-6.dll $INSTALL_SRC_BIN
@@ -156,6 +170,11 @@ 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
 rm -r $INSTALL_SRC_DIR/share/locale
 cp -r $INSTALL_SRC_MSYS2/share/locale $INSTALL_SRC_DIR/share/
@@ -177,6 +196,11 @@ 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

gtk-nsis-pack/etc/fonts/conf.d/10-hinting-slight.conf

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set hintslight to hintstyle</description>
+
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hintstyle" mode="append"><const>hintslight</const></edit>
+  </match>
+</fontconfig>

gtk-nsis-pack/etc/fonts/conf.d/10-scale-bitmap-fonts.conf

@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Bitmap scaling</description>
+<!--
+  If font is bitmap, calculate scale factor.
+  Note that color bitmap fonts have scalable=true, while
+  non-color ones have scalable=false.  Both groups have outline=false.
+  -->
+<match target="font">
+  <test name="outline" compare="eq">
+    <bool>false</bool>
+  </test>
+  <edit name="pixelsizefixupfactor" mode="assign">
+    <divide>
+      <name target="pattern">pixelsize</name>
+      <name target="font"   >pixelsize</name>
+    </divide>
+  </edit>
+</match>
+<!--
+  For non-scalable bitmap fonts (ie. non-color), skip
+  minor scaling if hinting is enabled.
+  -->
+<match target="font">
+  <test name="outline" compare="eq">
+    <bool>false</bool>
+  </test>
+  <test name="scalable" compare="eq">
+    <bool>false</bool>
+  </test>
+  <test name="hinting" compare="eq">
+    <bool>true</bool>
+  </test>
+  <edit name="scalingnotneeded" mode="assign">
+    <and>
+      <less>
+        <name>pixelsizefixupfactor</name>
+        <double>1.2</double>
+      </less>
+      <more>
+        <name>pixelsizefixupfactor</name>
+        <double>0.8</double>
+      </more>
+    </and>
+  </edit>
+</match>
+<match target="font">
+  <test name="scalingnotneeded" compare="eq">
+    <bool>true</bool>
+  </test>
+  <edit name="pixelsizefixupfactor" mode="assign">
+    <double>1.0</double>
+  </edit>
+</match>
+<!--
+  If we *are* going to scale, go ahead and do it.
+  -->
+<match target="font">
+  <test name="outline" compare="eq">
+    <bool>false</bool>
+  </test>
+  <test name="pixelsizefixupfactor" compare="not_eq">
+    <double>1.0</double>
+  </test>
+  <edit name="matrix" mode="assign">
+    <times>
+      <name>matrix</name>
+      <matrix>
+        <name>pixelsizefixupfactor</name> <double>0</double>
+        <double>0</double> <name>pixelsizefixupfactor</name>
+       </matrix>
+    </times>
+  </edit>
+  <edit name="size" mode="assign">
+    <divide>
+      <name>size</name>
+      <name>pixelsizefixupfactor</name>
+    </divide>
+  </edit>
+</match>
+
+</fontconfig>