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



commit 8f865438c4c9125fb379554cd0b8fdd181a7f5b4
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Thu Feb 22 13:29:56 2018 +0000

    Revert "core-deps-3.28: Allow building newer Cairo from Git"
    
    This reverts commit 138519f8327d8b405b8935254e680a99560b0a84.
    
    Broken XML will be the end of me.

 modulesets/gnome-suites-core-deps-3.28.modules |   16 ----------------
 modulesets/gnome-sysdeps-3.28.modules          |    2 +-
 2 files changed, 1 insertions(+), 17 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.28.modules b/modulesets/gnome-suites-core-deps-3.28.modules
index 05b5256..53599c7 100644
--- a/modulesets/gnome-suites-core-deps-3.28.modules
+++ b/modulesets/gnome-suites-core-deps-3.28.modules
@@ -131,22 +131,6 @@ 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"/>
-  </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 8440059..c0e8499 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.15.4"/>
+    <branch repo="system" version="1.14.0"/>
   </systemmodule>
 
   <systemmodule id="cargo">


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]