New installers: 2020-07-15

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,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-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.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.32.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.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)
 * [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.10.0)
+* [freetype](http://www.freetype.org/download.html) (2.10.2)
-* [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.40.0)
 * [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.64.3)
-* [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.64.2)
-* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.60.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.9)
+* [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.24.1)
+* [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.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/) (2.5.3)
+* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (2.6.8)
 * [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)
+* [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.16)
+* [libpeas](http://ftp.gnome.org/pub/gnome/sources/libpeas/) (1.26.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.48.7)
-* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.2)
+* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.3)
-* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.66.2)
+* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.70.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++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.33)
+* [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)
+* [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.42.1)
-* [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.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,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.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>

gtk-nsis-pack/etc/fonts/conf.d/45-latin.conf

@@ -274,5 +274,28 @@
 		<family>Zapfino</family>
 		<default><family>cursive</family></default>
 	</alias>
+<!--
+  system-ui
+-->
+	<alias>
+		<family>Cantarell</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Noto Sans UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Segoe UI</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Segoe UI Historic</family>
+		<default><family>system-ui</family></default>
+	</alias>
+	<alias>
+		<family>Segoe UI Symbol</family>
+		<default><family>system-ui</family></default>
+	</alias>
 
 </fontconfig>

gtk-nsis-pack/etc/fonts/conf.d/60-latin.conf

@@ -75,5 +75,18 @@
 			<family>Comic Sans MS</family>
 		</prefer>
 	</alias>
+<!--
+  system-ui
+-->
+	<alias>
+		<family>system-ui</family>
+		<prefer>
+			<family>Cantarell</family>
+			<family>Noto Sans UI</family>
+			<family>Segoe UI</family>
+			<family>Segoe UI Historic</family>
+			<family>Segoe UI Symbol</family>
+		</prefer>
+	</alias>
 
 </fontconfig>

gtk-nsis-pack/etc/fonts/conf.d/65-nonlatin.conf

@@ -63,7 +63,7 @@
 			<family>Lohit Sindhi</family>
  			<family>Lohit Punjabi</family>
  			<family>Lohit Tamil</family>
-			<family>Meera</family>
+			<family>Rachana</family>
 			<family>Lohit Malayalam</family>
  			<family>Lohit Kannada</family>
  			<family>Lohit Telugu</family>
@@ -175,7 +175,6 @@
 			<family>TlwgTypewriter</family> <!-- thai -->
 			<family>TlwgMono</family> <!-- thai -->
 			<family>Hasida</family> <!-- hebrew -->
-			<family>Mitra Mono</family> <!-- bengali -->
 			<family>GF Zemen Unicode</family> <!-- ethiopic -->
 			<family>Hapax Berbère</family> <!-- tifinagh -->
 			<family>Lohit Bengali</family>
@@ -197,4 +196,37 @@
 			<family>LKLUG</family>
 		</prefer>
 	</alias>
+<!--
+  system-ui
+-->
+	<alias>
+		<family>system-ui</family>
+		<prefer>
+			<family>Noto Sans Arabic UI</family><!-- ar -->
+			<family>Noto Sans Bengali UI</family><!-- bn -->
+			<family>Noto Sans Devanagari UI</family><!-- hi, mai, mr -->
+			<family>Noto Sans Gujarati UI</family><!-- gu -->
+			<family>Noto Sans Gurmukhi UI</family><!-- pa -->
+			<family>Noto Sans Kannada UI</family><!-- kn -->
+			<family>Noto Sans Khmer UI</family><!-- km -->
+			<family>Noto Sans Lao UI</family><!-- lo -->
+			<family>Noto Sans Malayalam UI</family><!-- ml -->
+			<family>Noto Sans Myanmar UI</family><!-- my -->
+			<family>Noto Sans Oriya UI</family><!-- or -->
+			<family>Noto Sans Sinhala UI</family><!-- si -->
+			<family>Noto Sans Tamil UI</family><!-- ta -->
+			<family>Noto Sans Telugu UI</family><!-- te -->
+			<family>Noto Sans Thai UI</family><!-- th -->
+			<family>Leelawadee UI</family><!-- bug, th, jv, km, lo -->
+			<family>Nirmala UI</family><!-- Indic -->
+			<family>Yu Gothic UI</family><!-- han (ja) -->
+			<family>Meiryo UI</family><!-- han (ja) -->
+			<family>MS UI Gothic</family><!-- han (ja) -->
+			<family>Khmer UI</family><!-- km -->
+			<family>Lao UI</family><!-- lo -->
+			<family>Microsoft YaHei UI</family><!-- han (zh-cn) -->
+			<family>Microsoft JhengHei UI</family><!-- han (zh-tw) -->
+		</prefer>
+	</alias>
+
 </fontconfig>

gtk-nsis-pack/etc/fonts/fonts.conf

@@ -69,6 +69,17 @@
 			<string>sans-serif</string>
 		</edit>
 	</match>
+<!--
+  Accept alternate 'system ui' spelling, replacing it with 'system-ui'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>system ui</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>system-ui</string>
+		</edit>
+	</match>
 
 <!--
   Load local system customization file

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}-2019-07-02-ts-win64"
+!define PRODUCT_VERSION "${GTK_VERSION}-2020-07-15-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"
@@ -30,7 +30,6 @@
 ; AddToPath and friends should work with all users
 !define ALL_USERS
 
-!include nsi_env_var_update.nsh  ; EnvVar* functions
 !include "FileFunc.nsh"  ; GetOptions
 !include "x64.nsh"
 !include "LogicLib.nsh"
@@ -54,6 +53,7 @@ Name "${PRODUCT_NAME}"  ;  ${PRODUCT_VERSION}
 ; Output File Name
 OutFile "${INSTALLER_OUTPUT_FILE}"
 
+Unicode true
 
 ; The Default Installation Directory
 InstallDir "$PROGRAMFILES64\${PRODUCT_NAME}"
@@ -234,14 +234,17 @@ SectionIn 1 2 RO
 
 	File bin\libatk-1.0-0.dll  ; atk
 	File bin\libatkmm-1.6-1.dll  ; atk
+	File bin\libssp-0.dll  ; needed by cairo
 	File bin\libcairo-2.dll  ; cairo, needed by gtk
 	File bin\libcairo-gobject-2.dll  ; cairo. Doesn't seem to be required, but since we're distributing cairo...
 	File bin\libcairo-script-interpreter-2.dll  ; cairo. Doesn't seem to be required, but since we're distributing cairo...
 	File bin\libcairomm-1.0-1.dll
 	File bin\libexslt-0.dll
-	File bin\libffi-6.dll  ; libffi is required by glib 
+	File bin\libffi-7.dll  ; libffi is required by glib 
 	File bin\libfontconfig-1.dll  ; fontconfig is needed for ft2 pango backend
 	File bin\libfreetype-6.dll  ; freetype is needed for ft2 pango backend
+	File bin\libbrotlidec.dll  ; brotli is needed for freetype
+	File bin\libbrotlicommon.dll  ; brotli is needed for freetype
 	File bin\libfribidi-0.dll  ; fribidi is needed for pango 
 	File bin\libgailutil-18.dll  ; from gtk
 	File bin\libgdk_pixbuf-2.0-0.dll  ; from gtk
@@ -474,9 +477,8 @@ Section -post
 		StrCpy $ADD_TO_PATH "1"
 		; Push $LIB_INSTDIR
 		; Call AddToPath  ; add $LIB_INSTDIR to system $PATH
-		Push $0  ; result PATH
+		EnVar::SetHKLM
-		${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$LIB_INSTDIR" ; Append
+		EnVar::AddValue "PATH" "$LIB_INSTDIR"
-		Pop $0
 		; MessageBox MB_ICONINFORMATION|MB_OK "$LIB_INSTDIR added to path"
 		goto goto_set_path_exit
 	goto_set_path_no:
@@ -602,10 +604,13 @@ Function un.DeleteDlls
 	Delete $LIB_INSTDIR\libcairo-gobject-2.dll  ; cairo. Doesn't seem to be required, but since we're distributing cairo...
 	Delete $LIB_INSTDIR\libcairo-script-interpreter-2.dll  ; cairo. Doesn't seem to be required, but since we're distributing cairo...
 	Delete $LIB_INSTDIR\libcairomm-1.0-1.dll
+	Delete $LIB_INSTDIR\libssp-0.dll
 	Delete $LIB_INSTDIR\libexslt-0.dll
-	Delete $LIB_INSTDIR\libffi-6.dll  ; libffi is required by glib 
+	Delete $LIB_INSTDIR\libffi-7.dll  ; libffi is required by glib 
 	Delete $LIB_INSTDIR\libfontconfig-1.dll  ; fontconfig is needed for ft2 pango backend
 	Delete $LIB_INSTDIR\libfreetype-6.dll  ; freetype is needed for ft2 pango backend
+	Delete $LIB_INSTDIR\libbrotlidec.dll
+	Delete $LIB_INSTDIR\libbrotlicommon.dll
 	Delete $LIB_INSTDIR\libfribidi-0.dll
 	Delete $LIB_INSTDIR\libgailutil-18.dll  ; from gtk
 	Delete $LIB_INSTDIR\libgdk_pixbuf-2.0-0.dll  ; from gtk
@@ -699,10 +704,8 @@ Section Uninstall
 		StrCmp $ADD_TO_PATH "0" un_nopath  ; Setting $PATH was not requested during installation
 		; Push $LIB_INSTDIR
 		; Call un.RemoveFromPath
-		Push $0  ; result PATH
+		EnVar::SetHKLM
-		${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$LIB_INSTDIR" ; remove
+		EnVar::DeleteValue "PATH" "$LIB_INSTDIR"
-		Pop $0
-		; MessageBox MB_OK "$LIB_INSTDIR removed from PATH" /SD IDOK
 		un_nopath:
 
 		; $DLL_DIR_NAME is from the registry here

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

@@ -11,9 +11,9 @@
 ; Directory and package names: gtk3-runtime.
 
 
-!define GTK_VERSION "3.24.9"
+!define GTK_VERSION "3.24.20"
 !define GTK_BIN_VERSION "3.0.0"
-!define PRODUCT_VERSION "${GTK_VERSION}-2019-07-02-ts-win64"
+!define PRODUCT_VERSION "${GTK_VERSION}-2020-07-15-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"
@@ -29,7 +29,6 @@
 ; AddToPath and friends should work with all users
 !define ALL_USERS
 
-!include nsi_env_var_update.nsh  ; EnvVar* functions
 !include "FileFunc.nsh"  ; GetOptions
 !include "x64.nsh"
 !include "LogicLib.nsh"
@@ -53,6 +52,7 @@ Name "${PRODUCT_NAME}"  ;  ${PRODUCT_VERSION}
 ; Output File Name
 OutFile "${INSTALLER_OUTPUT_FILE}"
 
+Unicode true
 
 ; The Default Installation Directory
 InstallDir "$PROGRAMFILES64\${PRODUCT_NAME}"
@@ -233,13 +233,14 @@ SectionIn 1 2 RO
 
 	File bin\libatk-1.0-0.dll		; atk
 	File bin\libatkmm-1.6-1.dll		; atk
+	File bin\libssp-0.dll			; needed by cairo
 	File bin\libcairo-2.dll			; cairo, needed by gtk
 	File bin\libcairo-gobject-2.dll	; cairo. Doesn't seem to be required, but since we're distributing cairo...
 	File bin\libcairo-script-interpreter-2.dll  ; cairo. Doesn't seem to be required, but since we're distributing cairo...
 	File bin\libcairomm-1.0-1.dll
 	File bin\libepoxy-0.dll
 	File bin\libexslt-0.dll
-	File bin\libffi-6.dll  			; libffi is required by glib2 
+	File bin\libffi-7.dll  			; libffi is required by glib2 
 	File bin\libfontconfig-1.dll	; fontconfig is needed for ft2 pango backend
 	File bin\libfreetype-6.dll		; freetype is needed for ft2 pango backend
 	File bin\libfribidi-0.dll  ; fribidi is needed for pango 
@@ -260,6 +261,7 @@ SectionIn 1 2 RO
 	File bin\libgthread-2.0-0.dll	; from glib
 	File bin\libgtk-3-0.dll  ; gtk
 	File bin\libgtksourceview-3.0-1.dll
+	File bin\libgtksourceview-4-0.dll
 	File bin\libgtksourceviewmm-3.0-0.dll
 	File bin\libgtkmm-3.0-1.dll
 	File bin\libharfbuzz-0.dll 		; required by pango
@@ -295,18 +297,24 @@ SectionIn 1 2 RO
 	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\libbrotlidec.dll       ; libsoup dependency
+	File bin\libbrotlicommon.dll       ; libsoup dependency
 	File bin\libgnutls-30.dll       ; glib-networking dependency
 	File bin\libgmp-10.dll		; glib-networking dependency
-	File bin\libhogweed-5.dll       ; glib-networking dependency
+	File bin\libhogweed-6.dll       ; glib-networking dependency
-	File bin\libnettle-7.dll	; glib-networking dependency
+	File bin\libnettle-8.dll	; glib-networking dependency
 	File bin\libidn2-0.dll		; glib-networking dependency
 	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
+	File bin\libpeas-1.0-0.dll	; libpeas
+	File bin\libpeas-gtk-1.0-0.dll	; libpeas
+	File bin\libgirepository-1.0-1.dll	; gobject-introspection
 
 	; We install this into the same place as the DLLs to avoid any PATH manipulation.
 	SetOutPath "$LIB_INSTDIR"
+	File bin\gdbus.exe
 	File bin\fc-cache.exe
 	File bin\fc-cat.exe
 	File bin\fc-list.exe
@@ -340,6 +348,12 @@ SectionIn 1 2 RO
 	File lib\gio\modules\libgiognomeproxy.dll
 	File lib\gio\modules\libgiolibproxy.dll
 
+	SetOutPath "$INSTDIR\lib\libpeas-1.0\loaders"
+	File lib\libpeas-1.0\loaders\libpython3loader.dll
+
+	SetOutPath "$INSTDIR\lib"
+	File /r lib\girepository-1.0
+
 	SetOutPath "$INSTDIR\ssl\certs"
 	File ssl\certs\ca-bundle.crt
 	File ssl\certs\ca-bundle.trust.crt
@@ -370,6 +384,12 @@ SectionIn 1 2 RO
 	SetOutPath "$INSTDIR\share"
 	File /r share\icons
 
+	SetOutPath "$INSTDIR\share"
+	File /r share\gtksourceview-3.0
+
+	SetOutPath "$INSTDIR\share"
+	File /r share\gtksourceview-4
+
 	SetOutPath "$INSTDIR\gtk3-runtime"
 	; File gtk-postinstall.bat ; this file is generated now
 	File license.txt
@@ -497,10 +517,8 @@ Section -post
 		StrCpy $ADD_TO_PATH "1"
 		; Push $LIB_INSTDIR
 		; Call AddToPath  ; add $LIB_INSTDIR to system $PATH
-		Push $0  ; result PATH
+		EnVar::SetHKLM
-		${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$LIB_INSTDIR" ; Append
+		EnVar::AddValue "PATH" "$LIB_INSTDIR"
-		Pop $0
-		; MessageBox MB_ICONINFORMATION|MB_OK "$LIB_INSTDIR added to path"
 		goto goto_set_path_exit
 	goto_set_path_no:
 		StrCpy $ADD_TO_PATH "0"
@@ -604,6 +622,7 @@ Function un.DeleteDlls
 	un_no_dll_append:
 
 	; bin stuff (they are in the same directory)
+	Delete $LIB_INSTDIR\gdbus.exe
 	Delete $LIB_INSTDIR\fc-cache.exe
 	Delete $LIB_INSTDIR\fc-cat.exe
 	Delete $LIB_INSTDIR\fc-list.exe
@@ -625,9 +644,10 @@ Function un.DeleteDlls
 	Delete $LIB_INSTDIR\libcairo-gobject-2.dll  ; cairo. Doesn't seem to be required, but since we're distributing cairo...
 	Delete $LIB_INSTDIR\libcairo-script-interpreter-2.dll  ; cairo. Doesn't seem to be required, but since we're distributing cairo...
 	Delete $LIB_INSTDIR\libcairomm-1.0-1.dll
+	Delete $LIB_INSTDIR\libssp-0.dll
 	Delete $LIB_INSTDIR\libepoxy-0.dll
 	Delete $LIB_INSTDIR\libexslt-0.dll
-	Delete $LIB_INSTDIR\libffi-6.dll  ; libffi is required by glib 
+	Delete $LIB_INSTDIR\libffi-7.dll  ; libffi is required by glib 
 	Delete $LIB_INSTDIR\libfontconfig-1.dll  ; fontconfig is needed for ft2 pango backend
 	Delete $LIB_INSTDIR\libfreetype-6.dll  ; freetype is needed for ft2 pango backend
 	Delete $LIB_INSTDIR\libfribidi-0.dll
@@ -648,6 +668,7 @@ Function un.DeleteDlls
 	Delete $LIB_INSTDIR\libgthread-2.0-0.dll  ; from glib
 	Delete $LIB_INSTDIR\libgtk-3-0.dll  ; gtk
 	Delete $LIB_INSTDIR\libgtksourceview-3.0-1.dll  ; gtk
+	Delete $LIB_INSTDIR\libgtksourceview-4-0.dll  ; gtk
 	Delete $LIB_INSTDIR\libgtksourceviewmm-3.0-0.dll  ; gtk
 	Delete $LIB_INSTDIR\libgtkmm-3.0-1.dll
 	Delete $LIB_INSTDIR\libharfbuzz-0.dll
@@ -683,15 +704,20 @@ Function un.DeleteDlls
 	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\libbrotlidec.dll       ; libsoup dependency
+	Delete $LIB_INSTDIR\libbrotlicommon.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-5.dll       ; glib-networking dependency
+	Delete $LIB_INSTDIR\libhogweed-6.dll       ; glib-networking dependency
-	Delete $LIB_INSTDIR\libnettle-7.dll	; glib-networking dependency
+	Delete $LIB_INSTDIR\libnettle-8.dll	; glib-networking dependency
 	Delete $LIB_INSTDIR\libidn2-0.dll		; glib-networking dependency
 	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
+	Delete $LIB_INSTDIR\libpeas-1.0-0.dll	
+	Delete $LIB_INSTDIR\libpeas-gtk-1.0-0.dll
+	Delete $LIB_INSTDIR\libgirepository-1.0-1.dll
 
 
 FunctionEnd
@@ -736,10 +762,8 @@ Section Uninstall
 		StrCmp $ADD_TO_PATH "0" un_nopath  ; Setting $PATH was not requested during installation
 		; Push $LIB_INSTDIR
 		; Call un.RemoveFromPath
-		Push $0  ; result PATH
+		EnVar::SetHKLM
-		${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$LIB_INSTDIR" ; remove
+		EnVar::DeleteValue "PATH" "$LIB_INSTDIR"
-		Pop $0
-		; MessageBox MB_OK "$LIB_INSTDIR removed from PATH" /SD IDOK
 		un_nopath:
 
 		; $DLL_DIR_NAME is from the registry here
@@ -832,6 +856,12 @@ Section Uninstall
 	RMDir "$INSTDIR\lib\gio\modules"
 	RMDir "$INSTDIR\lib\gio"
 
+	Delete "$INSTDIR\lib\libpeas-1.0\loaders\libpython3loader.dll"
+	RMDir "$INSTDIR\lib\libpeas-1.0\loaders"
+	RMDir "$INSTDIR\lib\libpeas-1.0"
+
+	RMDir /r "$INSTDIR\lib\girepository-1.0"
+
 	Delete "$INSTDIR\ssl\certs\ca-bundle.crt"
 	Delete "$INSTDIR\ssl\certs\ca-bundle.trust.crt"
 	RMDir "$INSTDIR\ssl\certs"
@@ -892,6 +922,8 @@ Section Uninstall
 	RMDir /r "$INSTDIR\share\themes\Emacs"
 	RMDir /r "$INSTDIR\share\glib-2.0"
 	RMDir /r "$INSTDIR\share\icons"
+	RMDir /r "$INSTDIR\share\gtksourceview-3.0"
+	RMDir /r "$INSTDIR\share\gtksourceview-4"
 
 	RMDir "$INSTDIR\share\themes"  ; not forced
 	RMDir "$INSTDIR\share"  ; not forced

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