[gtk-osx] Patch Cairo for llvm-gcc-4.2

[John Ralls <jralls src gnome org>]

commit 8bc10deb89e640247b500c683f9517374989420f
Author: John Ralls <jralls ceridwen us>
Date:   Sun Jan 8 13:46:15 2012 -0800

    Patch Cairo for llvm-gcc-4.2
    
    llvm chokes on the -flto flag at link time
    
    See https://bugs.freedesktop.org/show_bug.cgi?id=44584

 modulesets-stable/gtk-osx.modules      |    6 +++++-
 patches/Cairo-44584-llvm-no-flto.patch |   25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 67d4385..6e7a0fb 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -250,7 +250,11 @@
              autogenargs="--enable-pdf --enable-quartz --enable-xlib=no --without-x">
     <branch module="cairo-1.10.2.tar.gz"  version="1.10.2"
             repo="cairographics"
-            hash="sha1:ccce5ae03f99c505db97c286a0c9a90a926d3c6e"/>
+            hash="sha1:ccce5ae03f99c505db97c286a0c9a90a926d3c6e">
+      <patches>
+        <patch  file="http://git.gnome.org/browse/gtk-osx/plain/patches/Cairo-44584-llvm-no-flto.patch"/>
+      </patches>
+    </branch>
     <dependencies>
       <dep package="pixman"/>
     </dependencies>
diff --git a/patches/Cairo-44584-llvm-no-flto.patch b/patches/Cairo-44584-llvm-no-flto.patch
new file mode 100644
index 0000000..e756840
--- /dev/null
+++ b/patches/Cairo-44584-llvm-no-flto.patch
@@ -0,0 +1,25 @@
+diff -c /Users/john/Documents/Lion/Gnucash-Build/Gnucash-svn/src/cairo-1.10.2/configure\~ /Users/john/Documents/Lion/Gnucash-Build/Gnucash-svn/src/cairo-1.10.2/configure
+*** a/configure	Sat Dec 25 06:22:57 2010
+--- b/configure	Sun Jan  8 11:11:05 2012
+***************
+*** 17236,17242 ****
+  MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
+  			-erroff=E_ENUM_TYPE_MISMATCH_OP"
+  
+! MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
+  
+  MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
+  
+--- 17236,17245 ----
+  MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
+  			-erroff=E_ENUM_TYPE_MISMATCH_OP"
+  
+! MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
+! if [ $CC != "llvm-gcc-4.2"]; then
+!   MAYBE_WARN="$MAYBE_WARN -flto"
+! fi
+  
+  MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
+  
+
+Diff finished.  Sun Jan  8 11:12:32 2012