[gtk-osx] Carry ICU in all modulesets, updated to latest version, and patched for clang.

[John Ralls <jralls src gnome org>]

commit 9bf46919a3b2e77467d0abdef7c1f97b479044c8
Author: John Ralls <jralls ceridwen us>
Date:   Tue Feb 25 15:31:47 2014 -0800

    Carry ICU in all modulesets, updated to latest version, and patched for clang.

 modulesets-stable/gtk-osx-unsupported.modules   |    8 ++++++++
 modulesets-unstable/gtk-osx-unsupported.modules |   11 +++++++----
 modulesets/gtk-osx-unsupported.modules          |    8 ++++++++
 patches/icu-clang.patch                         |   19 +++++++++++++++++++
 4 files changed, 42 insertions(+), 4 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 5660648..4a63454 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -179,6 +179,14 @@
     </after>
   </autotools>
 
+  <autotools id='icu' autogen-sh='source/configure'
+            makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
+    <branch repo='icu' version='50.1.2' checkoutdir='icu'
+           module='icu4c/50.1.2/icu4c-50_1_2-src.tgz'>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/icu-clang.patch"; strip="1"/>
+    </branch>
+  </autotools>
+
   <autotools id="WebKit-svn"
             autogenargs="--with-target=quartz --disable-video --with-font-backend=pango --with-gtk=3.0">
     <branch repo="svn.webkit.org" module="webkit/trunk" checkoutdir="WebKit"/>
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index f53ccab..5841e91 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -175,12 +175,15 @@
     </dependencies>
   </autotools>
 
-  <autotools id="icu" autogen-sh="source/configure">
-    <branch module="icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz" version="4.8.1.1"
-           repo="icu" checkoutdir="icu"/>
+  <autotools id='icu' autogen-sh='source/configure'
+            makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
+    <branch repo='icu' version='50.1.2' checkoutdir='icu'
+           module='icu4c/50.1.2/icu4c-50_1_2-src.tgz'>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/icu-clang.patch"; strip="1"/>
+    </branch>
   </autotools>
 
-  <autotools id="WebKit" 
+  <autotools id="WebKit"
             autogenargs="--enable-quartz-target --disable-x11-target --disable-video 
--with-font-backend=pango --with-gtk=2.0 --disable-geolocation --disable-webkit2 --disable-credential-storage 
--disable-svg-fonts --disable-web-audio --disable-fast-malloc --disable-gtk-doc-html">
     <!--branch repo="svn.webkit.org" module="webkit/trunk" checkoutdir="WebKit"/-->
     <branch repo="git.webkit.org" module="WebKit"/>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 7f45f9e..d8dfd01 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -144,6 +144,14 @@
            module="libtasn1/libtasn1-2.14.tar.gz"/>
   </autotools>
 
+  <autotools id='icu' autogen-sh='source/configure'
+            makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
+    <branch repo='icu' version='50.1.2' checkoutdir='icu'
+           module='icu4c/50.1.2/icu4c-50_1_2-src.tgz'>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/icu-clang.patch"; strip="1"/>
+    </branch>
+  </autotools>
+
   <autotools id="WebKit"
             autogenargs="--with-target=quartz --disable-video">
     <!-- Tags are for Safari versions, not much help to us. -->
diff --git a/patches/icu-clang.patch b/patches/icu-clang.patch
new file mode 100644
index 0000000..4e5d78f
--- /dev/null
+++ b/patches/icu-clang.patch
@@ -0,0 +1,19 @@
+--- a/source/common/umutex.h   2011-10-18 16:12:36.000000000 -0700
++++ b/source/common/umutex.h   2014-02-16 14:56:01.000000000 -0800
+@@ -28,12 +28,16 @@
+ #if defined(U_DARWIN)
+ #if defined(__STRICT_ANSI__)
+ #define UPRV_REMAP_INLINE
++#if !defined(__clang_major__) || (defined(__clang_major__) && __clang_major__ < 5)
+ #define inline
+ #endif
++#endif
+ #include <libkern/OSAtomic.h>
+ #define USE_MAC_OS_ATOMIC_INCREMENT 1
+ #if defined(UPRV_REMAP_INLINE)
++#if !defined(__clang_major__) || (defined(__clang_major__) && __clang_major__ < 5)
+ #undef inline
++#endif
+ #undef UPRV_REMAP_INLINE
+ #endif
+ #endif