[gtk-osx] Update Cairo to 1.14 and add dependencies

[John Ralls <jralls src gnome org>]

commit 9ef4d8dfb03bfedc49d9173c5705aaf05a95f338
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Nov 20 22:05:43 2014 -0800

    Update Cairo to 1.14 and add dependencies
    
    Cairo should have required dependencies on fontconfig and freetype2 now,
    since they are required for librsvg's SVG pixbuf loader. SVGs are used
    extensively in GTK themes nowadays for symbolic icons, so this shouldn't
    be optional any more.

 modulesets-stable/gtk-osx.modules   |   11 ++++++-----
 modulesets-unstable/gtk-osx.modules |   10 +++++-----
 modulesets/gtk-osx.modules          |   10 ++++++----
 3 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 56b8e66..cf2089e 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -199,19 +199,20 @@
     </after>
   </autotools>
 
+  <!-- enable-fc and enable-ft required for librsvg's pixbuf loader -->
   <autotools id="cairo"  autogen-sh="configure"
-             autogenargs="--enable-pdf --enable-quartz --enable-xlib=no --without-x">
-    <branch module="cairo-1.12.16.tar.xz"  version="1.12.16"
+             autogenargs="--enable-pdf --enable-quartz --enable-ft --enable-fc --disable-xlib --without-x">
+    <branch module="cairo-1.14.0.tar.xz"  version="1.14.0"
             repo="cairographics"
-            hash="sha1:4f6e337d5d3edd7ea79d1426f575331552b003ec">
+            hash="sha1:53cf589b983412ea7f78feee2e1ba9cea6e3ebae">
     </branch>
     <dependencies>
       <dep package="pixman"/>
+      <dep package="fontconfig"/>
+      <dep package="freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="fontconfig"/>
-      <dep package="freetype"/>
     </after>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 725dc26..14ee130 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -170,17 +170,17 @@
     </after>
   </autotools>
 
-  <autotools id="cairo" autogenargs="--enable-pdf --enable-quartz --enable-xlib=no --without-x">
+  <!-- enable-fc and enable-ft required for librsvg's pixbuf loader -->
+  <autotools id="cairo"
+             autogenargs="--enable-pdf --enable-quartz --enable-fc --enable-ft --disable-xlib --without-x">
     <branch repo="freedesktop" module="cairo" />
     <dependencies>
       <dep package="pixman"/>
+      <dep package="fontconfig"/>
+      <dep package="freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="fontconfig"/>
-      <dep package="freetype"/>
-      <dep package='glib'/>
-      <dep package="icu"/>
     </after>
   </autotools>
 
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index c013c01..243fbf2 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -166,15 +166,17 @@
     </after>
   </autotools>
 
-  <autotools id="cairo" autogenargs="--enable-pdf --enable-quartz --enable-xlib=no --without-x">
-    <branch repo="cairographics" module="cairo" revision="1.12"/>
+  <!-- enable-fc and enable-ft required for librsvg's pixbuf loader -->
+  <autotools id="cairo"
+             autogenargs="--enable-pdf --enable-quartz --enable-fc --enable-ft --disable-xlib --without-x">
+    <branch repo="cairographics" module="cairo" revision="1.14"/>
     <dependencies>
       <dep package="pixman"/>
+      <dep package="fontconfig"/>
+      <dep package="freetype"/>
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="fontconfig"/>
-      <dep package="freetype"/>
     </after>
   </autotools>