[glade] Bundles: Changed cairo exceptions.

[Tristan Van Berkom <tvb src gnome org>]

commit 5998fb57256f1c1ab79e63f8117af7147dc3c855
Author: Tristan Van Berkom <tristan upstairslabs com>
Date:   Tue Dec 17 17:34:15 2013 +0900

    Bundles: Changed cairo exceptions.
    
    Cairo was erroring during the build because it used _FORTIFY_SOURCE=2,
    instead of disabling the tests and disabling threads, we just patch
    cairo's makefiles to disable the _FORTIFY_SOURCE override.

 build/linux/jhbuildrc                              |    4 ----
 build/linux/modulesets/bundle.modules              |    2 +-
 .../patches/cairo-avoid-fortify-source.patch       |   15 +++++++++++++++
 .../modulesets/patches/cairo-avoid-longjmp.patch   |   16 ----------------
 4 files changed, 16 insertions(+), 21 deletions(-)
---
diff --git a/build/linux/jhbuildrc b/build/linux/jhbuildrc
index af290de..9a226f4 100644
--- a/build/linux/jhbuildrc
+++ b/build/linux/jhbuildrc
@@ -35,10 +35,6 @@ build_cflags = ''
 # available in recent versions of glibc
 build_cflags += ' -U_FORTIFY_SOURCE'
 
-# Special case for cairo compilation, with libcwrap.h applied cairo
-# is unable to do it's mutexes properly
-build_cflags += ' -DCAIRO_NO_MUTEX=1'
-
 # Include the libcwrap.h before anything else for every source, this
 # ensures we are targetting the right version of glibc
 build_cflags += ' -include ' + os.getenv('BUNDLE_DIR') + '/libcwrap.h'
diff --git a/build/linux/modulesets/bundle.modules b/build/linux/modulesets/bundle.modules
index beaed79..93e9bfd 100644
--- a/build/linux/modulesets/bundle.modules
+++ b/build/linux/modulesets/bundle.modules
@@ -146,7 +146,7 @@
     <branch module="cairo-1.12.16.tar.xz"  version="1.12.16"
             repo="cairographics"
             hash="sha1:4f6e337d5d3edd7ea79d1426f575331552b003ec">
-      <patch file="cairo-avoid-longjmp.patch" strip="1" />
+      <patch file="cairo-avoid-fortify-source.patch" strip="1" />
     </branch>
     <dependencies>
       <dep package="pixman"/>
diff --git a/build/linux/modulesets/patches/cairo-avoid-fortify-source.patch 
b/build/linux/modulesets/patches/cairo-avoid-fortify-source.patch
new file mode 100644
index 0000000..c133ad0
--- /dev/null
+++ b/build/linux/modulesets/patches/cairo-avoid-fortify-source.patch
@@ -0,0 +1,15 @@
+diff -up cairo-1.12.16-orig/build/configure.ac.warnings cairo-1.12.16/build/configure.ac.warnings
+--- cairo-1.12.16-orig/build/configure.ac.warnings     2013-08-27 00:07:21.000000000 +0900
++++ cairo-1.12.16/build/configure.ac.warnings  2013-12-17 17:30:15.422665322 +0900
+@@ -49,7 +49,10 @@ AC_TRY_LINK([],[
+ MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
+ 
+ dnl Also to turn various gcc/glibc-specific preprocessor checks
+-MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
++dnl
++dnl XXX Disable this FORTIFY enableing for the purpose of targetting
++dnl old versions of glibc
++dnl MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
+ 
+ # invalidate cached value if MAYBE_WARN has changed
+ if test "x$cairo_cv_warn_maybe" != "x$MAYBE_WARN"; then