contribs: fixed issues when compiling glib for Darwin in 64bit mode

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d220dcd1c440338567ab6a2855d60d66e8c2dc7e..3e9b15312ff9d16370dc0e8b512849bf2919e122 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1957,6 +1957,9 @@ glib-$(GLIB_VERSION).tar.bz2:
 glib: glib-$(GLIB_VERSION).tar.bz2
        $(EXTRACT_BZ2)
        (cd $@; patch -p0 < ../Patches/glib-remove-gtkdoc.patch)
+ifdef HAVE_DARWIN_10
+       (cd $@; patch -p0 < ../Patches/glib-Darwin64.patch)
+endif
 
 .glib: glib
        (cd $<; sh autogen.sh --prefix=$(PREFIX) --host=$(HOST) && make && make install)

diff --git a/extras/contrib/src/Patches/glib-Darwin64.patch b/extras/contrib/src/Patches/glib-Darwin64.patch
new file mode 100644 (file)
index 0000000..aa3314e
--- /dev/null
+++ b/extras/contrib/src/Patches/glib-Darwin64.patch
@@ -0,0 +1,12 @@
+--- glib/gconvert.c    2009-06-27 05:18:06.000000000 +0200
++++ glib/gconvert.c    2009-07-18 02:09:30.000000000 +0200
+@@ -51,9 +51,6 @@
+ #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
+ 
+ #include "galias.h"
+