# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1274019885 -7200
# Node ID dd1f42da329429cc9eedb4dbd27986252b8e24b3
# Parent  983f7cf55e69adeeea8a079744fec6a079f072b1
improved patches of package glib

diff -r 983f7cf55e69 -r dd1f42da3294 src/glib-1-no-gtk-doc-check.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/glib-1-no-gtk-doc-check.patch	Sun May 16 16:24:45 2010 +0200
@@ -0,0 +1,15 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+diff -r eabdfe3e0f05 configure.in
+--- a/configure.in	Sun May 16 15:52:08 2010 +0200
++++ b/configure.in	Sun May 16 15:54:07 2010 +0200
+@@ -2748,8 +2748,6 @@
+ dnl *** Checks for gtk-doc ***
+ dnl **************************
+ 
+-GTK_DOC_CHECK([1.11])
+-
+ AC_ARG_ENABLE(man,
+               [AC_HELP_STRING([--enable-man],
+                               [regenerate man pages from Docbook [default=no]])],enable_man=yes,
diff -r 983f7cf55e69 -r dd1f42da3294 src/glib-1-win32.patch
--- a/src/glib-1-win32.patch	Sun May 16 15:38:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-diff -ru glib-2.23.4.orig/configure.in glib-2.23.4/configure.in
---- glib-2.23.4.orig/configure.in	2010-02-21 21:54:55.000000000 +0100
-+++ glib-2.23.4/configure.in	2010-02-23 17:44:18.000000000 +0100
-@@ -476,13 +476,6 @@
- AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
- GLIB_GNU_GETTEXT
- 
--if test "$gt_cv_have_gettext" != "yes" ; then
--  AC_MSG_ERROR([
--*** You must have either have gettext support in your C library, or use the 
--*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
--])
--fi
--
- LIBS="$INTLLIBS $LIBS"
- 
- GETTEXT_PACKAGE=glib20
-@@ -2748,8 +2741,6 @@
- dnl *** Checks for gtk-doc ***
- dnl **************************
- 
--GTK_DOC_CHECK([1.11])
--
- AC_ARG_ENABLE(man,
-               [AC_HELP_STRING([--enable-man],
-                               [regenerate man pages from Docbook [default=no]])],enable_man=yes,
diff -r 983f7cf55e69 -r dd1f42da3294 src/glib-2-fix-tool-paths.patch
--- a/src/glib-2-fix-tool-paths.patch	Sun May 16 15:38:42 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-diff -ru glib-2.23.2.orig/glib-2.0.pc.in glib-2.23.2/glib-2.0.pc.in
---- glib-2.23.2.orig/glib-2.0.pc.in	2009-04-01 01:04:20.000000000 +0200
-+++ glib-2.23.2/glib-2.0.pc.in	2010-02-07 23:58:08.000000000 +0100
-@@ -3,9 +3,9 @@
- libdir=@libdir@
- includedir=@includedir@
- 
--glib_genmarshal=glib-genmarshal
--gobject_query=gobject-query
--glib_mkenums=glib-mkenums
-+glib_genmarshal=@bindir@/glib-genmarshal
-+gobject_query=@bindir@/gobject-query
-+glib_mkenums=@bindir@/glib-mkenums
- 
- Name: GLib
- Description: C Utility Library
diff -r 983f7cf55e69 -r dd1f42da3294 src/glib-2-optional-gettext.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/glib-2-optional-gettext.patch	Sun May 16 16:24:45 2010 +0200
@@ -0,0 +1,39 @@
+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
+@@ -477,8 +477,8 @@
+ GLIB_GNU_GETTEXT
+ 
+ if test "$gt_cv_have_gettext" != "yes" ; then
+-  AC_MSG_ERROR([
+-*** You must have either have gettext support in your C library, or use the 
++  AC_MSG_WARN([
++*** You should either have gettext support in your C library, or use the
+ *** 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
+@@ -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 */
diff -r 983f7cf55e69 -r dd1f42da3294 src/glib-3-fix-tool-paths.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/glib-3-fix-tool-paths.patch	Sun May 16 16:24:45 2010 +0200
@@ -0,0 +1,19 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+diff -r ed58be46e216 glib-2.0.pc.in
+--- a/glib-2.0.pc.in	Sun May 16 16:07:16 2010 +0200
++++ b/glib-2.0.pc.in	Sun May 16 16:07:35 2010 +0200
+@@ -3,9 +3,9 @@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
+-glib_genmarshal=glib-genmarshal
+-gobject_query=gobject-query
+-glib_mkenums=glib-mkenums
++glib_genmarshal=@bindir@/glib-genmarshal
++gobject_query=@bindir@/gobject-query
++glib_mkenums=@bindir@/glib-mkenums
+ 
+ Name: GLib
+ Description: C Utility Library