From: Stephen Klimaszewski <steev@gentoo.org>
Date: Thu, 28 Feb 2008 00:26:12 +0000 (+0000)
Subject: Add patch so dbus 1.1.20 builds without X
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=34dcea890537d2a3715012869e9d05e3dad36e12;p=gentoo.git

Add patch so dbus 1.1.20 builds without X
Package-Manager: portage-2.1.4.4
---

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/Manifest b/sys-apps/dbus/Manifest
index 8d9431552d3d..a6e54655dc0c 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 30-dbus 243 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 SHA1 35ee3a5d3db9c7e372603ce916e17a41edd01d36 SHA256 a8e8fec9769cc5d46df8216f7d1e1f9df422c4e46f293fd70d4b017fb01d959d
 AUX dbus-1.0.1-fixfilecreation.patch 474 RMD160 63e1a6737519773dc85b64098577a97bae7ef6cc SHA1 a4748d3db24f425bd8ed2409bf225d01ced11640 SHA256 183ec284a385b3ef724abbcebd10e42765d81212d23e269c473fb3772f9ab2a3
+AUX dbus-1.1.20-fix-build.patch 392 RMD160 4a5f6d9ce7a4f8a8c3103c38dccfbf27a8383f2c SHA1 fdb4e94f7e0d58adea87412735ad1e955c780888 SHA256 78e3b41665daa172ff0f946db8d2c55d3c8dcad762733a2fba4ed6d7fcd29768
 AUX dbus-1.1.4-xdisplay_null.patch 421 RMD160 4be7aee34fc20c6d871e803b57e21e281af5bee5 SHA1 39464d340e56cafeeab96aa14881ce44a05c8e98 SHA256 176c826865d6479b37fc45879075ac2c7e810750fd78c7f1dffbd9e0082903e3
 AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e23868046c67eaec87220e92ffcea5d9dd911 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98
 DIST dbus-1.0.2.tar.gz 1400278 RMD160 d5eddfb058c4c026d4a9f091ad90abcc6e54861a SHA1 2870efd6ea0b5b0d14e52195f560238a74bb1e0e SHA256 8a004125f58512a69575f21f105aead0d1217fce9cb54cbafeac06b4be28c6ca
 DIST dbus-1.1.20.tar.gz 1401902 RMD160 da06f0fca2e83e9ea3af6fa14045a69b97435221 SHA1 fff5db438483e6b4a3c40d430b20baa49ad2d58a SHA256 6f1fca18af9214e896c5c0a11f94fe05a0345c641ed57da886a93a4e3b33147e
 DIST dbus-1.1.4.tar.gz 1400585 RMD160 22d08a6c00ac3cd0bcf97d7733f39af36bcbfb0b SHA1 f246dfbc7dadb8a11a413f3376fdcd22e52eb1e4 SHA256 4f8ff9324a5d363833833333193a3e83c074a51ce82d8c66c2e304b0378c714d
 EBUILD dbus-1.0.2-r2.ebuild 3406 RMD160 2bc007e091ca12b57248ccb34677d001e7ca3a77 SHA1 bf45ae458276a3ae23551cb4531d8b3c3af81fc9 SHA256 627893aedf081dfef8562bdd48302e1eae7c532c508310cd887c0e197639bef7
-EBUILD dbus-1.1.20.ebuild 3528 RMD160 85153094f9fa78eafe13576839f9722fd42db9c9 SHA1 c4165d1387ce0c10a532415d6c35a5935a0c8d8a SHA256 7393c6a4601868680a7ba1cb8dee6f9451c0d2240cf4fa3f265115096354c439
+EBUILD dbus-1.1.20.ebuild 3655 RMD160 c688cc55dbc524f603c7afad2db28b57abc0b23a SHA1 d771427452e56b86735dfbccc91573d2c3e9b575 SHA256 97c4d4cf427a853fd7068ebaf02ecd06e5f63e1e06ff62461478256c587c53dd
 EBUILD dbus-1.1.4.ebuild 3615 RMD160 e624bbf41d68ee262e979fdfe18ccefdcf0da17f SHA1 4de46e72c4dd2f56c6e448808969c5fb3f89e944 SHA256 cfeb8cf28565ec4a89e4382d8d1002fe97113ee545fcfd41c9adfdb0ba0e73db
-MISC ChangeLog 31827 RMD160 93a6647c5735d9d1bba9390d926a9ed45a06b68c SHA1 74700e8f40ae267c242c375d8526d88fb4070f9e SHA256 3469322281d77dea04cee614dae8d56ae32891dbebdae1774d747f952870b3b4
+MISC ChangeLog 31982 RMD160 3a83b7a81e7d095da4720d0edb92c5cbb2ab95e8 SHA1 af5f31e7181a50a8d097a31c4575faf9c8266644 SHA256 32d6211777fa3751b7fd659c32739a2e0c6d42787be4b5750e43d66b5603db83
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHxc04oeSe8B0zEfwRAlJcAJ0cjjxhg5F/k0PU4mA9VWTftAyMUwCfb6hZ
-u9EeqZw5aVq9EpHoPnajFWo=
-=4IZe
------END PGP SIGNATURE-----
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 ();