[jhbuild] 3.12: Build cairo from git

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

commit 4c8cbc851bac78fb91f3be79165f1902cb1c7a9d
Author: Javier Jardón <jjardon gnome org>
Date:   Sat Mar 22 19:02:42 2014 +0000

    3.12: Build cairo from git
    
    We need it for hdpi support.
    Also freebsd doesn't have 1.12.2 in their normal ports

 modulesets/gnome-suites-core-deps-3.12.modules |   10 ++++++++++
 modulesets/gnome-sysdeps-3.12.modules          |    6 ------
 2 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.12.modules b/modulesets/gnome-suites-core-deps-3.12.modules
index 62518ca..8285959 100644
--- a/modulesets/gnome-suites-core-deps-3.12.modules
+++ b/modulesets/gnome-suites-core-deps-3.12.modules
@@ -101,6 +101,16 @@
     </suggests>
   </autotools>
 
+  <autotools id="cairo" autogenargs="--enable-gl">
+    <branch repo="git.freedesktop.org">
+    </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 5aae0ed..d6092ec 100644
--- a/modulesets/gnome-sysdeps-3.12.modules
+++ b/modulesets/gnome-sysdeps-3.12.modules
@@ -42,12 +42,6 @@
     </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"