[jhbuild] 3.8: Use py3cairo from distro packages



commit 196bdbadd797ebf3a373dbec3b1adc43465f1178
Author: Javier JardÃn <jjardon gnome org>
Date:   Tue Dec 11 02:41:02 2012 +0900

    3.8: Use py3cairo 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 430d2d7..af47aef 100644
--- a/modulesets/gnome-suites-core-deps-base-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.8.modules
@@ -25,8 +25,6 @@
     href="http://0pointer.de/lennart/projects/"/>
 <repository type="tarball" name="github.com/metabrainz"
     href="https://github.com/downloads/metabrainz/"/>
-<repository type="tarball" name="cairo.org"
-    href="http://cairographics.org/"/>
 <repository type="tarball" name="people.freedesktop.org"
     href="http://people.freedesktop.org/"/>
 <repository type="tarball" name="complang.org"
@@ -161,16 +159,6 @@
     </dependencies>
   </autotools>
 
-  <waf id="py3cairo" python-command="python3">
-    <pkg-config>py3cairo.pc</pkg-config>
-    <branch module="releases/pycairo-1.10.0.tar.bz2" version="1.10.0" repo="cairo.org"
-            hash="sha256:9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be"
-            size="246556"/>
-    <dependencies>
-      <dep package="cairo"/>
-    </dependencies>
-  </waf>
-
   <autotools id="ragel">
     <branch repo="complang.org"
             module="ragel/ragel-6.7.tar.gz"
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index f3db7a5..2bd2669 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -456,6 +456,12 @@
             version="1.8.2"/>
   </systemmodule>
 
+  <systemmodule id="py3cairo">
+    <pkg-config>py3cairo.pc</pkg-config>
+    <branch repo="system"
+            version="1.10.0"/>
+  </systemmodule>
+
   <systemmodule id="python2-devel">
     <pkg-config>python.pc</pkg-config>
     <branch repo="system" version="2.5"/>



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