# HG changeset patch
# User Mark Brand <address@hidden>
# Date 1271767388 -7200
# Node ID 7089cd7966903e6e79c5803f6ebd9d5f14ad79b8
# Parent  1c7ec52af3cc8c3b79c590d0c9ecd79b4b924f39
upgrade patckages glib gtk

diff --git a/src/glib.mk b/src/glib.mk
--- a/src/glib.mk
+++ b/src/glib.mk
@@ -4,8 +4,8 @@
 # GLib
 PKG             := glib
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.24.0
-$(PKG)_CHECKSUM := 32714e64fff52d18db5f077732910215790e0c5b
+$(PKG)_VERSION  := 2.25.1
+$(PKG)_CHECKSUM := ab8eb0af4ea25622d9b0913dbafb51c4571ec8e3
 $(PKG)_SUBDIR   := glib-$($(PKG)_VERSION)
 $(PKG)_FILE     := glib-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtk.org/
@@ -38,7 +38,7 @@
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-regex \
-        --disable-threads \
+        --enable-threads \
         --disable-selinux \
         --disable-fam \
         --disable-xattr \
@@ -49,6 +49,11 @@
     $(MAKE) -C '$(1).native/glib'    -j '$(JOBS)'
     $(MAKE) -C '$(1).native/gthread' -j '$(JOBS)'
     $(MAKE) -C '$(1).native/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec
+    $(MAKE) -C '$(1).native/gmodule' -j '$(JOBS)'
+    $(MAKE) -C '$(1).native/gio/xdgmime' -j '$(JOBS)'
+    $(MAKE) -C '$(1).native/gio/inotify' -j '$(JOBS)'
+    $(MAKE) -C '$(1).native/gio/libasyncns' -j '$(JOBS)'
+    $(MAKE) -C '$(1).native/gio'     -j '$(JOBS)'
 
     # cross build
     $(SED) -i 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' '$(1)/glib-2.0.pc.in'
@@ -64,6 +69,7 @@
         CXX='$(TARGET)-c++' \
         PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
         GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal'
+    ln -s '$(1).native/gio/gschema-compile' '$(1)/gio/gschema-compile'
     $(MAKE) -C '$(1)/glib'    -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)/gmodule' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)/gthread' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
diff --git a/src/gtk.mk b/src/gtk.mk
--- a/src/gtk.mk
+++ b/src/gtk.mk
@@ -4,8 +4,8 @@
 # GTK+
 PKG             := gtk
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.19.6
-$(PKG)_CHECKSUM := 0a42eeee67fe2f3022f39fdf1a2a3817e520c0ff
+$(PKG)_VERSION  := 2.20.0
+$(PKG)_CHECKSUM := db8a8f1040a813fc1a7872d38b675b4805fa0446
 $(PKG)_SUBDIR   := gtk+-$($(PKG)_VERSION)
 $(PKG)_FILE     := gtk+-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtk.org/
@@ -34,6 +34,7 @@
     $(SED) -i 's,enable_shared=yes,enable_shared=no,' '$(1)/configure'
     $(SED) -i 's,\(STATIC_LIB_DEPS="[^"]*\) \$$LIBJASPER,\1 $$LIBJASPER $$LIBJPEG,' '$(1)/configure'
     $(SED) -i 's/-Wl,-luuid/-luuid/' '$(1)/configure'
+    $(SED) -i 's/gio-unix/gio-windows/' '$(1)/configure'
     # wine confuses the cross-compiling detection, so set it explicitly
     $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \