Merge pull request #33 from ashaduri/no-gtk2-prefs

Removed gtk2_prefs

.github/FUNDING.yml

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

README.md

@@ -10,51 +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-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.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.31-2022-01-04-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2022-01-04/gtk3-runtime-3.24.31-2022-01-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!!!).
+
+**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.36.0)
+* [adwaita icon theme](http://ftp.gnome.org/pub/GNOME/sources/adwaita-icon-theme/) (41.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)
+* [cairomm](http://cairographics.org/releases/) (1.14.3)
-* [fontconfig](http://www.freedesktop.org/software/fontconfig/release/) (2.13.1)
+* [fontconfig](http://www.freedesktop.org/software/fontconfig/release/) (2.13.94)
-* [freetype](http://www.freetype.org/download.html) (2.10.2)
+* [freetype](http://www.freetype.org/download.html) (2.11.1)
-* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.40.0)
+* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.42.6)
 * [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.70.2)
-* [glib-networking](http://ftp.gnome.org/pub/GNOME/sources/glib-networking/) (2.64.2)
+* [glib-networking](http://ftp.gnome.org/pub/GNOME/sources/glib-networking/) (2.70.1)
-* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.64.2)
+* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.66.2)
-* [gobject-introspection](http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/) (1.64.1)
+* [gobject-introspection](http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/) (1.70.0)
-* [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.32)
+* [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.33)
-* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.24.18)
+* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.24.31)
 * [gtkmm2](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (2.24.5)
-* [gtkmm3](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (3.24.2)
+* [gtkmm3](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (3.24.5)
 * [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.2)
 * ~~[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/) (3.1.2)
 * [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.6)
-* [libepoxy](https://github.com/anholt/libepoxy) (1.5.4)
+* [libepoxy](https://github.com/anholt/libepoxy) (1.5.9)
 * [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)
+* [libpeas](http://ftp.gnome.org/pub/gnome/sources/libpeas/) (1.30.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.52.5)
-* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.3)
+* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.7)
-* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.70.0)
+* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.74.2)
-* [libxml2](http://xmlsoft.org/sources/) (2.9.10)
+* [libxml2](http://xmlsoft.org/sources/) (2.9.12)
-* [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.2.0)
+* [libxml++3](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (3.2.2)
 * [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.50.3)
-* [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.42.1)
+* [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.46.2)
-* [pcre](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) (8.44)
+* [pcre](ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/) (8.45)
 * [pixman](http://cairographics.org/releases/) (0.40.0)
-* [sqlite](https://www.sqlite.org) (3.31.1)
+* [sqlite](https://www.sqlite.org) (3.37.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.  

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.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>