[jhbuild] 3.8: Use fontcofig from distro package



commit 23afab2c61251aabd7fa7dff6546efe21545dba2
Author: Javier JardÃn <jjardon gnome org>
Date:   Sun Dec 2 17:13:38 2012 +0900

    3.8: Use fontcofig from distro package

 modulesets/gnome-suites-core-deps-base-3.8.modules |   10 ----------
 modulesets/gnome-sysdeps-3.8.modules               |    6 ++++++
 2 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-base-3.8.modules b/modulesets/gnome-suites-core-deps-base-3.8.modules
index 1fca20d..5471d8e 100644
--- a/modulesets/gnome-suites-core-deps-base-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.8.modules
@@ -122,16 +122,6 @@
             size="562616"/>
   </autotools>
 
-  <tarball id="fontconfig" version="2.8.0">
-    <pkg-config>fontconfig.pc</pkg-config>
-    <source href="http://www.fontconfig.org/release/fontconfig-2.8.0.tar.gz";
-            hash="sha256:fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"
-            size="1548409"/>
-    <dependencies>
-      <dep package="expat"/>
-    </dependencies>
-  </tarball>
-
   <autotools id="gnutls" version="2.12.8" autogenargs="--enable-guile=no --with-libgcrypt">
     <pkg-config>gnutls.pc</pkg-config>
     <branch module="gnutls/gnutls-2.12.8.tar.bz2" version="2.12.8"
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index d9346e3..9e8d85c 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -88,6 +88,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="fontconfig">
+    <pkg-config>fontconfig.pc</pkg-config>
+    <branch repo="system"
+            version="2.8.0"/>
+  </systemmodule>
+
   <systemmodule id="gc">
     <pkg-config>bdw-gc.pc</pkg-config>
     <branch repo="system"/>



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