[pkgsrc/trunk]: pkgsrc/audio/rhythmbox Fix build with new dbus API.

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d2f6eb08ae9
branches:  trunk
changeset: 517838:8d2f6eb08ae9
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Wed Aug 23 12:19:57 2006 +0000

description:
Fix build with new dbus API.

diffstat:

 audio/rhythmbox/distinfo         |   5 +++--
 audio/rhythmbox/patches/patch-ac |  13 +++++++++++--
 audio/rhythmbox/patches/patch-ad |  13 +++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)

diffs (60 lines):

diff -r 1dfd6d88d73a -r 8d2f6eb08ae9 audio/rhythmbox/distinfo
--- a/audio/rhythmbox/distinfo  Wed Aug 23 11:58:00 2006 +0000
+++ b/audio/rhythmbox/distinfo  Wed Aug 23 12:19:57 2006 +0000
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.17 2006/07/08 13:01:39 drochner Exp $
+$NetBSD: distinfo,v 1.18 2006/08/23 12:19:57 jmmv Exp $
 
 SHA1 (rhythmbox-0.9.5.tar.bz2) = 94b35f20c9fa45b105d4a068d83e150f4380e921
 RMD160 (rhythmbox-0.9.5.tar.bz2) = b51fd8800d00fd8a8ad16e1ab511cb40630fd4f1
 Size (rhythmbox-0.9.5.tar.bz2) = 2429543 bytes
 SHA1 (patch-aa) = dcadca60a960d44651e1ccc5deba55d97a460af9
 SHA1 (patch-ab) = 3b4e391036f0f9e854b25952a0f63d81dfb07c5b
-SHA1 (patch-ac) = b62a5816bd6a93156fce0c99c216ffeb4beb9787
+SHA1 (patch-ac) = 1541c6df2a835a320aad67676302c42c0020572b
+SHA1 (patch-ad) = 4016299eda7f6ae3d9c132a8db088ac1aef26b7e
 SHA1 (patch-ae) = 1be3a5dc5a879a64b65a26efba133fe3958ea712
 SHA1 (patch-af) = c240903bfcf720493f8aad768b2693484d2de665
 SHA1 (patch-ag) = 65069bcdfa6f73e617ca0afd5283653bcfe79026
diff -r 1dfd6d88d73a -r 8d2f6eb08ae9 audio/rhythmbox/patches/patch-ac
--- a/audio/rhythmbox/patches/patch-ac  Wed Aug 23 11:58:00 2006 +0000
+++ b/audio/rhythmbox/patches/patch-ac  Wed Aug 23 12:19:57 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1 2006/07/02 11:32:40 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2006/08/23 12:19:58 jmmv Exp $
 
---- metadata/rb-metadata-dbus-client.c.orig    2006-04-22 11:30:47.000000000 +0200
+--- metadata/rb-metadata-dbus-client.c.orig    2006-05-27 06:15:44.000000000 +0200
 +++ metadata/rb-metadata-dbus-client.c
 @@ -52,7 +52,7 @@
  
@@ -11,3 +11,12 @@
  #include <sys/wait.h>
  #include <string.h>
  #include <stdlib.h>
+@@ -118,7 +118,7 @@ kill_metadata_service (void)
+       if (dbus_connection) {
+               if (dbus_connection_get_is_connected (dbus_connection)) {
+                       rb_debug ("closing dbus connection");
+-                      dbus_connection_disconnect (dbus_connection);
++                      dbus_connection_close (dbus_connection);
+               } else {
+                       rb_debug ("dbus connection already closed");
+               }
diff -r 1dfd6d88d73a -r 8d2f6eb08ae9 audio/rhythmbox/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/rhythmbox/patches/patch-ad  Wed Aug 23 12:19:57 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/08/23 12:19:58 jmmv Exp $
+
+--- metadata/rb-metadata-dbus-service.c.orig   2006-05-27 06:15:44.000000000 +0200
++++ metadata/rb-metadata-dbus-service.c
+@@ -494,7 +494,7 @@ main (int argc, char **argv)
+       g_main_loop_run (svc.loop);
+ 
+       if (svc.connection) {
+-              dbus_connection_disconnect (svc.connection);
++              dbus_connection_close (svc.connection);
+               dbus_connection_unref (svc.connection);
+       }
+