New installers: 2020-07-15

README.md

@@ -10,7 +10,7 @@ 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-2020-05-19-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2020-05-19/gtk2-runtime-2.24.32-2020-05-19-ts-win64.exe) and [gtk3-runtime-3.24.18-2020-05-19-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2020-05-19/gtk3-runtime-3.24.18-2020-05-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 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
 
@@ -19,31 +19,32 @@ The following packages are included in the current GTK+-2/3 installers
 * [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.2)
 * [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.64.2)
+* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.64.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.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.18)
+* [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.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.6.6)
+* [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.4)
 * [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.48.4)
+* [librsvg](http://ftp.gnome.org/pub/GNOME/sources/librsvg/) (2.48.7)
 * [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.3)
 * [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.70.0)
 * [libxml2](http://xmlsoft.org/sources/) (2.9.10)
@@ -54,7 +55,7 @@ The following packages are included in the current GTK+-2/3 installers
 * [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.42.1)
 * [pcre](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) (8.44)
 * [pixman](http://cairographics.org/releases/) (0.40.0)
-* [sqlite](https://www.sqlite.org) (3.31.1)
+* [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,6 +43,7 @@ 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-7.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
@@ -180,6 +182,12 @@ 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}-2020-05-19-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"
@@ -234,6 +234,7 @@ 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...
@@ -603,6 +604,7 @@ 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-7.dll  ; libffi is required by glib 
 	Delete $LIB_INSTDIR\libfontconfig-1.dll  ; fontconfig is needed for ft2 pango backend