[gtk-osx: 13/17] Rejigger cairo's dependencies to build cairoft and cairofc only when needed.

[John Ralls <jralls src gnome org>]

commit bb528f98d447ddb848ce0bf08539d7ce4c49b661
Author: John Ralls <jralls ceridwen us>
Date:   Thu Oct 29 10:57:00 2015 -0700

    Rejigger cairo's dependencies to build cairoft and cairofc only when needed.

 modulesets-stable/gtk-osx-themes.modules   |    1 +
 modulesets-stable/gtk-osx.modules          |    8 ++++++--
 modulesets-unstable/gtk-osx-themes.modules |    1 +
 modulesets-unstable/gtk-osx.modules        |   10 ++++++----
 modulesets/gtk-osx-themes.modules          |    1 +
 modulesets/gtk-osx.modules                 |   10 ++++++----
 6 files changed, 21 insertions(+), 10 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-themes.modules b/modulesets-stable/gtk-osx-themes.modules
index a480644..8884ac0 100644
--- a/modulesets-stable/gtk-osx-themes.modules
+++ b/modulesets-stable/gtk-osx-themes.modules
@@ -90,6 +90,7 @@
            hash="sha256:d14d7b3e25023ce34302022fd7c9b3a468629c94dff6c177874629686bfc71a7"/>
     <dependencies>
       <dep package="libcroco"/>
+      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 7a5340a..80f3fe8 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -225,9 +225,12 @@
     </after>
   </autotools>
 
-  <!-- enable-fc and enable-ft required for librsvg's pixbuf loader -->
+  <!-- Cairo will automatically enable freetype and fontconfig if
+       meta-gtk-osx-freetype is built, so packages which require
+       cairoft or cairofc should have meta-gtk-osx-freetype as a
+       dependency. -->
   <autotools id="cairo"  autogen-sh="configure"
-             autogenargs="--enable-pdf --enable-quartz --enable-ft --enable-fc --disable-xlib --without-x">
+             autogenargs="--enable-pdf --enable-quartz --disable-xlib --without-x">
     <branch module="cairo-1.14.0.tar.xz"  version="1.14.0"
             repo="cairographics"
             hash="sha1:53cf589b983412ea7f78feee2e1ba9cea6e3ebae">
@@ -237,6 +240,7 @@
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
+      <dep package="meta-gtk-osx-freetype"/>
     </after>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx-themes.modules b/modulesets-unstable/gtk-osx-themes.modules
index 2d6fd6b..b56b8af 100644
--- a/modulesets-unstable/gtk-osx-themes.modules
+++ b/modulesets-unstable/gtk-osx-themes.modules
@@ -78,6 +78,7 @@
     <branch module="librsvg"/>
     <dependencies>
       <dep package="libcroco"/>
+      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 94d56aa..e948c5b 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -183,17 +183,19 @@
     </after>
   </autotools>
 
-  <!-- enable-fc and enable-ft required for librsvg's pixbuf loader -->
+  <!-- Cairo will automatically enable freetype and fontconfig if
+       meta-gtk-osx-freetype is built, so packages which require
+       cairoft or cairofc should have meta-gtk-osx-freetype as a
+       dependency. -->
   <autotools id="cairo"
-             autogenargs="--enable-pdf --enable-quartz --enable-fc --enable-ft --disable-xlib --without-x">
+             autogenargs="--enable-pdf --enable-quartz --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="meta-gtk-osx-freetype"/>
     </after>
   </autotools>
 
diff --git a/modulesets/gtk-osx-themes.modules b/modulesets/gtk-osx-themes.modules
index 3bd756b..6a55581 100644
--- a/modulesets/gtk-osx-themes.modules
+++ b/modulesets/gtk-osx-themes.modules
@@ -78,6 +78,7 @@
     <branch module="librsvg"/>
     <dependencies>
       <dep package="libcroco"/>
+      <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index cd68d7c..733effd 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -184,17 +184,19 @@
     </after>
   </autotools>
 
-  <!-- enable-fc and enable-ft required for librsvg's pixbuf loader -->
+    <!-- Cairo will automatically enable freetype and fontconfig if
+       meta-gtk-osx-freetype is built, so packages which require
+       cairoft or cairofc should have meta-gtk-osx-freetype as a
+       dependency. -->
   <autotools id="cairo"
-             autogenargs="--enable-pdf --enable-quartz --enable-fc --enable-ft --disable-xlib --without-x">
+             autogenargs="--enable-pdf --enable-quartz --disable-xlib --without-x">
     <branch repo="freedesktop" 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="freetype-no-harfbuzz"/>
     </after>
   </autotools>