Mercurial > mxe-octave
changeset 919:d9ecc9999601
fix build issues of package glib
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Wed, 28 Apr 2010 00:24:06 +0200 |
| parents | f90a81004e90 |
| children | 051a6338fc73 |
| files | src/glib-3-avoid-lc-messages.patch src/glib.mk |
| diffstat | 2 files changed, 26 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/glib-3-avoid-lc-messages.patch Wed Apr 28 00:24:06 2010 +0200 @@ -0,0 +1,25 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -r f084585629df gio/gsettings.c +--- a/gio/gsettings.c Tue Apr 27 23:13:34 2010 +0200 ++++ b/gio/gsettings.c Tue Apr 27 23:17:47 2010 +0200 +@@ -782,16 +782,13 @@ + const gchar *translated; + GError *error = NULL; + const gchar *domain; +- gint lc_category; + + domain = g_settings_schema_get_gettext_domain (settings->priv->schema); + + if (lc_char == 't') +- lc_category = LC_TIME; ++ translated = dcgettext (domain, unparsed, LC_TIME); + else +- lc_category = LC_MESSAGES; +- +- translated = dcgettext (domain, unparsed, lc_category); ++ translated = dgettext (domain, unparsed); + + if (translated != unparsed) + /* it was translated, so we need to re-parse it */
--- a/src/glib.mk Tue Apr 27 18:38:53 2010 +0200 +++ b/src/glib.mk Wed Apr 28 00:24:06 2010 +0200 @@ -69,6 +69,6 @@ $(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= $(MAKE) -C '$(1)/gobject' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(MAKE) -C '$(1)/gio' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + $(MAKE) -C '$(1)/gio' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= MISC_STUFF= $(MAKE) -C '$(1)' -j '$(JOBS)' install-pkgconfigDATA install-configexecincludeDATA endef