diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2011-04-22 19:21:50 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2011-04-22 19:21:50 (GMT) |
| commit | a5533d9ee0338e3c7a830a3ad6cbbd0d0b2c2da4 (patch) | |
| tree | 2b92fa02d487e43a91cf4fb599a24a23018670e8 /src | |
| parent | e68c3396682db0849a5072782e21d93034246460 (diff) | |
| download | mxe-a5533d9ee0338e3c7a830a3ad6cbbd0d0b2c2da4.zip mxe-a5533d9ee0338e3c7a830a3ad6cbbd0d0b2c2da4.tar.gz mxe-a5533d9ee0338e3c7a830a3ad6cbbd0d0b2c2da4.tar.bz2 | |
upgrade package: glibmm
Diffstat (limited to 'src')
| -rw-r--r-- | src/glibmm-1-fix-glib-compile-schemas.patch | 31 | ||||
| -rw-r--r-- | src/glibmm.mk | 5 |
2 files changed, 34 insertions, 2 deletions
diff --git a/src/glibmm-1-fix-glib-compile-schemas.patch b/src/glibmm-1-fix-glib-compile-schemas.patch new file mode 100644 index 0000000..0cb483f --- /dev/null +++ b/src/glibmm-1-fix-glib-compile-schemas.patch @@ -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. diff --git a/src/glibmm.mk b/src/glibmm.mk index 8ca642a..bcecc8e 100644 --- a/src/glibmm.mk +++ b/src/glibmm.mk @@ -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 @@ define $(PKG)_BUILD --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= |