From: ellson <devnull@localhost>
Date: Wed, 12 Jan 2011 21:26:19 +0000 (+0000)
Subject: fixing leopard prebuild to work as before - am unable to upgrade glib
X-Git-Tag: LAST_LIBGRAPH~32^2~1104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abe07dba60d706efb9629811bfbb44f0191d9cc8;p=graphviz

fixing leopard prebuild to work as before - am unable to upgrade glib
---

diff --git a/macosx/prebuild/Makefile.leopard b/macosx/prebuild/Makefile.leopard
index 19e5cc16d..2799fef57 100644
--- a/macosx/prebuild/Makefile.leopard
+++ b/macosx/prebuild/Makefile.leopard
@@ -432,7 +432,7 @@ $(GLIB_DIR)/configure: | $(GLIB_DIR).tar.gz
 	@echo
 	@echo CONFIGURING GLIB...
 	@echo
-	$(TAR) xzf $| && (cd $(GLIB_DIR); patch -p1 <../glib.patch)
+	$(TAR) xzf $| && (cd $(GLIB_DIR); patch -p1 <../glib.leopard.patch)
 	
 $(GLIB_DIR).tar.gz:
 	@echo
diff --git a/macosx/prebuild/glib.leopard.patch b/macosx/prebuild/glib.leopard.patch
new file mode 100644
index 000000000..7de40610f
--- /dev/null
+++ b/macosx/prebuild/glib.leopard.patch
@@ -0,0 +1,18 @@
+diff -ru glib-2.16.3/glib/gconvert.c glib-2.16.3.patched/glib/gconvert.c
+--- glib-2.16.3/glib/gconvert.c	2008-04-08 11:47:29.000000000 +0800
++++ glib-2.16.3.patched/glib/gconvert.c	2008-04-24 14:41:44.000000000 +0800
+@@ -48,12 +48,14 @@
+ 
+ #include "glibintl.h"
+ 
++#if !defined(__APPLE_CC__) || !defined(__LP64__)
+ #if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H)
+ #error GNU libiconv in use but included iconv.h not from libiconv
+ #endif
+ #if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
+ #error GNU libiconv not in use but included iconv.h is from libiconv
+ #endif
++#endif
+ 
+ #include "galias.h"
+