view src/glib-1-fixes.patch @ 2615:7e5aaa010a02

update package glib
author Hans Petter Jansson <hpj@cl.no>
date Mon, 04 Jun 2012 18:02:11 +0200
parents 99516e73b368
children 54ebb3d54d97
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

Contains ad hoc patches for cross building.

From 46d0d473e6fb32c5204d063cad5f5073d2a139a5 Mon Sep 17 00:00:00 2001
From: MXE
Date: Thu, 23 Sep 2010 21:41:51 +0200
Subject: [PATCH 2/5] optional gettext


diff --git a/configure.ac b/configure.ac
index 2e541d2..18c2dea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -464,8 +464,8 @@ 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 
+  AC_MSG_WARN([
+*** You should have either have gettext support in your C library, or use the
 *** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
 ])
 fi
diff --git a/glib/gi18n.h b/glib/gi18n.h
index c710046..269bfdf 100644
--- a/glib/gi18n.h
+++ b/glib/gi18n.h
@@ -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)
-- 
1.7.1


From 3473b5183b2e59d247cd1db053efc6c9ecaf2aab Mon Sep 17 00:00:00 2001
From: MXE
Date: Thu, 23 Sep 2010 21:42:46 +0200
Subject: [PATCH 3/5] fix tool paths


diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
index 3d1ac12..58e1ecf 100644
--- a/glib-2.0.pc.in
+++ b/glib-2.0.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 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
-- 
1.7.1