New installers: 2020-07-15

Closes #24

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+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

@@ -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,49 +10,52 @@ 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-10-03-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2018-10-03/gtk2-runtime-2.24.32-2018-10-03-ts-win64.exe) and [gtk3-runtime-3.24.1-2018-10-03-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2018-10-03/gtk3-runtime-3.24.1-2018-10-03-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-2020-07-15-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2020-07-15/gtk2-runtime-2.24.32-2020-07-15-ts-win64.exe) and [gtk3-runtime-3.24.20-2020-07-15-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2020-07-15/gtk3-runtime-3.24.20-2020-07-15-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)
+* [adwaita icon theme](http://ftp.gnome.org/pub/GNOME/sources/adwaita-icon-theme/) (3.36.0)
-* [atk](http://ftp.gnome.org/pub/GNOME/sources/atk/) (2.28.1)
+* [atk](http://ftp.gnome.org/pub/GNOME/sources/atk/) (2.36.0)
-* [atkmm](http://ftp.gnome.org/pub/GNOME/sources/atkmm/) (2.24.2)
+* [atkmm](http://ftp.gnome.org/pub/GNOME/sources/atkmm/) (2.28.0)
-* [cairo](http://cairographics.org/releases/) (1.15.14)
+* [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)
+* [fontconfig](http://www.freedesktop.org/software/fontconfig/release/) (2.13.92)
-* [freetype](http://www.freetype.org/download.html) (2.9.1)
+* [freetype](http://www.freetype.org/download.html) (2.10.2)
-* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.36.12)
+* [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.58.1)
+* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.64.3)
-* [glib-networking](http://ftp.gnome.org/pub/GNOME/sources/glib-networking/) (2.56.1)
+* [glib-networking](http://ftp.gnome.org/pub/GNOME/sources/glib-networking/) (2.64.2)
-* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.56.0)
+* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.64.2)
+* [gobject-introspection](http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/) (1.64.1)
 * [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.32)
-* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.24.1)
+* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.24.20)
 * [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.2)
 * [gtksourceview2](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (2.10.5)
-* [gtksourceview3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (3.24.9)
+* [gtksourceview3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (3.24.11)
+* [gtksourceview4](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (4.6.0)
 * ~~[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.9.0)
+* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (2.6.8)
-* [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.4)
-* [libepoxy](https://github.com/anholt/libepoxy) (1.5.2)
+* [libepoxy](https://github.com/anholt/libepoxy) (1.5.4)
-* [libffi](http://sourceware.org/libffi/) (3.2.1)
+* [libffi](http://sourceware.org/libffi/) (3.3)
-* [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.35)
+* [libpeas](http://ftp.gnome.org/pub/gnome/sources/libpeas/) (1.26.0)
-* [librsvg](http://ftp.gnome.org/pub/GNOME/sources/librsvg/) (2.40.20)
+* [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.48.7)
-* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.64.0)
+* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.3)
-* [libxml2](http://xmlsoft.org/sources/) (2.9.8)
+* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.70.0)
+* [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)
+* [libxml++3](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (3.2.0)
-* [libxslt](http://xmlsoft.org/sources/) (1.1.32)
+* [libxslt](http://xmlsoft.org/sources/) (1.1.34)
-* [pango](http://ftp.gnome.org/pub/GNOME/sources/pango/) (1.42.4)
+* [pango](http://ftp.gnome.org/pub/GNOME/sources/pango/) (1.43.0)
-* [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.40.1)
+* [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.42.1)
-* [pcre](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) (8.42)
+* [pcre](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) (8.44)
-* [pixman](http://cairographics.org/releases/) (0.34.0)
+* [pixman](http://cairographics.org/releases/) (0.40.0)
-* [sqlite](https://www.sqlite.org) (3.25.2)
+* [sqlite](https://www.sqlite.org) (3.32.3)
 * [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,17 +113,28 @@ 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-4.dll $INSTALL_SRC_BIN
+cp $INSTALL_SRC_MSYS2_BIN/libhogweed-6.dll $INSTALL_SRC_BIN
-cp $INSTALL_SRC_MSYS2_BIN/libnettle-6.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
 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
@@ -129,6 +142,7 @@ 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
@@ -163,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.d/40-nonlatin.conf

@@ -233,4 +233,104 @@
 		<default><family>cursive</family></default>
 	</alias>
 
+<!--
+  system-ui
+-->
+	<alias>
+		<family>Noto Sans Arabic UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Noto Sans Bengali UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Noto Sans Devanagari UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Noto Sans Gujarati UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Noto Sans Gurmukhi UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Noto Sans Kannada UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Noto Sans Khmer UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Noto Sans Lao UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Noto Sans Malayalam UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Noto Sans Myanmar UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Noto Sans Oriya UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Noto Sans Sinhala UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Noto Sans Tamil UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Noto Sans Telugu UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Noto Sans Thai UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Leelawadee UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Nirmala UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Yu Gothic UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Meiryo UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>MS UI Gothic</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Khmer UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Lao UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Microsoft JhengHei UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Microsoft YaHei UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+
 </fontconfig>