[jhbuild] 3.12: Move cairo to -sysdeps

[Javier Jardón <jjardon src gnome org>]

commit b8d025397994b6f99f623f94015e15352b3949f6
Author: Javier Jardón <jjardon gnome org>
Date:   Thu Mar 13 16:43:57 2014 +0000

    3.12: Move cairo to -sysdeps
    
    cairo 1.12 is old enough and available at least in the main distros
    for long time (Debian Stable, Fedora 18, Ubuntu Quantal)

 modulesets/gnome-suites-core-deps-3.12.modules |   16 ----------------
 modulesets/gnome-sysdeps-3.12.modules          |    6 ++++++
 2 files changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.12.modules b/modulesets/gnome-suites-core-deps-3.12.modules
index d922a54..28cc35b 100644
--- a/modulesets/gnome-suites-core-deps-3.12.modules
+++ b/modulesets/gnome-suites-core-deps-3.12.modules
@@ -40,8 +40,6 @@
     href="http://freedesktop.org/software/"/>
 <repository type="tarball" name="people.freedesktop.org"
     href="http://people.freedesktop.org/"/>
-<repository type="tarball" name="cairo.org"
-    href="http://cairographics.org/"/>
 <repository type="tarball" name="icon-theme.freedesktop.org"
     href="http://icon-theme.freedesktop.org/releases/"/>
 <repository type="tarball" name="libopenraw.freedesktop.org"
@@ -102,20 +100,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="cairo" autogenargs="--enable-gl">
-    <pkg-config>cairo.pc</pkg-config>
-    <branch module="releases/cairo-${version}.tar.xz"
-            version="1.12.14"
-            repo="cairo.org"
-            hash="sha256:96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13">
-    </branch>
-    <dependencies>
-      <dep package="fontconfig"/>
-      <dep package="gtk-doc"/>
-      <dep package="pixman"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="geoclue">
     <if condition-unset="linux">
       <autogenargs value="--disable-3g-source --disable-modem-gps-source --disable-wifi-source"/>
diff --git a/modulesets/gnome-sysdeps-3.12.modules b/modulesets/gnome-sysdeps-3.12.modules
index 28254ce..f92bce9 100644
--- a/modulesets/gnome-sysdeps-3.12.modules
+++ b/modulesets/gnome-sysdeps-3.12.modules
@@ -42,6 +42,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="cairo">
+    <pkg-config>cairo.pc</pkg-config>
+    <branch repo="system"
+            version="1.12.2"/>
+  </systemmodule>
+
   <systemmodule id="cairomm">
     <pkg-config>cairomm-1.0.pc</pkg-config>
     <branch repo="system"