[jhbuild] 3.10: cairo 1.12.10 needed by pangocairo, moved to -core-deps-3.10

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

commit c0aebe3eebc199ff23665e7db536281bf3453e56
Author: Germán Poo-Caamaño <gpoo gnome org>
Date:   Thu Jun 20 09:52:38 2013 -0700

    3.10: cairo 1.12.10 needed by pangocairo, moved to -core-deps-3.10

 modulesets/gnome-suites-core-deps-3.10.modules |   16 ++++++++++++++++
 modulesets/gnome-sysdeps-3.10.modules          |    6 ------
 2 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.10.modules b/modulesets/gnome-suites-core-deps-3.10.modules
index 97388ab..49f3863 100644
--- a/modulesets/gnome-suites-core-deps-3.10.modules
+++ b/modulesets/gnome-suites-core-deps-3.10.modules
@@ -42,6 +42,8 @@
     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"
@@ -77,6 +79,20 @@
 
 <!-- Build dependencies of gnome-suites-core -->
 
+  <autotools id="cairo" autogenargs="--enable-xlib">
+    <pkg-config>cairo.pc</pkg-config>
+    <branch module="releases/cairo-${version}.tar.xz"
+            version="1.12.14"
+            repo="cairo.org"
+            hash="sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855">
+    </branch>
+    <dependencies>
+      <dep package="fontconfig"/>
+      <dep package="gtk-doc"/>
+      <dep package="pixman"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="geoclue">
     <branch repo="git.freedesktop.org"/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.10.modules b/modulesets/gnome-sysdeps-3.10.modules
index 6d5bae3..f65c886 100644
--- a/modulesets/gnome-sysdeps-3.10.modules
+++ b/modulesets/gnome-sysdeps-3.10.modules
@@ -36,12 +36,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="cairo">
-    <pkg-config>cairo.pc</pkg-config>
-    <branch repo="system"
-            version="1.10.2"/>
-  </systemmodule>
-
   <systemmodule id="cairomm">
     <pkg-config>cairomm-1.0.pc</pkg-config>
     <branch repo="system"