diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-05-16 15:04:07 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-05-16 15:04:07 (GMT) |
| commit | e4f8452196f86cb9562047a5ec0da995ea1844ee (patch) | |
| tree | 2138b930f3a1d575015947e3abccf2fafe629b31 | |
| parent | b1eb2bd5126bc750e4490e9e04c7ce9994d45891 (diff) | |
| download | mxe-e4f8452196f86cb9562047a5ec0da995ea1844ee.zip mxe-e4f8452196f86cb9562047a5ec0da995ea1844ee.tar.gz mxe-e4f8452196f86cb9562047a5ec0da995ea1844ee.tar.bz2 | |
improved patches for package glib
| -rw-r--r-- | src/glib-2-optional-gettext.patch | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/src/glib-2-optional-gettext.patch b/src/glib-2-optional-gettext.patch index 7f1db08..1375eb5 100644 --- a/src/glib-2-optional-gettext.patch +++ b/src/glib-2-optional-gettext.patch @@ -1,9 +1,9 @@ This file is part of mingw-cross-env. See doc/index.html for further information. -diff -r 0afda95c1aa4 configure.in ---- a/configure.in Sun May 16 15:54:15 2010 +0200 -+++ b/configure.in Sun May 16 16:07:08 2010 +0200 +diff -r 3241a43cfc79 configure.in +--- a/configure.in Sun May 16 16:38:34 2010 +0200 ++++ b/configure.in Sun May 16 17:02:59 2010 +0200 @@ -477,8 +477,8 @@ GLIB_GNU_GETTEXT @@ -15,9 +15,9 @@ diff -r 0afda95c1aa4 configure.in *** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html ]) fi -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 +diff -r 3241a43cfc79 gio/gsettings.c +--- a/gio/gsettings.c Sun May 16 16:38:34 2010 +0200 ++++ b/gio/gsettings.c Sun May 16 17:02:59 2010 +0200 @@ -782,16 +782,13 @@ const gchar *translated; GError *error = NULL; @@ -37,3 +37,19 @@ diff -r f084585629df gio/gsettings.c if (translated != unparsed) /* it was translated, so we need to re-parse it */ +diff -r 3241a43cfc79 glib/gi18n.h +--- a/glib/gi18n.h Sun May 16 16:38:34 2010 +0200 ++++ b/glib/gi18n.h Sun May 16 17:02:59 2010 +0200 +@@ -22,7 +22,12 @@ + + #include <glib.h> + ++#ifdef ENABLE_NLS + #include <libintl.h> ++#else ++#define gettext(String) (String) ++#endif ++ + #include <string.h> + + #define _(String) gettext (String) |