[jhbuild] 3.8: Use libxml2 from distro packages

[Javier JardÃn <jjardon src gnome org>]

commit 75712ccdad483affa23a939b4a6ed9f6adf6191b
Author: Javier JardÃn <jjardon gnome org>
Date:   Thu Jan 3 18:56:58 2013 +0000

    3.8: Use libxml2 from distro packages

 modulesets/gnome-suites-core-deps-base-3.8.modules |   13 -------------
 modulesets/gnome-sysdeps-3.8.modules               |   11 ++++++-----
 2 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-base-3.8.modules b/modulesets/gnome-suites-core-deps-base-3.8.modules
index ef17ff1..085e833 100644
--- a/modulesets/gnome-suites-core-deps-base-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.8.modules
@@ -9,8 +9,6 @@
 <!-- tarball repos -->
 <repository type="tarball" name="iso-codes"
     href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
-<repository type="tarball" name="xmlsoft.org"
-    href="ftp://xmlsoft.org/"/>
 <repository type="tarball" name="0pointer.de"
     href="http://0pointer.de/lennart/projects/"/>
 <repository type="tarball" name="github.com/metabrainz"
@@ -75,17 +73,6 @@
     </dependencies>
   </cmake>
 
-  <autotools id="libxml2">
-    <pkg-config>libxml-2.0.pc</pkg-config>
-    <branch module="libxml2/libxml2-2.8.0.tar.gz"
-            repo="xmlsoft.org" version="2.8.0"
-            hash="sha256:f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a"
-            size="4915203"/>
-    <dependencies>
-      <dep package="zlib"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="sound-theme-freedesktop" version="0.8">
     <branch repo="people.freedesktop.org"
             module="~mccann/dist/sound-theme-freedesktop-0.8.tar.bz2"
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index c191472..2650292 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -456,6 +456,12 @@
             version="5.2.1"/>
   </systemmodule>
 
+  <systemmodule id="libxml2">
+    <pkg-config>libxml-2.0.pc</pkg-config>
+    <branch repo="system"
+            version="2.7.8"/>
+  </systemmodule>
+
   <systemmodule id="libxslt">
     <pkg-config>libxslt.pc</pkg-config>
     <branch repo="system"
@@ -670,9 +676,4 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="zlib">
-    <pkg-config>zlib.pc</pkg-config>
-    <branch repo="system" version="1.0"/>
-  </systemmodule>
-
 </moduleset>