[gtk-osx-devel] [PATCH 1/3] Fix glib build when using the native OSX iconv

[Christophe Fergeau <cfergeau redhat com>]

https://bugzilla.gnome.org/show_bug.cgi?id=529806
---
 modulesets-stable/gtk-osx.modules |  4 +++-
 patches/glib-iconv.patch          | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 patches/glib-iconv.patch

diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 13b6ad0..9d84d6e 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -66,7 +66,9 @@
 
   <autotools id="glib" autogen-sh="configure">
     <branch module="glib/2.28/glib-2.28.8.tar.bz2"  version="2.28.8"
-            hash="sha256:222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f"/>
+            hash="sha256:222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/glib-iconv.patch"; strip="1"/>
+    </branch>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="gtk-doc"/>
diff --git a/patches/glib-iconv.patch b/patches/glib-iconv.patch
new file mode 100644
index 0000000..945bc42
--- /dev/null
+++ b/patches/glib-iconv.patch
@@ -0,0 +1,13 @@
+diff --git a/glib/gconvert.c b/glib/gconvert.c
+index b363bca..5d13465 100644
+--- a/glib/gconvert.c
++++ b/glib/gconvert.c
+@@ -61,7 +61,7 @@
+ #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)
++#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !defined (__APPLE_CC__) && !defined (__LP_64__)
+ #error GNU libiconv not in use but included iconv.h is from libiconv
+ #endif
+ 
-- 
1.7.11.2