# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1274022247 -7200
# Node ID 750e3f9eec37b2cdd15359b79ff3c6af84716cc6
# Parent  ca52d9f7559de8d765315829c62ab0dd07e8de17
improved patches for package glib

diff -r ca52d9f7559d -r 750e3f9eec37 src/glib-2-optional-gettext.patch
--- a/src/glib-2-optional-gettext.patch	Sun May 16 16:31:57 2010 +0200
+++ b/src/glib-2-optional-gettext.patch	Sun May 16 17:04:07 2010 +0200
@@ -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 @@
  *** 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 @@
  
        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)