Patchwork dbus: split X11 dependant dbus-launch into its own subpackage

login
register
mail settings
Submitter Koen Kooi
Date May 25, 2011, 7:47 p.m.
Message ID <1306352857-12211-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/4771/
State New, archived
Headers show

Comments

Koen Kooi - May 25, 2011, 7:47 p.m.
This makes dbus usable in non-X enviroments like QT/e

From the original commit in OE .dev:

commit 8e25448fb01b6fa6ea3a86f9327f080cd753dfbc
Author: John Lee <john_lee@openmoko.org>
Date:   Fri Sep 5 11:37:39 2008 +0000

    dbus: enable x support and put dbus-launch into new package dbus-x11
    * Enable x support only add rdepends to dbus-launch.  Make it a
      seperate package so other packages like dbus does not rdepend on
      libx11.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-core/dbus/dbus.inc      |    4 +++-
 meta/recipes-core/dbus/dbus_1.4.1.bb |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
Koen Kooi - May 25, 2011, 8:18 p.m.
Op 25 mei 2011, om 21:55 heeft Phil Blundell het volgende geschreven:

> On Wed, 2011-05-25 at 21:47 +0200, Koen Kooi wrote:
>> +FILES_${PN}-x11 = "{bindir}/dbus-launch"
> 
> That doesn't look quite right.

Gah, copy-paste mistake from meta-oe, I'll send a new version

Patch

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 1ef0d8f..015fd7a 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -21,7 +21,9 @@  CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session
 
 DEBIANNAME_${PN} = "dbus-1"
 
-PACKAGES =+ "${PN}-lib"
+PACKAGES =+ "${PN}-lib ${PN}-x11"
+
+FILES_${PN}-x11 = "{bindir}/dbus-launch"
 
 FILES_${PN} = "${bindir}/dbus-daemon* \
                ${bindir}/dbus-uuidgen \
diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb
index f16d9f2..d1c59dc 100644
--- a/meta/recipes-core/dbus/dbus_1.4.1.bb
+++ b/meta/recipes-core/dbus/dbus_1.4.1.bb
@@ -1,6 +1,6 @@ 
 include dbus.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
 SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"