diff options
| author |   Stephen Klimaszewski <steev@gentoo.org> | 2008-02-05 15:34:54 +0000 |
|---|---|---|
| committer | Stephen Klimaszewski <steev@gentoo.org> | 2008-02-05 15:34:54 +0000 |
| commit | 3d42b8e72ea978cc778600bfbc6aed48aaac83dc (patch) | |
| tree | 79fce69e9be3ec8634052909a368d43d831aeb2e | |
| parent | fix depend.apache usage wrt #208584 (diff) | |
| download | gentoo-2-3d42b8e72ea978cc778600bfbc6aed48aaac83dc.tar.gz gentoo-2-3d42b8e72ea978cc778600bfbc6aed48aaac83dc.tar.bz2 gentoo-2-3d42b8e72ea978cc778600bfbc6aed48aaac83dc.zip | |
Add a patch from Matthias Clasen to fix dbus-launch hanging around after you exit X.
(Portage version: 2.1.4.1)
| -rw-r--r-- | sys-apps/dbus/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/dbus/dbus-1.1.4.ebuild | 9 | ||||
| -rw-r--r-- | sys-apps/dbus/files/dbus-1.1.4-xdisplay_null.patch | 12 |
3 files changed, 26 insertions, 2 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index 8a737972b6a5..fc45410d4cb3 100644 --- a/sys-apps/dbus/ChangeLog +++ b/sys-apps/dbus/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/dbus # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.205 2008/01/18 21:48:35 steev Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.206 2008/02/05 15:34:53 steev Exp $ + + 05 Feb 2008; Steev Klimaszewski <steev@gentoo.org> + +files/dbus-1.1.4-xdisplay_null.patch, dbus-1.1.4.ebuild: + Add a patch from Matthias Clasen to fix dbus-launch hanging around after you + exit X 18 Jan 2008; Steev Klimaszewski <steev@gentoo.org> dbus-1.1.4.ebuild: Change make install to use emake. Add warning along with ebeep to inform diff --git a/sys-apps/dbus/dbus-1.1.4.ebuild b/sys-apps/dbus/dbus-1.1.4.ebuild index 730a13043fbe..21416ccca9a5 100644 --- a/sys-apps/dbus/dbus-1.1.4.ebuild +++ b/sys-apps/dbus/dbus-1.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.1.4.ebuild,v 1.2 2008/01/18 21:48:35 steev Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.1.4.ebuild,v 1.3 2008/02/05 15:34:53 steev Exp $ inherit eutils multilib autotools flag-o-matic @@ -23,6 +23,13 @@ DEPEND="${RDEPEND} doc? ( app-doc/doxygen app-text/xmlto )" +src_unpack() { + unpack ${A} + cd "${S}" + # Patch that *should* fix dbus-launch hanging around after exiting X + epatch "${FILESDIR}/${PN}-1.1.4-xdisplay_null.patch" +} + src_compile() { # so we can get backtraces from apps append-flags -rdynamic diff --git a/sys-apps/dbus/files/dbus-1.1.4-xdisplay_null.patch b/sys-apps/dbus/files/dbus-1.1.4-xdisplay_null.patch new file mode 100644 index 000000000000..5fa174172494 --- /dev/null +++ b/sys-apps/dbus/files/dbus-1.1.4-xdisplay_null.patch @@ -0,0 +1,12 @@ +diff -ruN dbus-1.1.4.orig/tools/dbus-launch.c dbus-1.1.4/tools/dbus-launch.c +--- dbus-1.1.4.orig/tools/dbus-launch.c 2008-02-05 08:53:15.000000000 -0600 ++++ dbus-1.1.4/tools/dbus-launch.c 2008-02-05 08:54:04.000000000 -0600 +@@ -966,6 +966,8 @@ + char write_pid_fd_as_string[MAX_FD_LEN]; + char write_address_fd_as_string[MAX_FD_LEN]; + ++ xdisplay = NULL; ++ + if (close_stderr) + do_close_stderr (); + |