Mercurial > mxe-octave

changeset 1767:8c947c21bbe0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade package: glibmm
author Volker Grabsch <vog@notjusthosting.com>
date Fri, 22 Apr 2011 21:21:50 +0200
parents d9a35d002ab1
children d3d08843c62b
files src/glibmm-1-fix-glib-compile-schemas.patch src/glibmm.mk
diffstat 2 files changed, 34 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/glibmm-1-fix-glib-compile-schemas.patch	Fri Apr 22 21:21:50 2011 +0200
@@ -0,0 +1,31 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+This patch has been taken from:
+https://bugzilla.gnome.org/show_bug.cgi?id=648485
+
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index d5225e6..25e6714 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -97,6 +97,6 @@ dist_noinst_DATA = settings/org.gtkmm.demo.gschema.xml
+ CLEANFILES = settings/gschemas.compiled
+ 
+ settings/gschemas.compiled: $(srcdir)/settings/org.gtkmm.demo.gschema.xml
+-	$(AM_V_GEN)glib-compile-schemas --targetdir=settings $(srcdir)/settings
++	$(AM_V_GEN)$(GLIB_COMPILE_SCHEMAS) --targetdir=settings $(srcdir)/settings
+ 
+ all-local: settings/gschemas.compiled
+diff --git a/examples/Makefile.in b/examples/Makefile.in
+index 17ce00a..20bfd16 100644
+--- a/examples/Makefile.in
++++ b/examples/Makefile.in
+@@ -924,7 +924,7 @@ uninstall-am:
+ 
+ 
+ settings/gschemas.compiled: $(srcdir)/settings/org.gtkmm.demo.gschema.xml
+-	$(AM_V_GEN)glib-compile-schemas --targetdir=settings $(srcdir)/settings
++	$(AM_V_GEN)$(GLIB_COMPILE_SCHEMAS) --targetdir=settings $(srcdir)/settings
+ 
+ all-local: settings/gschemas.compiled
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/src/glibmm.mk	Fri Apr 22 21:16:04 2011 +0200
+++ b/src/glibmm.mk	Fri Apr 22 21:21:50 2011 +0200
@@ -4,8 +4,8 @@
 # GLibmm
 PKG             := glibmm
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.24.2
-$(PKG)_CHECKSUM := df5f22d2c40ebdf097ecdb4a7dfeef70d1ca24e7
+$(PKG)_VERSION  := 2.28.0
+$(PKG)_CHECKSUM := ba9b40224a6543911ffbfd7268aa9a9172613a73
 $(PKG)_SUBDIR   := glibmm-$($(PKG)_VERSION)
 $(PKG)_FILE     := glibmm-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtkmm.org/
@@ -29,6 +29,7 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         CXX='$(TARGET)-c++' \
         PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
+        GLIB_COMPILE_SCHEMAS='$(PREFIX)/$(TARGET)/bin/glib-compile-schemas' \
         MAKE=$(MAKE)
     $(MAKE) -C '$(1)/gio/src' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= MISC_STUFF=
     $(MAKE) -C '$(1)'         -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=