Add patch to compile with >=dbus-0.90, fixing bug #144521. Thanks to Kyle McFarland.

Package-Manager: portage-2.1.1_rc1-r1

4 files changed, 82 insertions, 10 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 88cc381b9aa2..81219b136991 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.77 2006/06/27 13:28:34 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.78 2006/08/27 23:44:01 leio Exp $
+
+  27 Aug 2006; Mart Raudsepp <leio@gentoo.org>
+  +files/rhythmbox-0.9.5-dbus-0.90.patch, rhythmbox-0.9.5.ebuild:
+  Add patch to compile with >=dbus-0.90, fixing bug #144521. Thanks to Kyle
+  McFarland.
 
   27 Jun 2006; Joe McCann <joem@gentoo.org> rhythmbox-0.9.5.ebuild:
   Fixes for bugs 137295 and 137281
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index eca0738e2509..7c2f72ce5413 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rhythmbox-0.8.7-gst_shn_support.patch 665 RMD160 8f8eec7bf19405ea70b7ab5984c5d5a96e834822 SHA1 033ca9aa8109a558162a6ddbbdf4f270da2e239c SHA256 1c4fbabdff94741c88fb92f37c84ae70e05be9054481241efcab49f8c2c19018
 MD5 7c49ce1b3d4a78dc9adba805fd3b82fb files/rhythmbox-0.8.7-gst_shn_support.patch 665
 RMD160 8f8eec7bf19405ea70b7ab5984c5d5a96e834822 files/rhythmbox-0.8.7-gst_shn_support.patch 665
@@ -18,6 +21,10 @@ AUX rhythmbox-0.9.4_p1-libnotify.patch 453 RMD160 b8290126511fea767370d2c487e33f
 MD5 95fdcaa555263ebc1e0d43a097697430 files/rhythmbox-0.9.4_p1-libnotify.patch 453
 RMD160 b8290126511fea767370d2c487e33f962354046a files/rhythmbox-0.9.4_p1-libnotify.patch 453
 SHA256 0305968bb4488fc20d81d8c6330e7985b80da6d702dcf0d64e9965d90ff73eff files/rhythmbox-0.9.4_p1-libnotify.patch 453
+AUX rhythmbox-0.9.5-dbus-0.90.patch 1660 RMD160 c4d23168de50dfcc631a14c554ba09bc1c088263 SHA1 c80c0e916372a529b29ca65edec211583287f201 SHA256 c3ab9e6b6258fed934d3a7a7c47bc246e652f73db5b068107a51a6f3d8caa732
+MD5 27d9546852f5c88015ad298a25f168da files/rhythmbox-0.9.5-dbus-0.90.patch 1660
+RMD160 c4d23168de50dfcc631a14c554ba09bc1c088263 files/rhythmbox-0.9.5-dbus-0.90.patch 1660
+SHA256 c3ab9e6b6258fed934d3a7a7c47bc246e652f73db5b068107a51a6f3d8caa732 files/rhythmbox-0.9.5-dbus-0.90.patch 1660
 DIST rhythmbox-0.8.8.tar.bz2 2435338 RMD160 7c436dd556c330ea98d87bad5cb304ab4a236020 SHA256 7faf1c10aaa198a1acacd3eb12979a2ea0730a0aa98d28f3c673a7f78b8dbda1
 DIST rhythmbox-0.9.4.1.tar.bz2 2155482 RMD160 5ce11aeae6631650cc4edfdbf46a7a13162d246f SHA1 dc59634de9471a14f62528c5a8453a284c74f7b0 SHA256 2d2305d575c7cc3a366ea9075efcb23b215da49b82b5b81ad3f8649a6cca80f6
 DIST rhythmbox-0.9.5.tar.bz2 2429543 RMD160 b51fd8800d00fd8a8ad16e1ab511cb40630fd4f1 SHA1 94b35f20c9fa45b105d4a068d83e150f4380e921 SHA256 63607430da44df029b9b82d43cea887b0217c2e058432be65e5a3b5fa8baba43
@@ -29,14 +36,14 @@ EBUILD rhythmbox-0.9.4.1.ebuild 2711 RMD160 e4063868523b2f3606cf9d598fcfd197ceb3
 MD5 cefdc3ff8ae3362065058b307a9ef3e4 rhythmbox-0.9.4.1.ebuild 2711
 RMD160 e4063868523b2f3606cf9d598fcfd197ceb3b117 rhythmbox-0.9.4.1.ebuild 2711
 SHA256 c9e9016052a137ab2b753ad2bd6080071b311ced689967ef5b2b6443b7c0d25d rhythmbox-0.9.4.1.ebuild 2711
-EBUILD rhythmbox-0.9.5.ebuild 2864 RMD160 5633817fdb00c26bba05a806d021cc5a3b8f4526 SHA1 03ddd0cab49907580bbe15488de6b3d932c3c742 SHA256 754a870011595b87e04914206c06b51068ec8f38ee637053c225bb28d207e88f
-MD5 9b205abc7b07e717c21f428c4202db0d rhythmbox-0.9.5.ebuild 2864
-RMD160 5633817fdb00c26bba05a806d021cc5a3b8f4526 rhythmbox-0.9.5.ebuild 2864
-SHA256 754a870011595b87e04914206c06b51068ec8f38ee637053c225bb28d207e88f rhythmbox-0.9.5.ebuild 2864
-MISC ChangeLog 10082 RMD160 848983f3b902b7f7d41e71e46fa9ca6d15b75529 SHA1 1948f638348250d74b7e9e742c983b026ec04a09 SHA256 20c0f215b0685140df34350702de3a909fa5d482c7cdb464a17a34bb7cc1261e
-MD5 442afa6319a61116b660637901f6da6f ChangeLog 10082
-RMD160 848983f3b902b7f7d41e71e46fa9ca6d15b75529 ChangeLog 10082
-SHA256 20c0f215b0685140df34350702de3a909fa5d482c7cdb464a17a34bb7cc1261e ChangeLog 10082
+EBUILD rhythmbox-0.9.5.ebuild 2945 RMD160 197b5875022ada2836b2d09b2f7e5646ca0f22da SHA1 c1fa7c339ee59dd80f58e58605b9c64963b504e4 SHA256 c6453a2019bf168bb652bbb7517253d696e5e47ca3d670c2e62c78f203221b64
+MD5 4bf5cb156edf60e5599a53909df476ba rhythmbox-0.9.5.ebuild 2945
+RMD160 197b5875022ada2836b2d09b2f7e5646ca0f22da rhythmbox-0.9.5.ebuild 2945
+SHA256 c6453a2019bf168bb652bbb7517253d696e5e47ca3d670c2e62c78f203221b64 rhythmbox-0.9.5.ebuild 2945
+MISC ChangeLog 10285 RMD160 1e9d58708bb8563dd5b1e008b59e730d872ddeb0 SHA1 be7679cdda43d92b949ba830990c2a553d09e3b9 SHA256 bed302d5ad80ea24762145c7bbc769fb2196b0ef171818f6e9a4e435e7cfb92f
+MD5 a8179f3e89ba590f21d4917bdf20bab1 ChangeLog 10285
+RMD160 1e9d58708bb8563dd5b1e008b59e730d872ddeb0 ChangeLog 10285
+SHA256 bed302d5ad80ea24762145c7bbc769fb2196b0ef171818f6e9a4e435e7cfb92f ChangeLog 10285
 MISC metadata.xml 200 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 SHA1 9d3b582b967a1030b95428758f25fe33cb5a25fd SHA256 2e1eafdbf68047687a24f6a4ad8d519ec193805e347bf17d1d00f7771353e39b
 MD5 e854b7f54a4de6256186cbdcaabbc1ec metadata.xml 200
 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 metadata.xml 200
@@ -50,3 +57,10 @@ SHA256 bc058a60936b21142f767cb6b339441864555be4fadc27a45651e90dee7a6236 files/di
 MD5 4019fccfdf7f27bf6931853bd9bddb7e files/digest-rhythmbox-0.9.5 253
 RMD160 7fcf497c1d30b0c3d32a71fb4b1f8077afcf118b files/digest-rhythmbox-0.9.5 253
 SHA256 d4e4fad5e56622ae7979ee2343ca90809e7c2dc2926c9c49f8d2c087335fd188 files/digest-rhythmbox-0.9.5 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE8i5JkeYb6olFHJcRAtDWAJ45Pr2o2MhSXqpAoh4xHNDhBVNS+wCcCHDA
+rSJ1ttnYTXbePyvK+0H71xI=
+=KqJS
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.9.5-dbus-0.90.patch b/media-sound/rhythmbox/files/rhythmbox-0.9.5-dbus-0.90.patch
new file mode 100644
index 000000000000..49bbf6463212
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.9.5-dbus-0.90.patch
@@ -0,0 +1,47 @@
+2006-07-20  Claudio Saavedra  <csaavedra@alumnos.utalca.cl>
+
+* metadata/rb-metadata-dbus-client.c: (kill_metadata_service):
+* metadata/rb-metadata-dbus-service.c: (main): Replace calls to 
+deprecated dbus_connection_disconnect () with dbus_connection_close ().
+Fixes #348098.
+
+Index: metadata/rb-metadata-dbus-service.c
+===================================================================
+RCS file: /cvs/gnome/rhythmbox/metadata/rb-metadata-dbus-service.c,v
+retrieving revision 1.10
+retrieving revision 1.11
+diff -u -r1.10 -r1.11
+--- metadata/rb-metadata-dbus-service.c	14 Jul 2006 12:27:15 -0000	1.10
++++ metadata/rb-metadata-dbus-service.c	21 Jul 2006 04:36:16 -0000	1.11
+@@ -501,7 +501,11 @@
+ 	g_main_loop_run (svc.loop);
+ 
+ 	if (svc.connection) {
++#ifdef WITH_OLD_DBUS
+ 		dbus_connection_disconnect (svc.connection);
++#else
++		dbus_connection_close (svc.connection);
++#endif
+ 		dbus_connection_unref (svc.connection);
+ 	}
+ 
+Index: metadata/rb-metadata-dbus-client.c
+===================================================================
+RCS file: /cvs/gnome/rhythmbox/metadata/rb-metadata-dbus-client.c,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -r1.7 -r1.8
+--- metadata/rb-metadata-dbus-client.c	14 Jul 2006 12:27:15 -0000	1.7
++++ metadata/rb-metadata-dbus-client.c	21 Jul 2006 04:36:16 -0000	1.8
+@@ -119,7 +119,11 @@
+ 	if (dbus_connection) {
+ 		if (dbus_connection_get_is_connected (dbus_connection)) {
+ 			rb_debug ("closing dbus connection");
++#ifdef WITH_OLD_DBUS
+ 			dbus_connection_disconnect (dbus_connection);
++#else
++			dbus_connection_close (dbus_connection);
++#endif
+ 		} else {
+ 			rb_debug ("dbus connection already closed");
+ 		}
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.5.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.5.ebuild
index 7eed6e4e0956..2920e872074c 100644
--- a/media-sound/rhythmbox/rhythmbox-0.9.5.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.5.ebuild,v 1.2 2006/06/27 13:28:34 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.5.ebuild,v 1.3 2006/08/27 23:44:01 leio Exp $
 
 inherit gnome2 eutils
 
@@ -94,6 +94,12 @@ export GST_INSPECT=/bin/true
 USE_DESTDIR=1
 }
 
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch "${FILESDIR}/${P}-dbus-0.90.patch"
+}
+
 src_compile() {
 	addpredict "$(unset HOME; echo ~)/.gconf"
 	addpredict "$(unset HOME; echo ~)/.gconfd"