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

(Portage version: 2.1.1_rc1-r1)

3 files changed, 60 insertions, 2 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/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"