diff options
| author |   Stephen Klimaszewski <steev@gentoo.org> | 2008-02-28 00:26:12 +0000 |
|---|---|---|
| committer | Stephen Klimaszewski <steev@gentoo.org> | 2008-02-28 00:26:12 +0000 |
| commit | a5c364f14b6c4d2b9c6a6c65832851deb648c004 (patch) | |
| tree | cdb67875d94ebee726ecd4f1586efd926015261a /sys-apps/dbus | |
| parent | Version bump (bug #209483 thanks to Michael Polskienazwisko), added PYTHON_MO... (diff) | |
| download | gentoo-2-a5c364f14b6c4d2b9c6a6c65832851deb648c004.tar.gz gentoo-2-a5c364f14b6c4d2b9c6a6c65832851deb648c004.tar.bz2 gentoo-2-a5c364f14b6c4d2b9c6a6c65832851deb648c004.zip | |
Add patch so dbus 1.1.20 builds without X
(Portage version: 2.1.4.4)
Diffstat (limited to 'sys-apps/dbus')
| -rw-r--r-- | sys-apps/dbus/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/dbus/dbus-1.1.20.ebuild | 9 | ||||
| -rw-r--r-- | sys-apps/dbus/files/dbus-1.1.20-fix-build.patch | 14 |
3 files changed, 27 insertions, 2 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index 2f7bfef8e71d..0bbda98fbca7 100644 --- a/sys-apps/dbus/ChangeLog +++ b/sys-apps/dbus/ChangeLog @@ -1,6 +1,10 @@ # 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.210 2008/02/27 20:48:06 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.211 2008/02/28 00:26:12 steev Exp $ + + 28 Feb 2008; Steev Klimaszewski <steev@gentoo.org> + +files/dbus-1.1.20-fix-build.patch, dbus-1.1.20.ebuild: + Add patch so dbus 1.1.20 builds without X *dbus-1.1.20 (27 Feb 2008) diff --git a/sys-apps/dbus/dbus-1.1.20.ebuild b/sys-apps/dbus/dbus-1.1.20.ebuild index 8fe1079f761b..d61312d96ead 100644 --- a/sys-apps/dbus/dbus-1.1.20.ebuild +++ b/sys-apps/dbus/dbus-1.1.20.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.20.ebuild,v 1.2 2008/02/27 20:50:58 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.1.20.ebuild,v 1.3 2008/02/28 00:26:12 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 to fix building without X useflag + epatch "${FILESDIR}/${P}-fix-build.patch" +} + src_compile() { # so we can get backtraces from apps append-flags -rdynamic diff --git a/sys-apps/dbus/files/dbus-1.1.20-fix-build.patch b/sys-apps/dbus/files/dbus-1.1.20-fix-build.patch new file mode 100644 index 000000000000..87e810646c4e --- /dev/null +++ b/sys-apps/dbus/files/dbus-1.1.20-fix-build.patch @@ -0,0 +1,14 @@ +diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c +index 5d6e77e..6a10ffa 100644 +--- a/tools/dbus-launch.c ++++ b/tools/dbus-launch.c +@@ -966,7 +966,9 @@ main (int argc, char **argv) + char write_pid_fd_as_string[MAX_FD_LEN]; + char write_address_fd_as_string[MAX_FD_LEN]; + ++#ifdef DBUS_BUILD_X11 + xdisplay = NULL; ++#endif + + if (close_stderr) + do_close_stderr (); |