New installers: 2018-03-12

* Closes #13 -> add missing libjasper and libjpeg dlls

README.md

@@ -9,7 +9,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-2018-01-18-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2018-01-18/gtk2-runtime-2.24.32-2018-01-18-ts-win64.exe) and [gtk3-runtime-3.22.26-2018-01-18-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2018-01-18/gtk3-runtime-3.22.26-2018-01-18-ts-win64.exe)) were obtained entirely from the excellent [MSYS2 project](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-2018-03-12-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2018-03-12/gtk2-runtime-2.24.32-2018-03-12-ts-win64.exe) and [gtk3-runtime-3.22.28-2018-03-12-ts-win64.exe](https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer/releases/download/2018-03-12/gtk3-runtime-3.22.28-2018-03-12-ts-win64.exe)) were obtained entirely from the excellent [MSYS2 project](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
 
@@ -22,27 +22,27 @@ The following packages are included in the current GTK+-2/3 installers
 * [freetype](http://www.freetype.org/download.html) (2.9)
 * [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.36.11)
 * [gettext](http://ftp.gnu.org/pub/gnu/gettext/) (0.19.8.1)
-* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.54.2)
+* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.54.3)
 * [glib-networking](http://ftp.gnome.org/pub/GNOME/sources/glib-networking/) (2.54.1)
 * [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.54.1)
 * [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.32)
-* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.22.26)
+* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.22.28)
 * [gtkmm2](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (2.24.4)
 * [gtkmm3](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (3.22.0)
 * [gtksourceview2](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (2.10.5)
 * [gtksourceview3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/) (3.24.6)
 * ~~[gtksourceviewmm2](http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/) (2.10.3)~~ (currently unavailable)
-* [gtksourceviewmm3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/) (3.18.0)
-* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (1.7.4)
+* [gtksourceviewmm3](http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/) (3.21.3)
+* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (1.7.5)
 * [hicolor-icon-theme](http://icon-theme.freedesktop.org/releases/) (0.15)
 * [json-glib](http://ftp.gnome.org/pub/gnome/sources/json-glib/) (1.4.2)
-* [libepoxy](https://github.com/anholt/libepoxy) (1.4.3)
+* [libepoxy](https://github.com/anholt/libepoxy) (1.5.0)
 * [libffi](http://sourceware.org/libffi/) (3.2.1)
 * [libiconv](https://ftp.gnu.org/pub/gnu/libiconv/) (1.15)
 * [libpng](http://sourceforge.net/project/showfiles.php?group_id=5624) (1.6.34)
 * [librsvg](http://ftp.gnome.org/pub/GNOME/sources/librsvg/) (2.40.20)
 * [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.10.0)
-* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.60.2)
+* [libsoup](http://ftp.gnome.org/pub/GNOME/sources/libsoup/) (2.60.3)
 * [libxml2](http://xmlsoft.org/sources/) (2.9.7)
 * [libxml++2](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (2.40.0)
 * [libxml++3](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (3.0.0)

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

@@ -102,6 +102,8 @@ cp $INSTALL_SRC_MSYS2_BIN/libbz2-1.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libgraphite2.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/librsvg-2-2.dll $INSTALL_SRC_BIN
 cp $INSTALL_SRC_MSYS2_BIN/libtiff-5.dll $INSTALL_SRC_BIN
+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/libsoup-2.4-1.dll $INSTALL_SRC_BIN

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}-2018-01-18-ts-win64"
+!define PRODUCT_VERSION "${GTK_VERSION}-2018-03-12-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"
@@ -270,6 +270,9 @@ SectionIn 1 2 RO
 	File bin\libpangomm-1.4-1.dll
 	File bin\libpixman-1-0.dll  ; libpixman, needed by cairo
 	File bin\libpng16-16.dll  ; for gdk_pixbuf loader.
+	File bin\libjasper-4.dll  ; for gdk_pixbuf loader.
+	File bin\libjpeg-8.dll  ; for gdk_pixbuf loader.
+	File bin\libtiff-5.dll  ; for gdk_pixbuf loader.
 	File bin\libxml++-2.6-2.dll  ; fontconfig needs this
 	File bin\libxml++-3.0-1.dll
 	File bin\libpcre-1.dll
@@ -280,7 +283,8 @@ SectionIn 1 2 RO
 	File bin\libbz2-1.dll			; required by fontconfig
 	File bin\libgraphite2.dll		; required by harfbuzz
 	File bin\librsvg-2-2.dll		; required by adwaita-icon-theme
-	File bin\libtiff-5.dll			; required by gdk-pixbuf2
+	File bin\libcroco-0.6-3.dll		; required by adwaita-icon-theme
+	File bin\liblzma-5.dll		; required by adwaita-icon-theme
 	File bin\libstdc++-6.dll
 	File bin\libgcc_s_seh-1.dll
 	File bin\libwinpthread-1.dll
@@ -626,6 +630,9 @@ Function un.DeleteDlls
 	Delete $LIB_INSTDIR\libpangomm-1.4-1.dll
 	Delete $LIB_INSTDIR\libpixman-1-0.dll  ; libpixman, needed by cairo
 	Delete $LIB_INSTDIR\libpng16-16.dll  ; for gdk_pixbuf loader.
+	Delete $LIB_INSTDIR\libjasper-4.dll  ; for gdk_pixbuf loader.
+	Delete $LIB_INSTDIR\libjpeg-8.dll  ; for gdk_pixbuf loader.
+	Delete $LIB_INSTDIR\libtiff-5.dll  ; for gdk_pixbuf loader.
 	Delete $LIB_INSTDIR\libxml2-2.dll  ; fontconfig needs this
 	Delete $LIB_INSTDIR\libxslt-1.dll  ; fontconfig needs this
 	Delete $LIB_INSTDIR\libxml++-2.6-2.dll  ; fontconfig needs this
@@ -636,7 +643,8 @@ Function un.DeleteDlls
 	Delete $LIB_INSTDIR\libbz2-1.dll
 	Delete $LIB_INSTDIR\libgraphite2.dll
 	Delete $LIB_INSTDIR\librsvg-2-2.dll
-	Delete $LIB_INSTDIR\libtiff-5.dll
+	Delete $LIB_INSTDIR\libcroco-0.6-3.dll
+	Delete $LIB_INSTDIR\liblzma-5.dll
 	Delete $LIB_INSTDIR\libstdc++-6.dll
 	Delete $LIB_INSTDIR\libgcc_s_seh-1.dll
 	Delete $LIB_INSTDIR\libwinpthread-1.dll

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

@@ -11,9 +11,9 @@
 ; Directory and package names: gtk3-runtime.
 
 
-!define GTK_VERSION "3.22.26"
+!define GTK_VERSION "3.22.28"
 !define GTK_BIN_VERSION "3.0.0"
-!define PRODUCT_VERSION "${GTK_VERSION}-2018-01-18-ts-win64"
+!define PRODUCT_VERSION "${GTK_VERSION}-2018-03-12-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"
@@ -272,6 +272,8 @@ SectionIn 1 2 RO
 	File bin\libpangomm-1.4-1.dll
 	File bin\libpixman-1-0.dll  	; libpixman, needed by cairo
 	File bin\libpng16-16.dll  		; required by gdk-pixbuf2
+	File bin\libjpeg-8.dll  		; required by gdk-pixbuf2
+	File bin\libjasper-4.dll  		; required by gdk-pixbuf2
 	File bin\libxml++-2.6-2.dll  ; fontconfig needs this
 	File bin\libxml++-3.0-1.dll
 	File bin\libxml2-2.dll			; fontconfig needs this
@@ -650,6 +652,8 @@ Function un.DeleteDlls
 	Delete $LIB_INSTDIR\libpangomm-1.4-1.dll
 	Delete $LIB_INSTDIR\libpixman-1-0.dll  ; libpixman, needed by cairo
 	Delete $LIB_INSTDIR\libpng16-16.dll  ; for gdk_pixbuf loader.
+	Delete $LIB_INSTDIR\libjasper-4.dll  ; for gdk_pixbuf loader.
+	Delete $LIB_INSTDIR\libjpeg-8.dll  ; for gdk_pixbuf loader.
 	Delete $LIB_INSTDIR\libxslt-1.dll  ; fontconfig needs this
 	Delete $LIB_INSTDIR\libpcre-1.dll  ; fontconfig needs this
 	Delete $LIB_INSTDIR\libxml2-2.dll  ; fontconfig needs this
@@ -817,6 +821,11 @@ Section Uninstall
 	RMDir "$INSTDIR\lib\gio\modules"
 	RMDir "$INSTDIR\lib\gio"
 
+	Delete "$INSTDIR\ssl\certs\ca-bundle.crt"
+	Delete "$INSTDIR\ssl\certs\ca-bundle.trust.crt"
+	RMDir "$INSTDIR\ssl\certs"
+	RMDir "$INSTDIR\ssl"
+
 	; no longer in gtk as of 2.14.5
 	;RMDir /r "$INSTDIR\lib\gtk-3.0\${GTK_BIN_VERSION}\immodules"
 	; gone as of gtk 2.16.6-2

gtk-nsis-pack/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache

@@ -10,12 +10,50 @@
 "ani" ""
 "RIFF    ACON" "    xxxx    " 100
 
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-bmp.dll"
+"bmp" 5 "gdk-pixbuf" "BMP" "LGPL"
+"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
+"bmp" ""
+"BM" "" 100
+
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-gif.dll"
+"gif" 4 "gdk-pixbuf" "GIF" "LGPL"
+"image/gif" ""
+"gif" ""
+"GIF8" "" 100
+
 "lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-icns.dll"
 "icns" 4 "gdk-pixbuf" "MacOS X icon" "GPL"
 "image/x-icns" ""
 "icns" ""
 "icns" "" 100
 
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-ico.dll"
+"ico" 5 "gdk-pixbuf" "Windows icon" "LGPL"
+"image/x-icon" "image/x-ico" "image/x-win-bitmap" "image/vnd.microsoft.icon" "application/ico" "image/ico" "image/icon" "text/ico" ""
+"ico" "cur" ""
+"  \001   " "zz znz" 100
+"  \002   " "zz znz" 100
+
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-jasper.dll"
+"jpeg2000" 4 "gdk-pixbuf" "JPEG 2000" "LGPL"
+"image/jp2" "image/jpeg2000" "image/jpx" ""
+"jp2" "jpc" "jpx" "j2k" "jpf" ""
+"    jP" "!!!!  " 100
+"\377O\377Q" "" 100
+
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-jpeg.dll"
+"jpeg" 5 "gdk-pixbuf" "JPEG" "LGPL"
+"image/jpeg" ""
+"jpeg" "jpe" "jpg" ""
+"\377\330" "" 100
+
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-png.dll"
+"png" 5 "gdk-pixbuf" "PNG" "LGPL"
+"image/png" ""
+"png" ""
+"\211PNG\r\n\032\n" "" 100
+
 "lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-pnm.dll"
 "pnm" 4 "gdk-pixbuf" "PNM/PBM/PGM/PPM" "LGPL"
 "image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
@@ -52,6 +90,14 @@
 "  \n" "xz " 100
 "  \v" "xz " 100
 
+"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-tiff.dll"
+"tiff" 5 "gdk-pixbuf" "TIFF" "LGPL"
+"image/tiff" ""
+"tiff" "tif" ""
+"MM *" "  z " 100
+"II* " "   z" 100
+"II* \020   CR\002 " "   z zzz   z" 0
+
 "lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-xbm.dll"
 "xbm" 4 "gdk-pixbuf" "XBM" "LGPL"
 "image/x-xbitmap" ""

gtk-nsis-pack/share/glib-2.0/schemas/gschema.dtd

@@ -1,4 +1,4 @@
-<!ELEMENT schemalist (schema|enum)* >
+<!ELEMENT schemalist (schema|enum|flags)* >
 <!ATTLIST schemalist gettext-domain CDATA #IMPLIED >
 
 <!ELEMENT schema (key|child|override)* >
@@ -47,7 +47,8 @@
 
 <!-- range is only allowed for keys with numeric type -->
 <!ELEMENT range EMPTY >
-<!-- min and max must be parseable as values of the key type and min < max -->
+<!-- min and max must be parseable as values of the key type and
+     min must be less than or equal to max -->
 <!ATTLIST range min CDATA #REQUIRED
                 max CDATA #REQUIRED >