[jhbuild] 3.18: Build cairomm instead use -sysdeps

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

commit 61269736aed1826a0ad6d3a94c79ce3dc2341689
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Sep 29 20:38:26 2015 +0100

    3.18: Build cairomm instead use -sysdeps
    
    gtkmm depends on cairomm >= 1.12 and thats too new to be in
    -syspdeps
    
    Reported by Andreas Nilsson in
    https://bugzilla.gnome.org/show_bug.cgi?id=755779

 modulesets/gnome-suites-core-deps-3.18.modules |   14 ++++++++++++++
 modulesets/gnome-sysdeps-3.18.modules          |    6 ------
 2 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.18.modules b/modulesets/gnome-suites-core-deps-3.18.modules
index 1c684f6..f3e1553 100644
--- a/modulesets/gnome-suites-core-deps-3.18.modules
+++ b/modulesets/gnome-suites-core-deps-3.18.modules
@@ -26,6 +26,8 @@
     href="git://repo.or.cz/"/>
 
 <!-- tarball repos -->
+<repository type="tarball" name="cairo.org"
+    href="http://cairographics.org/"/>
 <repository type="tarball" name="iso-codes"
     href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
 <repository type="tarball" name="sourceforge.net"
@@ -101,6 +103,18 @@
     </dependencies>
   </autotools>
 
+  <autotools id="cairomm" autogen-sh="configure">
+    <branch module="releases/cairomm-${version}.tar.gz"
+            version="1.12.0"
+            repo="cairo.org"
+            hash="sha256:50435aec6fdd976934b791e808993160113ad19ca53a5634a9b64ccbe55874cc">
+     </branch>
+     <dependencies>
+        <dep package="cairo"/>
+        <dep package="libsigc++2"/>
+     </dependencies>
+  </autotools>
+
   <autotools id="gcab">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.18.modules b/modulesets/gnome-sysdeps-3.18.modules
index fa07d6f..c261d77 100644
--- a/modulesets/gnome-sysdeps-3.18.modules
+++ b/modulesets/gnome-sysdeps-3.18.modules
@@ -55,12 +55,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="cairomm">
-    <pkg-config>cairomm-1.0.pc</pkg-config>
-    <branch repo="system"
-            version="1.8.4"/>
-  </systemmodule>
-
   <systemmodule id="cc">
     <branch repo="system"/>
     <systemdependencies>