New installer: 2021-04-29

Closes #24

.github/FUNDING.yml

@@ -1 +1,2 @@
-custom: https://www.paypal.me/tomschoonjans/10
+custom: https://www.paypal.me/tomschoonjansUK/10
+github: tschoonj

.gitignore

@@ -3,3 +3,4 @@ gtk2-runtime*-ts-win64*exe
 gtk3-runtime*-ts-win64*exe
 *.swp
 /.vscode
+hello-world-gtkmm3.exe

README.md

@@ -10,49 +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-2019-07-02-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2019-07-02/gtk2-runtime-2.24.32-2019-07-02-ts-win64.exe) and [gtk3-runtime-3.24.9-2019-07-02-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2019-07-02/gtk3-runtime-3.24.9-2019-07-02-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.33-2021-01-30-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2021-01-30/gtk2-runtime-2.24.33-2021-01-30-ts-win64.exe) and [gtk3-runtime-3.24.29-2021-04-29-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2021-04-29/gtk3-runtime-3.24.29-2021-04-29-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!!!).
+
+**Please note that the Gtk+-2 runtime installers will no longer be updated as there are will be no more Gtk+-2 source code releases**
 
 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.32.0)
+* [adwaita icon theme](http://ftp.gnome.org/pub/GNOME/sources/adwaita-icon-theme/) (40.0)
-* [atk](http://ftp.gnome.org/pub/GNOME/sources/atk/) (2.32.0)
+* [atk](http://ftp.gnome.org/pub/GNOME/sources/atk/) (2.36.0)
 * [atkmm](http://ftp.gnome.org/pub/GNOME/sources/atkmm/) (2.28.0)
-* [cairo](http://cairographics.org/releases/) (1.16.0)
+* [cairo](http://cairographics.org/releases/) (1.17.4)
 * [cairomm](http://cairographics.org/releases/) (1.12.2)
-* [fontconfig](http://www.freedesktop.org/software/fontconfig/release/) (2.13.1)
+* [fontconfig](http://www.freedesktop.org/software/fontconfig/release/) (2.13.93)
-* [freetype](http://www.freetype.org/download.html) (2.10.0)
+* [freetype](http://www.freetype.org/download.html) (2.10.4)
-* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.38.1)
+* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.42.4)
 * [gettext](http://ftp.gnu.org/pub/gnu/gettext/) (0.19.8.1)
-* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.60.4)
+* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.68.1)
-* [glib-networking](http://ftp.gnome.org/pub/GNOME/sources/glib-networking/) (2.60.3)
+* [glib-networking](http://ftp.gnome.org/pub/GNOME/sources/glib-networking/) (2.68.1)
-* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.60.0)
+* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.66.0)
-* [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.32)
+* [gobject-introspection](http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/) (1.66.1)
-* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.24.9)
+* [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.33)
+* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.24.29)
 * [gtkmm2](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (2.24.5)
-* [gtkmm3](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (3.24.1)
+* [gtkmm3](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (3.24.3)
 * [gtksourceview2](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (2.10.5)
 * [gtksourceview3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (3.24.11)
+* [gtksourceview4](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (4.8.1)
 * ~~[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/) (2.5.3)
+* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (2.8.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)
+* [json-glib](http://ftp.gnome.org/pub/gnome/sources/json-glib/) (1.6.2)
-* [libepoxy](https://github.com/anholt/libepoxy) (1.5.3)
+* [libepoxy](https://github.com/anholt/libepoxy) (1.5.5)
-* [libffi](http://sourceware.org/libffi/) (3.2.1)
+* [libffi](http://sourceware.org/libffi/) (3.3)
 * [libiconv](https://ftp.gnu.org/pub/gnu/libiconv/) (1.16)
+* [libpeas](http://ftp.gnome.org/pub/gnome/sources/libpeas/) (1.28.0)
 * [libpng](http://sourceforge.net/project/showfiles.php?group_id=5624) (1.6.37)
-* [librsvg](http://ftp.gnome.org/pub/GNOME/sources/librsvg/) (2.44.14)
+* [librsvg](http://ftp.gnome.org/pub/GNOME/sources/librsvg/) (2.50.3)
-* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.2)
+* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.6)
-* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.66.2)
+* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.72.0)
-* [libxml2](http://xmlsoft.org/sources/) (2.9.9)
+* [libxml2](http://xmlsoft.org/sources/) (2.9.10)
-* [libxml++2](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (2.40.1)
+* [libxml++2](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (2.42.0)
-* [libxml++3](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (3.0.1)
+* [libxml++3](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (3.2.2)
-* [libxslt](http://xmlsoft.org/sources/) (1.1.33)
+* [libxslt](http://xmlsoft.org/sources/) (1.1.34)
-* [pango](http://ftp.gnome.org/pub/GNOME/sources/pango/) (1.43.0)
+* [pango](http://ftp.gnome.org/pub/GNOME/sources/pango/) (1.48.4)
-* [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.42.0)
+* [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.46.0)
-* [pcre](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) (8.43)
+* [pcre](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) (8.44)
-* [pixman](http://cairographics.org/releases/) (0.38.4)
+* [pixman](http://cairographics.org/releases/) (0.40.0)
-* [sqlite](https://www.sqlite.org) (3.28.0)
+* [sqlite](https://www.sqlite.org) (3.35.5)
 * [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.  

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

@@ -43,9 +43,10 @@ cp $INSTALL_SRC_MSYS2_BIN/libcairo-2.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libcairo-gobject-2.dll  $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libcairo-script-interpreter-2.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libcairomm-1.0-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libssp-0.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libepoxy-0.dll $INSTALL_SRC_BIN
 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/libffi-7.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
@@ -70,6 +71,7 @@ cp $INSTALL_SRC_MSYS2_BIN/libgthread-2.0-0.dll  $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libgtk-3-0.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libgtk-win32-2.0-0.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libgtksourceview-3.0-1.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libgtksourceview-4-0.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libgtksourceview-2.0-0.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libgtksourceviewmm-3.0-0.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libgtkmm-3.0-1.dll $INSTALL_SRC_BIN
@@ -111,13 +113,15 @@ 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/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/libhogweed-6.dll $INSTALL_SRC_BIN
-cp $INSTALL_SRC_MSYS2_BIN/libnettle-7.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libnettle-8.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
@@ -125,12 +129,20 @@ 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
@@ -165,6 +177,17 @@ 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 gtksourceview data files
+rm -rf $INSTALL_SRC_DIR/share/gtksourceview-3.0
+rm -rf $INSTALL_SRC_DIR/share/gtksourceview-4
+cp -r $INSTALL_SRC_MSYS2/share/gtksourceview-3.0 $INSTALL_SRC_DIR/share/
+cp -r $INSTALL_SRC_MSYS2/share/gtksourceview-4 $INSTALL_SRC_DIR/share/
+
 # Copy /share/locale/locale.alias
 rm -r $INSTALL_SRC_DIR/share/locale
 cp -r $INSTALL_SRC_MSYS2/share/locale $INSTALL_SRC_DIR/share/

gtk-nsis-pack/etc/fonts/conf.avail/20-unhint-small-dejavu-sans-mono.conf

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!--  /etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf
+
+        Disable hinting manually at smaller sizes (< 8ppem)
+        This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
+        derived from Vera.
+
+	The Bistream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints. The initial Vera release
+	didn't include the right instructions in the 'prep' table.
+ -->
+  <match target="font">
+    <test name="family">
+      <string>DejaVu Sans Mono</string>
+    </test>
+    <test compare="less" name="pixelsize">
+      <double>7.5</double>
+    </test>
+    <edit name="hinting">
+      <bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>