[jhbuild] 3.8: Use dbus from distro packages



commit 0bb3fe5f16acc81314aae5b01d94bb88698bee71
Author: Javier JardÃn <jjardon gnome org>
Date:   Tue Dec 11 02:09:35 2012 +0900

    3.8: Use dbus from distro packages

 modulesets/gnome-suites-core-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-3.8.modules b/modulesets/gnome-suites-core-3.8.modules
index ea1f352..8c12d68 100644
--- a/modulesets/gnome-suites-core-3.8.modules
+++ b/modulesets/gnome-suites-core-3.8.modules
@@ -17,8 +17,6 @@
 <!-- tarball repos -->
   <repository type="tarball" name="avahi.org"
       href="http://www.avahi.org/download/"/>
-  <repository type="tarball" name="dbus"
-      href="http://dbus.freedesktop.org/releases/"/>
   <repository type="tarball" name="freedesktop.org"
       href="http://freedesktop.org/"/>
   <repository type="tarball" name="gnome.org"
@@ -852,19 +850,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="dbus" supports-non-srcdir-builds="no" autogenargs="--with-systemdsystemunitdir=no">
-    <pkg-config>dbus-1.pc</pkg-config>
-    <branch module="dbus/dbus-1.4.0.tar.gz" version="1.4.0"
-	    repo="dbus"
-	    hash="sha256:c96d2f86d40e158e2bf405925a0a42cce0533a8466098e2f2238aa1614926652"
-	    size="1800347">
-    </branch>
-    <dependencies>
-      <dep package="expat"/>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gdm">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index 4aecd31..98c0d4c 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -75,6 +75,12 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="dbus">
+    <pkg-config>dbus-1.pc</pkg-config>
+    <branch repo="system"
+            version="1.4.10"/>
+  </systemmodule>
+
   <systemmodule id="device-mapper">
     <branch repo="system"/>
     <systemdependencies>



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