[jhbuild] core-deps-3.28: Allow building newer Cairo from Git

[Emmanuele Bassi <ebassi src gnome org>]

commit 60bcf790da340c60a843aed0f2ae4ed6dc44c9c7
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Thu Feb 22 13:30:16 2018 +0000

    core-deps-3.28: Allow building newer Cairo from Git
    
    We should check for a system dependency capable of satisfying the
    requirement for the latest API, but if that's not available, just
    build Cairo from Git.

 modulesets/gnome-suites-core-deps-3.28.modules |   17 +++++++++++++++++
 modulesets/gnome-sysdeps-3.28.modules          |    2 +-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.28.modules b/modulesets/gnome-suites-core-deps-3.28.modules
index 53599c7..5f8ef00 100644
--- a/modulesets/gnome-suites-core-deps-3.28.modules
+++ b/modulesets/gnome-suites-core-deps-3.28.modules
@@ -131,6 +131,23 @@ the module and we will just change it to use a tarball anyway.
     </branch>
   </cmake>
 
+  <autotools id="cairo">
+    <branch repo="git.freedesktop.org" module="cairo"/>
+    <dependencies>
+      <if condition-set="linux">
+        <dep package="fontconfig"/>
+        <dep package="freetype2"/>
+        <dep package="gl"/>
+        <dep package="libXext"/>
+        <dep package="libXrender"/>
+        <dep package="x11"/>
+      </if>
+      <dep package="pixman"/>
+      <dep package="libpng"/>
+      <dep package="zlib"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="cairomm-1.0" autogen-sh="configure">
     <branch module="releases/cairomm-${version}.tar.gz"
             version="1.13.1"
diff --git a/modulesets/gnome-sysdeps-3.28.modules b/modulesets/gnome-sysdeps-3.28.modules
index c0e8499..8440059 100644
--- a/modulesets/gnome-sysdeps-3.28.modules
+++ b/modulesets/gnome-sysdeps-3.28.modules
@@ -63,7 +63,7 @@
 
   <systemmodule id="cairo">
     <pkg-config>cairo.pc</pkg-config>
-    <branch repo="system" version="1.14.0"/>
+    <branch repo="system" version="1.15.4"/>
   </systemmodule>
 
   <systemmodule id="cargo">