Fix building with USE="debug" using a patch from upstream bugzilla wrt #507232. Thanks to Richard H. and "Alpha Bravo" for reporting.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 58 insertions, 12 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 3acb34164beb..e4a04b4c9442 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.435 2014/07/05 17:46:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.436 2014/07/24 12:15:40 ssuominen Exp $
+
+  24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/dbus-1.8.6-enable-stats_compile_failure.patch, dbus-1.8.6.ebuild:
+  Fix building with USE="debug" using a patch from upstream bugzilla wrt
+  #507232. Thanks to Richard H. and "Alpha Bravo" for reporting.
 
   05 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> dbus-1.8.6.ebuild:
   Relax dbus restarting postinst message wrt #514728
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index d60e458aa034..640122e2e18b 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX 80-dbus 341 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89 WHIRLPOOL 74e9e79b86fc4802f34737bb47c3a71919f35fb2375119cdcd7fd6dae2de201e006fb4e6a978addd2300f7075180d4b088a69fa60d2ce4d689b6239b4a1307b1
 AUX dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch 1320 SHA256 ab3398f4fb46ec9a134581a825180422b2b8f5e8dd250bca3127c31a39d923a7 SHA512 e8cac05a0291f24fc3cd82cfd504a78b1d356a9ee613e226c3b16ccbfd8251afb036d4fb9da372a066e5bc9417fddbc3f10b68713620c4fd798069fdd8f6dbf8 WHIRLPOOL 9e30cbcba7ebe13cdc8a9e3ad0bb7d3d6e667dfba23a6cedfbacbbed34f6eb15bc6f0dcb42392f0c1a23ac891f0d820759f4201b8bac9b51d4241e74bed5ca2d
+AUX dbus-1.8.6-enable-stats_compile_failure.patch 1227 SHA256 bcb6b8986c6c369be2f068e1fd0bdafc5e848babc02f0827776bc50aa6749211 SHA512 16e04822179f521d14e22fc07164bcba0e1e26473947c9d2795dd2b9457f2b451aa6571f40b61ee13b0e56d159f5a65261ed44f6c4abf80fd2b83076064f8606 WHIRLPOOL ba4c42c5c269336f9383cd435e195d24e74e49da202a5e3997e964bbe6cc214da2fcd87addc258a6e131cd8b9f011158e05283e66d85ca4ed72b2de014105d2b
 AUX dbus.initd 1185 SHA256 98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01 SHA512 7983e77015b46c204b10948a1fcedaae53a75848919961eb1ef8878bfa11c933256642c0e3f59163e72374ce1bd33b0338c787ce067c0982fcdf8a798b922a15 WHIRLPOOL 62ef5b9191a2bd3410c53ed63015e9968789f448e5959de2ebc2404bc13ce99c333546bf1eb335f826ef7ea143f70a53c2ecffd81b4e35fa51ba2e2bdf68879f
 DIST dbus-1.6.18.tar.gz 1916553 SHA256 7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd SHA512 6fe295eaf4865de447d8a68c5f226dd94bb53f39d69a5752440c9dc8f244d23803937449540f632aa0c017d5ce43c6f9bc1a36cfc95519aed9df8ea30165b664 WHIRLPOOL 75d404f73fe893d83fde725d1564fc95046fdbd5d502b57c0cefef4a16d5128653397b8d7578d3839b23b7f53cb8b70729354805b240b8d5b308bb168afe1688
 DIST dbus-1.8.0.tar.gz 1860965 SHA256 769f8c7282b535ccbe610f63a5f14137a5549834b0b0c8a783e90891b8d70b13 SHA512 39b1c294abe25e80d741a294b67a9691337cc71f69f8db03e4e6588512a94de2b772b74ae5cb35fa91da812293f0cf392cb51823ebe3c21f7f9ea99287d0655f WHIRLPOOL bd1b33ba0aa30e9dcf9dd05fdc0cdb18d3d22cbf66d97c521a4def4ee7238681590233885bc93946dca7a7bf88ef905f8490ef949f4d864e850806e6e581aac1
@@ -13,17 +14,17 @@ EBUILD dbus-1.6.18-r1.ebuild 6154 SHA256 f48ee0db5d89cad75e23eb20629dc023923e0fd
 EBUILD dbus-1.8.0.ebuild 5904 SHA256 88d936e155a08496872ded12e5a9cc907b0217c032ea07ae91ee9af8605e355b SHA512 867bac4eba72edffa39cd1514529b58f1baa9e9847f0f4b6b5f1d298643e42015d87f2f818886faa46814bab6487b0cb6d0ab0a5ff7550ce8535ca9f19dde3d3 WHIRLPOOL 32521df6a33f56fdcfe669608b918ea62024e7726d96d7df58ea1d6188afcd51b707bd7f3932c71a37687877f9d3b0abd913edbac32cb9c3a6079a1436235a52
 EBUILD dbus-1.8.2.ebuild 5992 SHA256 ca9c38435ba78e0a6c236e9257e7d01d61b46295c0b7a2ac62408b2885fab38e SHA512 12ed23fc5f20d0498f4e2ac22eb0fecebe7069856d775224bcbd0f08c9609616d584e29959996e78feec4708622c1cf17dd4f153d47f24d9d438abce73da8c11 WHIRLPOOL 7555e57003c6d715cd98e0847f4067582902bc5859d61f162f0d6023b282888f7072179cd8d7af145852b5b2ccd04feff2ba69267dc484b2a9260b616706b5c9
 EBUILD dbus-1.8.4.ebuild 5988 SHA256 bc601fb259ca5bab039d33ec9b06741effd637ee8d24fbd13b419466e8ca6164 SHA512 94485ad1ea451d57a9f33a22ed0a46997be62d1f6e3d43ad757eb7f8216c0050b5d422e53d46d3e88126c28c9cdec398b354fe5e312e09caa8ac5eb7247985bb WHIRLPOOL e85d560cf7f4a4f5603e22d82574ba5e8250dcacd33dc919310330c06decfc5aa2518668010549b38d840a350de61ce5dbd2fcf6a3185aba5971da5955de8d08
-EBUILD dbus-1.8.6.ebuild 5901 SHA256 5307cd1e9ee06451d4e3479bb3307a3f4a3a027541a78cec09ec7d03e1074226 SHA512 ba6e4d8a617e5d10dca72cb8c87e59abbaa45560cc6cc1e11a17b40d676ab6f2bc8a830ac9f8dace0881ce7d7ca53af64d7c87830ee344cd44949616a15e2461 WHIRLPOOL 1ae0dfd390fc6be09c8f04a39cdd7d273e24905f1ce19ef8367507842f6b6634bf4f430cccbc9558d5732dd34f57c4b2adffae1953451d16dcefabb9a9fecc01
-MISC ChangeLog 62588 SHA256 bd666639f291a4d9b04f3158db4c934b381f5e0ad1141aa0c8f42d9b8ee759e5 SHA512 0032065b8cda73ab9f101ab3e55d3b2180f35a14f7adbfe862abad36d5a2f0e3c1e8236d3a752445759ee387bbc906f7a4f98762687039ba221bd73efe13e314 WHIRLPOOL 18060e76e94da935770dd54829164d7ec7892d46ec52a46f0d430cfd2aa402fd8415565b9c0c059527caa26b6997a93b777ece8326f56e00017d58b841ee5646
+EBUILD dbus-1.8.6.ebuild 5964 SHA256 4f2389e7c43075fbaf464c19ef001930b8edc0ddd795ec089d47c75dcf7a6a64 SHA512 e00e496957d9268d8b55dcb2c5426099c71274b99b53ffcfc30df34ebe58ccf5922f8bd720a860e50007ec1d58a240a4d1a1baf5ed3cc2544d6fc3e5d7a9392f WHIRLPOOL 548b53cda08f6c87c05a2792498f62b8e49a6ab52e2da21063b403c4baaae6f81c3f1da6cd673e4e72e1639f2e3170b95057ba760b3524c3a40ef09768d5e416
+MISC ChangeLog 62856 SHA256 79bcf458d4f18bac7c0b1d4d730d357d4572e994b8c94772aa354ee7dc3853bd SHA512 1c9c07bc5d2703ea0f85de36325ee152b01a924fa9bfa3523054ada7f09840f734dc8fdfa979fbf39030153d0de040686393569479c1f09b7639792d02201762 WHIRLPOOL 39725d96116940b05765fe35aa2af9618f4e355c04d6567b5ae2ebd17653363aa18250df38f059a7eba7ed8b05465b26bcf548b1268a4fb459d0c2c32eb98d8c
 MISC metadata.xml 427 SHA256 d8fc8fedafc547578a85222cb60fb7eff3740c8ce101b22ba75aa3e5028135ce SHA512 2f8f64ded5050e87ce679d944dcf9c9a801ea03ee14471ab0702f10339f3f995701c313bfe10e7ab01f1bc784f04a5e6efbb29ea0b44513b9b3e384370956dc5 WHIRLPOOL 7a2add023434038b287c141213c2caf2adcc7ff5bcfb8025b2db0163bedd436fea64dd0e1a072f00232722738705fdc1f367e758d108373146d6fbea8803d5b2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTuDjhAAoJEEdUh39IaPFNMV8H/jjJz9/X3c8oCUcu9A4SJeE5
-pB+lsoJygarNP+8Qi5LtczOVawKe/ZAkgxLhhMQKQzZby1CiB8um6AwWN8F0s/6R
-cwSRCqeHrtDp8dg4j2VhRpLZcxlHzEfbUvgQaTekjnrwrK+B3CMCg10IIQII3rYL
-6LKMxo5psDWj7S6k9scgxvk+3CXMsSFY7H7va3e5exL5A//tWyTCO/EsZjL/x7f6
-8g2FsfX9CV2XqtIvh5Dm/gr6Dzd8UT0svVSQarwyUf2ZOPnsMM9etijvKWAAoANB
-+3vQO/yxF1psVeZN3rK+2EJ4QimZvFqrj3xNBUcuv/0YuneDQCYOF9g4QGij13M=
-=myz6
+iQEcBAEBCAAGBQJT0PjtAAoJEEdUh39IaPFN+NIH/AvOKps1LB+mPycIRw0wuRBX
+UXazFln9g5ccSqXQ/VMCGegbHoehyPb73y2sJg90Z3/uraBOBoACkj2uPYknbo9P
+iEP1Uic6gWH0Exi3fE3tXG8acpo9A0XI//7pAcEbCRuZZk8TdUunnkmGiokdoEHs
+fNBx0ZRiupcOyw2l4CJGH6cbgM2+hFwUGyCHMPs8UWNgrnrW/p7h/jVfto1R7jnY
+msWtxrVb/qiMYcSL0B1+AOrE64BhGlxwVi7+TUFgxI3y83ZvogdZHsj81ml8nyVH
+UeLT4X11nuwY9LHFb/ZEivVtjP1EGJEvPRdYCqY7ytg1d68XOHgoTUJ/6XsVywY=
+=D2zt
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.8.6.ebuild b/sys-apps/dbus/dbus-1.8.6.ebuild
index bf5244a29b24..ada336d7e1c3 100644
--- a/sys-apps/dbus/dbus-1.8.6.ebuild
+++ b/sys-apps/dbus/dbus-1.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.6.ebuild,v 1.11 2014/07/05 17:46:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.6.ebuild,v 1.12 2014/07/24 12:15:40 ssuominen Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -61,6 +61,8 @@ src_prepare() {
 		-e '/"dispatch"/d' \
 		bus/test-main.c || die
 
+	epatch "${FILESDIR}"/${P}-enable-stats_compile_failure.patch
+
 	epatch_user
 
 	# required for asneeded patch but also for bug 263909, cross-compile so
diff --git a/sys-apps/dbus/files/dbus-1.8.6-enable-stats_compile_failure.patch b/sys-apps/dbus/files/dbus-1.8.6-enable-stats_compile_failure.patch
new file mode 100644
index 000000000000..98e2d524af1d
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-1.8.6-enable-stats_compile_failure.patch
@@ -0,0 +1,38 @@
+http://bugs.freedesktop.org/show_bug.cgi?id=81043#c3
+http://bugs.freedesktop.org/show_bug.cgi?id=81043#c4
+
+From e8cf569f51e4d1ebaf190d8d8d16f84dd1364bae Mon Sep 17 00:00:00 2001
+From: Alban Crequy <alban.crequy@collabora.co.uk>
+Date: Thu, 24 Jul 2014 08:04:48 +0100
+Subject: [PATCH] Stats: fix compilation issue
+
+http://bugs.gentoo.org/show_bug.cgi?id=507232
+---
+ bus/stats.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/bus/stats.c b/bus/stats.c
+index 2bf86d6..24308eb 100644
+--- a/bus/stats.c
++++ b/bus/stats.c
+@@ -40,6 +40,7 @@ bus_stats_handle_get_stats (DBusConnection *connection,
+                             DBusMessage    *message,
+                             DBusError      *error)
+ {
++  BusContext *context;
+   BusConnections *connections;
+   DBusMessage *reply = NULL;
+   DBusMessageIter iter, arr_iter;
+@@ -48,7 +49,8 @@ bus_stats_handle_get_stats (DBusConnection *connection,
+ 
+   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+ 
+-  connections = bus_context_get_connections (transaction->context);
++  context = bus_transaction_get_context (transaction);
++  connections = bus_context_get_connections (context);
+ 
+   reply = _dbus_asv_new_method_return (message, &iter, &arr_iter);
+ 
+-- 
+1.8.5.3
+