[jhbuild] 3.8: Use cairomm from distro packages



commit 7bbf1e789c025b04ef249e0f31a364664c2bfbb8
Author: Javier JardÃn <jjardon gnome org>
Date:   Sun Dec 9 23:43:26 2012 +0900

    3.8: Use cairomm from distro packages

 modulesets/gnome-suites-core-deps-base-3.8.modules |   12 ------------
 modulesets/gnome-sysdeps-3.8.modules               |    6 ++++++
 2 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-base-3.8.modules b/modulesets/gnome-suites-core-deps-base-3.8.modules
index 77f5060..148be2f 100644
--- a/modulesets/gnome-suites-core-deps-base-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.8.modules
@@ -44,18 +44,6 @@
 
 <!-- Please try to keep organized alphabetically -->
 
-  <autotools id="cairomm" autogen-sh="configure">
-    <branch module="releases/cairomm-1.10.0.tar.gz" version="1.10.0"
-            repo="cairo.org"
-            hash="sha256:068d96c43eae7b0a3d98648cbfc6fbd16acc385858e9ba6d37b5a47e4dba398f"
-            size="1089577">
-    </branch>
-    <dependencies>
-       <dep package="cairo"/>
-       <dep package="libsigc++2"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="dbus-glib">
     <pkg-config>dbus-glib-1.pc</pkg-config>
     <branch module="dbus-glib/dbus-glib-0.94.tar.gz" version="0.94"
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index 2eb3585..9d079df 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -55,6 +55,12 @@
             version="1.10.2"/>
   </systemmodule>
 
+  <systemmodule id="cairomm">
+    <pkg-config>cairomm-1.0.pc</pkg-config>
+    <branch repo="system"
+            version="1.8.4"/>
+  </systemmodule>
+
   <systemmodule id="cracklib">
     <branch repo="system"/>
     <systemdependencies>



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