[jhbuild] 3.8: Use shared-mime-info from distro packages

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

commit 0306020db5db9d5398436c4c5e6bec81010969df
Author: Javier JardÃn <jjardon gnome org>
Date:   Thu Jan 3 16:53:13 2013 +0000

    3.8: Use shared-mime-info from distro packages

 modulesets/gnome-suites-core-deps-base-3.8.modules |   15 ---------------
 modulesets/gnome-sysdeps-3.8.modules               |    6 ++++++
 2 files changed, 6 insertions(+), 15 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-base-3.8.modules b/modulesets/gnome-suites-core-deps-base-3.8.modules
index b138b9e..ef17ff1 100644
--- a/modulesets/gnome-suites-core-deps-base-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.8.modules
@@ -86,21 +86,6 @@
     </dependencies>
   </autotools>
 
-  <!-- parallel builds broken due to: https://bugs.freedesktop.org/show_bug.cgi?id=46093 -->
-  <autotools id="shared-mime-info" supports-non-srcdir-builds="no"
-             autogenargs="--disable-default-make-check" supports-parallel-builds="no">
-    <branch repo="people.freedesktop.org"
-            module="~hadess/shared-mime-info-1.0.tar.xz"
-            version="1.0"
-            hash="sha256:d2e830e5aae213dd906e64495e9618cc4ef40d7b249e0971a190b04d5802ae8f"
-            size="496700"/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="libxml2"/>
-      <dep package="glib"/>
-    </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 ddbf12e..c191472 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -569,6 +569,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="shared-mime-info">
+    <pkg-config>shared-mime-info.pc</pkg-config>
+    <branch repo="system"
+            version="1.0"/>
+  </systemmodule>
+
   <systemmodule id="soundtouch">
     <pkg-config>soundtouch-1.4.pc</pkg-config>
     <branch repo="system" version="0"/>