[jhbuild/desrt/master: 5/23] 3.16: tweak some deps on macos

[Ryan Lortie <desrt src gnome org>]

commit 9cad5f4522512b5974cfef556a327d064a50b841
Author: Ryan Lortie <desrt desrt ca>
Date:   Tue Dec 30 21:37:30 2014 -0500

    3.16: tweak some deps on macos
    
    Make some changes to dependencies on Mac OS.
    
     - when using quartz, we don't need fontconfig, freetype or harfbuzz
    
     - similarly, we won't need at-spi either
    
     - cairo GL support is currently broken on Mac OS, so disable it.
       See https://bugs.freedesktop.org/show_bug.cgi?id=87707
    
     - rework Gtk to enable backends (including quartz) according to
       condition flags
    
     - libtiff support is disabled in gdk-pixbuf just because I don't think
       that it's really important and it removes one extra dependency to
       bootstrap.  Ideally, we'd use quartz image loaders instead.
       See https://bugzilla.gnome.org/show_bug.cgi?id=720762
    
    https://bugzilla.gnome.org/show_bug.cgi?id=742134

 modulesets/gnome-suites-core-deps-3.16.modules |   34 +++++++++++++++++++-----
 1 files changed, 27 insertions(+), 7 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index 250e3fb..bc835ff 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -93,11 +93,16 @@
   <autotools id="cairo" autogenargs="--enable-gl">
     <branch repo="git.freedesktop.org">
     </branch>
+    <if condition-set="quartz">
+      <autogenargs value="--enable-quartz --disable-gl"/>
+    </if>
     <dependencies>
-      <dep package="fontconfig"/>
+      <if condition-unset="quartz">
+        <dep package="fontconfig"/>
+        <dep package="gl"/>
+      </if>
       <dep package="gtk-doc"/>
       <dep package="pixman"/>
-      <dep package="gl"/>
     </dependencies>
   </autotools>
 
@@ -379,6 +384,9 @@
   </autotools>
 
   <autotools id="gdk-pixbuf" autogenargs="--enable-installed-tests">
+    <if condition-set="macos">
+      <autogenargs value="--without-libtiff"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -408,13 +416,19 @@
     </after>
   </autotools>
 
-  <autotools id="gtk+" autogenargs="--enable-x11-backend --enable-broadway-backend --enable-installed-tests">
+  <autotools id="gtk+" autogenargs="--enable-broadway-backend --enable-installed-tests">
+    <if condition-set="x11">
+      <autogenargs value="--enable-x11-backend"/>
+    </if>
     <if condition-set="wayland">
       <autogenargs value="--enable-wayland-backend"/>
     </if>
     <if condition-set="mir">
       <autogenargs value="--enable-mir-backend"/>
     </if>
+    <if condition-set="quartz">
+      <autogenargs value="--enable-quartz-backend"/>
+    </if>
     <branch/>
     <dependencies>
       <dep package="atk"/>
@@ -424,8 +438,10 @@
       <dep package="gdk-pixbuf"/>
       <dep package="gtk-doc"/>
       <dep package="gobject-introspection"/>
-      <dep package="at-spi2-atk"/>
       <dep package="libepoxy"/>
+      <if condition-unset="quartz">
+        <dep package="at-spi2-atk"/>
+      </if>
       <if condition-set="wayland">
         <dep package="libxkbcommon"/>
         <dep package="wayland"/>
@@ -447,9 +463,13 @@
       <dep package="cairo"/>
       <dep package="gtk-doc"/>
       <dep package="gobject-introspection"/>
-      <dep package="harfbuzz"/>
-      <dep package="libXft"/>
-      <dep package="fontconfig"/>
+      <if condition-set="x11">
+        <dep package="libXft"/>
+      </if>
+      <if condition-unset="quartz">
+        <dep package="harfbuzz"/>
+        <dep package="fontconfig"/>
+      </if>
     </dependencies>
   </autotools>