[gtk-osx] Work around libunistring compilation issue with clang

[John Ralls <jralls src gnome org>]

commit b1b22c738aaad4564fc5c081b90aa6833dd3d984
Author: John Ralls <jralls ceridwen us>
Date:   Mon Feb 24 13:29:50 2014 -0800

    Work around libunistring compilation issue with clang

 modulesets-stable/gtk-osx-random.modules |    4 +++-
 patches/libunistring-clang.patch         |   15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index dcd33d2..92e5156 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -384,7 +384,9 @@ Libglade itself is deprecated. This is the last release. -->
 
   <autotools id="libunistring" autogen-sh="configure">
     <branch repo="ftp.gnu.org" module="libunistring/libunistring-0.9.3.tar.gz"
-           version="0.9.3"/>
+           version="0.9.3">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/libunistring-clang.patch"; strip="1"/>
+    </branch>
   </autotools>
 
   <autotools id="bdw-gc" autogen-sh="configure">
diff --git a/patches/libunistring-clang.patch b/patches/libunistring-clang.patch
new file mode 100644
index 0000000..90f1dad
--- /dev/null
+++ b/patches/libunistring-clang.patch
@@ -0,0 +1,15 @@
+--- a/lib/stdint.mini.h        2009-04-10 13:28:44.000000000 -0700
++++ b/lib/stdint.mini.h        2014-02-14 21:20:10.000000000 -0800
+@@ -119,10 +119,11 @@
+ #define uint32_t unistring_uint32_t
+
+ /* Avoid collision with Solaris 2.5.1 <pthread.h> etc.  */
++#ifndef __clang__
+ #define _UINT8_T
+ #define _UINT32_T
+ #define _UINT64_T
+-
++#endif
+
+ #endif /* _UNISTRING_STDINT_H */
+ #endif /* !defined _UNISTRING_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */