# HG changeset patch
# User Mark Brand <address@hidden>
# Date 1272358205 -7200
# Node ID 7abffe0c0418f35fd91f058f222753c9806def99
# Parent  f3c30136aa2ef756717c76838465834a6a327c83
upgrade package glib

This is the 2nd attempt to build glib 2.25.3. This time we take a more
minimalistic approach to the native gio subproject, building only the
utility glib-compile-schemas which is needed to crossbuild.

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.3
+$(PKG)_CHECKSUM := 5a8cf17c44decb27de3fbc202be05c89d55f647d
 $(PKG)_SUBDIR   := glib-$($(PKG)_VERSION)
 $(PKG)_FILE     := glib-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtk.org/
@@ -45,9 +45,10 @@
         CPPFLAGS='-I$(1).native/$(libiconv_SUBDIR)/include' \
         LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs'
     $(SED) -i 's,#define G_ATOMIC.*,,' '$(1).native/config.h'
-    $(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/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/gio'            -j '$(JOBS)' glib-compile-schemas
 
     # cross build
     $(SED) -i 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' '$(1)/glib-2.0.pc.in'
@@ -63,6 +64,10 @@
         CXX='$(TARGET)-c++' \
         PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
         GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal'
+    ln -s '$(1).native/gio/glib-compile-schemas' '$(1)/gio/glib-compile-schemas'
+    # Although commit ec664445a9cf1769e440a25ffb4e17e9e644f6d0 renamed
+    # gschema-compile to glib-compile-schemas, the  old name is still expected.
+    #ln -s '$(1).native/gio/glib-compile-schemas' '$(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=