[jhbuild] 3.8: Use cairo from distro packages



commit 445cb1163a10630bb64ce261acca97480329f592
Author: Javier JardÃn <jjardon gnome org>
Date:   Sun Dec 2 18:21:03 2012 +0900

    3.8: Use cairo from distro packages

 modulesets/gnome-suites-core-deps-base-3.8.modules |   14 --------------
 modulesets/gnome-sysdeps-3.8.modules               |    6 ++++++
 2 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-base-3.8.modules b/modulesets/gnome-suites-core-deps-base-3.8.modules
index d774202..4f9f9bc 100644
--- a/modulesets/gnome-suites-core-deps-base-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.8.modules
@@ -44,20 +44,6 @@
 
 <!-- Please try to keep organized alphabetically -->
 
-  <autotools id="cairo" autogenargs="--enable-xlib">
-    <pkg-config>cairo.pc</pkg-config>
-    <branch module="releases/cairo-1.10.2.tar.gz" version="1.10.2"
-            repo="cairo.org"
-            hash="sha256:32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41"
-            size="23558405">
-    </branch>
-    <dependencies>
-      <dep package="fontconfig"/>
-      <dep package="gtk-doc"/>
-      <dep package="pixman"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="cairomm" autogen-sh="configure">
     <branch module="releases/cairomm-1.10.0.tar.gz" version="1.10.0"
             repo="cairo.org"
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index 432bf10..43d3f29 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -37,6 +37,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="cairo">
+    <pkg-config>cairo.pc</pkg-config>
+    <branch repo="system"
+            version="1.10.2"/>
+  </systemmodule>
+
   <systemmodule id="cracklib">
     <branch repo="system"/>
     <systemdependencies>



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