[jhbuild] 3.8: Use expat from distro packages



commit 6ef6cf7ee255bbae877f9e56866cd3a2fd9b6ead
Author: Javier JardÃn <jjardon gnome org>
Date:   Thu Jan 3 16:48:03 2013 +0000

    3.8: Use expat from distro packages

 modulesets/gnome-suites-core-deps-base-3.8.modules |   10 ----------
 modulesets/gnome-sysdeps-3.8.modules               |    8 ++++++++
 2 files changed, 8 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 290c418..b138b9e 100644
--- a/modulesets/gnome-suites-core-deps-base-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.8.modules
@@ -11,8 +11,6 @@
     href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
 <repository type="tarball" name="xmlsoft.org"
     href="ftp://xmlsoft.org/"/>
-<repository type="tarball" name="sourceforge.net"
-    href="http://downloads.sourceforge.net/"/>
 <repository type="tarball" name="0pointer.de"
     href="http://0pointer.de/lennart/projects/"/>
 <repository type="tarball" name="github.com/metabrainz"
@@ -24,14 +22,6 @@
 
 <!-- Please try to keep organized alphabetically -->
 
-  <autotools id="expat">
-    <branch repo="sourceforge.net"
-            module="expat/expat-2.1.0.tar.gz"
-            version="2.1.0"
-            hash="sha256:823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86"
-            size="562616"/>
-  </autotools>
-
   <repository type="tarball" name="icon-theme.freedesktop.org"
 	  href="http://icon-theme.freedesktop.org/releases/"/>
   <autotools id="hicolor-icon-theme" supports-non-srcdir-builds="no"
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index 0f127bf..ddbf12e 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -119,6 +119,14 @@
     <branch repo="system" version="0"/>
   </systemmodule>
 
+  <systemmodule id="expat">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="c_include"
+           name="expat.h"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="file">
     <branch repo="system"/>
     <systemdependencies>



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