[jhbuild] 3.20: Make cairo a sysdep

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 8982a0b16f5ac755d4bbce43b516df44d1a38ca4
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Tue Oct 6 20:04:24 2015 -0500

    3.20: Make cairo a sysdep
    
    I'm a bit hesitant because GTK+ requires a cairo that is only one year
    old, and this dependency is bound to increase in the future. But we have
    to break the circular dependency gobject-introspection -> cairo ->
    librsvg -> gdk-pixbuf -> gobject-introspection or new users will never
    be able to build anything, and the best way I see to do that is to take
    cairo out of the equation. If this doesn't work we might need to explore
    building two separate cairos, one as a bootstrap without SVG support.

 modulesets/gnome-suites-core-deps-3.20.modules |   17 -----------------
 modulesets/gnome-sysdeps-3.20.modules          |    5 +++++
 2 files changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index 4441738..6d4e3af 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -87,23 +87,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="cairo" autogenargs="--enable-gl">
-    <if condition-set="quartz">
-      <autogenargs value="--enable-quartz --disable-gl"/>
-    </if>
-    <branch repo="git.freedesktop.org">
-    </branch>
-    <dependencies>
-      <if condition-unset="quartz">
-        <dep package="fontconfig"/>
-        <dep package="gl"/>
-      </if>
-      <dep package="gtk-doc"/>
-      <dep package="librsvg"/>
-      <dep package="pixman"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="cairomm" autogen-sh="configure">
     <branch module="releases/cairomm-${version}.tar.gz"
             version="1.12.0"
diff --git a/modulesets/gnome-sysdeps-3.20.modules b/modulesets/gnome-sysdeps-3.20.modules
index c261d77..599ad00 100644
--- a/modulesets/gnome-sysdeps-3.20.modules
+++ b/modulesets/gnome-sysdeps-3.20.modules
@@ -48,6 +48,11 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="cairo">
+    <pkg-config>cairo.pc</pkg-config>
+    <branch repo="system" version="1.14.0"/>
+  </systemmodule>
+
   <systemmodule id="c++">
     <branch repo="system"/>
     <systemdependencies>