new packages created gtk-2.24.29 and gtk-3.18.6

all dependencies have been updated
patches were necessary for cairo and cairomm
libepoxy added: new gtk3 dependency

README.md

@@ -11,45 +11,48 @@ The installers can be found [here](http://lvserver.ugent.be/gtk-win64/).
 
 Both for convencience as well as for increased reliability across installations, it is recommended for developers to compile and link against the GTK+ SDK that I used to create the installers. This SDK can also be obtained at the aforementioned url.
 
-The current releases ([gtk2-runtime-2.24.28-2015-07-03-ts-win64.exe](http://lvserver.ugent.be/gtk-win64/gtk2-runtime/gtk2-runtime-2.24.28-2015-07-03-ts-win64.exe) and [gtk3-runtime-3.14.13-2015-07-03-ts-win64.exe](http://lvserver.ugent.be/gtk-win64/gtk3-runtime/gtk3-runtime-3.14.13-2015-07-03-ts-win64.exe)) have been compiled using GCC 5.1.0 (MinGW-w64 installed from TDM-GCC). 
+The current releases ([gtk2-runtime-2.24.29-2016-01-10-ts-win64.exe](http://lvserver.ugent.be/gtk-win64/gtk2-runtime/gtk2-runtime-2.24.29-2016-01-10-ts-win64.exe) and [gtk3-runtime-3.18.6-2016-01-10-ts-win64.exe](http://lvserver.ugent.be/gtk-win64/gtk3-runtime/gtk3-runtime-3.18.6-2016-01-10-ts-win64.exe)) have been compiled using GCC 5.1.0 (MinGW-w64 installed from TDM-GCC). 
 The included GTK+ dependencies were selected according to the flowchart used by [Hexchat](http://hexchat.github.io/gtk-win32/). The source tarballs can be obtained by clicking on the names of the dependencies in the following list:
 
-* [adwaita icon theme](http://ftp.gnome.org/pub/GNOME/sources/adwaita-icon-theme/) (3.14.1)
-* [atk](http://ftp.gnome.org/pub/GNOME/sources/atk/) (2.16.0)
-* [atkmm](http://ftp.gnome.org/pub/GNOME/sources/atkmm/) (2.22.7)
-* [cairo](http://cairographics.org/releases/) (1.14.2)
-* [cairomm](http://cairographics.org/releases/) (1.11.2)
+* [adwaita icon theme](http://ftp.gnome.org/pub/GNOME/sources/adwaita-icon-theme/) (3.18.0)
+* [atk](http://ftp.gnome.org/pub/GNOME/sources/atk/) (2.18.0)
+* [atkmm](http://ftp.gnome.org/pub/GNOME/sources/atkmm/) (2.24.2)
+* [cairo](http://cairographics.org/releases/) (1.14.6)
+* [cairomm](http://cairographics.org/releases/) (1.12.0)
 * [fontconfig](http://www.freedesktop.org/software/fontconfig/release/) (2.11.1)
-* [freetype](http://www.freetype.org/download.html) (2.6)
-* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.30.8)
-* [gettext](http://ftp.gnu.org/pub/gnu/gettext/) (0.19.4)
-* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.44.1)
-* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.44.0)
-* [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.28)
-* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.14.13)
+* [freetype](http://www.freetype.org/download.html) (2.6.2)
+* [gdk-pixbuf](http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/) (2.32.3)
+* [gettext](http://ftp.gnu.org/pub/gnu/gettext/) (0.19.7)
+* [glib](http://ftp.gnome.org/pub/GNOME/sources/glib/) (2.46.2)
+* [glibmm](http://ftp.gnome.org/pub/GNOME/sources/glibmm/) (2.46.3)
+* [gtk2](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (2.24.29)
+* [gtk3](http://ftp.gnome.org/pub/GNOME/sources/gtk+/) (3.18.6)
 * [gtkmm2](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (2.24.4)
-* [gtkmm3](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (3.14.0)
-* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (0.9.41)
+* [gtkmm3](http://ftp.gnome.org/pub/GNOME/sources/gtkmm) (3.18.0)
+* [harfbuzz](http://www.freedesktop.org/software/harfbuzz/release/) (1.1.2)
 * [hicolor-icon-theme](http://icon-theme.freedesktop.org/releases/) (0.15)
 * [icon-naming-utils](http://tango.freedesktop.org/releases/) (0.8.90)
 * [intltool](http://ftp.gnome.org/pub/gnome/sources/intltool/) (0.51.0)
 * [json-glib](http://ftp.gnome.org/pub/gnome/sources/json-glib/) (1.0.4)
+* [libepoxy](https://github.com/anholt/libepoxy) (1.3.1)
 * [libffi](http://sourceware.org/libffi/) (3.2.1)
-* [libpng](http://sourceforge.net/project/showfiles.php?group_id=5624) (1.6.17)
-* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.4.1)
-* [libxml2](http://xmlsoft.org/sources/) (2.9.2)
+* [libpng](http://sourceforge.net/project/showfiles.php?group_id=5624) (1.6.20)
+* [libsigc++](http://ftp.gnome.org/pub/GNOME/sources/libsigc++/) (2.6.2)
+* [libxml2](http://xmlsoft.org/sources/) (2.9.3)
 * [libxml++](http://ftp.gnome.org/pub/GNOME/sources/libxml++/) (2.38.1)
 * [libxslt](http://xmlsoft.org/sources/) (1.1.28)
-* [pango](http://ftp.gnome.org/pub/GNOME/sources/pango/) (1.36.8)
-* [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.36.0)
-* [pixman](http://cairographics.org/releases/) (0.32.6)
-* [pkg-config](http://pkgconfig.freedesktop.org/releases/) (0.28)
+* [mm-common](http://ftp.gnome.org/pub/GNOME/sources/mm-common/) (0.9.9)
+* [pango](http://ftp.gnome.org/pub/GNOME/sources/pango/) (1.38.1)
+* [pangomm](http://ftp.gnome.org/pub/GNOME/sources/pangomm/) (2.38.1)
+* [pixman](http://cairographics.org/releases/) (0.32.8)
+* [pkg-config](http://pkgconfig.freedesktop.org/releases/) (0.29)
 * [win-iconv](http://code.google.com/p/win-iconv/downloads/list) (0.0.6)
 * [zlib](http://www.zlib.net) (1.2.8)
 
-For all other information regarding how to use the installer, the reader is kindly referred to the [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 this website is that mine DO NOT have the `compatdlls` option, but this should present no problems to any user.  
+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.  
 
 Personally I use this installer in my [XMI-MSIM project](http://github.com/xmimsim). You may want to have a look at my Inno Setup ([new](https://github.com/tschoonj/xmimsim/blob/master/windows/xmimsim.iss)) and NSIS ([old](https://github.com/tschoonj/xmimsim/blob/XMI-MSIM-4.0/nsis/xmimsim-win64.nsi.in)) based installers. 
 
+Those interested in scientific plotting using Gtkmm3 may want to have a look at my project [Gtkmm-PLplot](https://github.com/tschoonj/gtkmm-plplot). Documentation and examples can be found [here](http://tschoonj.github.io/gtkmm-plplot)
 
 Tom Schoonjans

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

@@ -12,9 +12,9 @@
 ; should be installable side by side with this package.
 
 
-!define GTK_VERSION "2.24.28"
+!define GTK_VERSION "2.24.29"
 !define GTK_BIN_VERSION "2.10.0"
-!define PRODUCT_VERSION "${GTK_VERSION}-2015-07-03-ts-win64"
+!define PRODUCT_VERSION "${GTK_VERSION}-2016-01-10-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"
@@ -289,7 +289,6 @@ SectionIn 1 2 RO
 	File bin\gspawn-win64-helper-console.exe
 	File bin\gtk-query-immodules-2.0.exe
 	File bin\gtk-update-icon-cache.exe
-	File bin\pango-querymodules.exe
 	
 	
 	SetOutPath "$INSTDIR\etc"
@@ -576,7 +575,6 @@ Function un.DeleteDlls
 	Delete $LIB_INSTDIR\gspawn-win64-helper-console.exe
 	Delete $LIB_INSTDIR\gtk-query-immodules-2.0.exe
 	Delete $LIB_INSTDIR\gtk-update-icon-cache.exe
-	Delete $LIB_INSTDIR\pango-querymodules.exe
 
 	; dlls
 	Delete $LIB_INSTDIR\libatk-1.0-0.dll  ; atk
@@ -858,7 +856,6 @@ Function WritePostInstall
 	Push $R9
 		FileOpen $R9 $R0 w
 		FileWrite $R9 "@echo off$\r$\n"
-		FileWrite $R9 "$\"$INSTDIR\bin\pango-querymodules.exe$\" > $\"$INSTDIR\etc\pango\pango.modules$\"$\r$\n"
 		FileWrite $R9 "rem $\"$INSTDIR\bin\gdk-pixbuf-query-loaders.exe$\" > $\"$INSTDIR\etc\gtk-2.0\gdk-pixbuf.loaders$\"$\r$\n"
 		FileWrite $R9 "$\"$INSTDIR\bin\gtk-query-immodules-2.0.exe$\" > $\"$INSTDIR\etc\gtk-2.0\gtk.immodules$\"$\r$\n"
 		FileWrite $R9 "rem $\"$INSTDIR\bin\gtk-update-icon-cache.exe$\"$\r$\n"

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

@@ -11,9 +11,9 @@
 ; Directory and package names: gtk3-runtime.
 
 
-!define GTK_VERSION "3.14.13"
+!define GTK_VERSION "3.18.6"
 !define GTK_BIN_VERSION "3.0.0"
-!define PRODUCT_VERSION "${GTK_VERSION}-2015-07-03-ts-win64"
+!define PRODUCT_VERSION "${GTK_VERSION}-2016-01-10-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"
@@ -237,6 +237,7 @@ SectionIn 1 2 RO
 	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 glib 
 	File bin\libfontconfig-1.dll  ; fontconfig is needed for ft2 pango backend
@@ -288,7 +289,6 @@ SectionIn 1 2 RO
 	File bin\gspawn-win64-helper-console.exe
 	File bin\gtk-query-immodules-3.0.exe
 	File bin\gtk-update-icon-cache.exe
-	File bin\pango-querymodules.exe
 	
 	
 	SetOutPath "$INSTDIR\etc"
@@ -576,7 +576,6 @@ Function un.DeleteDlls
 	Delete $LIB_INSTDIR\gspawn-win64-helper-console.exe
 	Delete $LIB_INSTDIR\gtk-query-immodules-3.0.exe
 	Delete $LIB_INSTDIR\gtk-update-icon-cache.exe
-	Delete $LIB_INSTDIR\pango-querymodules.exe
 
 	; dlls
 	Delete $LIB_INSTDIR\libatk-1.0-0.dll  ; atk
@@ -585,6 +584,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\libepoxy-0.dll
 	Delete $LIB_INSTDIR\libexslt-0.dll
 	Delete $LIB_INSTDIR\libffi-6.dll  ; libffi is required by glib 
 	Delete $LIB_INSTDIR\libfontconfig-1.dll  ; fontconfig is needed for ft2 pango backend
@@ -860,7 +860,6 @@ Function WritePostInstall
 	Push $R9
 		FileOpen $R9 $R0 w
 		FileWrite $R9 "@echo off$\r$\n"
-		FileWrite $R9 "$\"$INSTDIR\bin\pango-querymodules.exe$\" > $\"$INSTDIR\etc\pango\pango.modules$\"$\r$\n"
 		FileWrite $R9 "rem $\"$INSTDIR\bin\gdk-pixbuf-query-loaders.exe$\" > $\"$INSTDIR\etc\gtk-3.0\gdk-pixbuf.loaders$\"$\r$\n"
 		FileWrite $R9 "$\"$INSTDIR\bin\gtk-query-immodules-3.0.exe$\" > $\"$INSTDIR\etc\gtk-3.0\gtk.immodules$\"$\r$\n"
 		FileWrite $R9 "rem $\"$INSTDIR\bin\gtk-update-icon-cache.exe$\"$\r$\n"

gtk-nsis-pack/share/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml

@@ -3,7 +3,7 @@
 
   <schema id='org.gtk.Settings.Debug' path='/org/gtk/settings/debug/'>
     <key name='enable-inspector-keybinding' type='b'>
-      <default>true</default>
+      <default>false</default>
       <summary>Enable inspector keybinding</summary>
       <description>
         If this setting is true, GTK+ lets the user open an interactive

gtk-nsis-pack/share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml

@@ -43,6 +43,11 @@
     <value nick='12h' value='1'/>
   </enum>
 
+  <enum id='org.gtk.Settings.FileChooser.DateFormat'>
+    <value nick='regular' value='0'/>
+    <value nick='with-time' value='1'/>
+  </enum>
+
   <schema id='org.gtk.Settings.FileChooser' path='/org/gtk/settings/file-chooser/'>
     <key name='last-folder-uri' type='s'>
       <default>""</default>
@@ -136,6 +141,13 @@
         Whether the time is shown in 24h or 12h format.
       </description>
     </key>
+    <key name="date-format" enum="org.gtk.Settings.FileChooser.DateFormat">
+      <default>'regular'</default>
+      <summary>Date format</summary>
+      <description>
+        The amount of detail to show in the Modified column.
+      </description>
+    </key>
   </schema>
 
 </schemalist>