[jhbuild] 3.8: Use dbus-glib from distro packages



commit 1c33a4f417a04648525f9e1441e812971ec933f6
Author: Javier JardÃn <jjardon gnome org>
Date:   Tue Dec 11 02:11:46 2012 +0900

    3.8: Use dbus-glib from distro packages

 modulesets/gnome-suites-core-deps-base-3.8.modules |   16 ----------------
 modulesets/gnome-sysdeps-3.8.modules               |    6 ++++++
 2 files changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-base-3.8.modules b/modulesets/gnome-suites-core-deps-base-3.8.modules
index 827f1ef..29489f1 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="dbus"
-    href="http://dbus.freedesktop.org/releases/"/>
 <repository type="tarball" name="cairo.org"
     href="http://cairographics.org/"/>
 <repository type="tarball" name="people.freedesktop.org"
@@ -38,20 +36,6 @@
 
 <!-- Please try to keep organized alphabetically -->
 
-  <autotools id="dbus-glib">
-    <pkg-config>dbus-glib-1.pc</pkg-config>
-    <branch module="dbus-glib/dbus-glib-0.94.tar.gz" version="0.94"
-	    repo="dbus"
-	    hash="sha256:e460fa9314f0d35b054355080b5c315187c9e3d02252f1b7b11195bb0c08d39b"
-	    size="705558">
-    </branch>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="glib"/>
-      <dep package="expat"/>
-    </dependencies>
-  </autotools>
-
   <tarball id="desktop-file-utils" version="0.16">
     <source href="http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.16.tar.bz2";
             hash="sha256:7960be4bf7aa4b4698e8ea333cfa0bbfa7a169029e85d6a8b5390f625155c9a3"
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index 98c0d4c..248327e 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -81,6 +81,12 @@
             version="1.4.10"/>
   </systemmodule>
 
+  <systemmodule id="dbus-glib">
+    <pkg-config>dbus-glib-1.pc</pkg-config>
+    <branch repo="system"
+            version="0.98"/>
+  </systemmodule>
+
   <systemmodule id="device-mapper">
     <branch repo="system"/>
     <systemdependencies>



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