update to 0.12.3

changes: many bugfixes

pkgsrc changes:
-use brasero rather than nautilus-cd-burner for CD writing
 (this works well for me now)
-use musicbrainz rather than -2
 (audio CD reading doesn't work on NetBSD due to HAL problems,
  so I couldn't test)

5 files changed, 44 insertions, 11 deletions

diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 9a89bb63b26..62e12ab1ed6 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2009/07/22 09:01:19 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2009/07/31 08:50:27 drochner Exp $
 #
 
-DISTNAME=	rhythmbox-0.12.2
+DISTNAME=	rhythmbox-0.12.3
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rhythmbox/0.12/}
 EXTRACT_SUFX=	.tar.bz2
@@ -31,7 +31,7 @@ GCONF_SCHEMAS=		rhythmbox.schemas
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../multimedia/py-gstreamer0.10/buildlink3.mk"
 BUILDLINK_API_DEPENDS.musicbrainz+=	musicbrainz>=2.1.0
-.include "../../audio/musicbrainz/buildlink3.mk"
+.include "../../audio/libmusicbrainz/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -46,7 +46,7 @@ BUILDLINK_API_DEPENDS.totem+=		{totem,totem-xine}>=1.1.5
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
+.include "../../sysutils/brasero/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
diff --git a/audio/rhythmbox/PLIST b/audio/rhythmbox/PLIST
index a5dd0a8e7e6..ca152732064 100644
--- a/audio/rhythmbox/PLIST
+++ b/audio/rhythmbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2009/06/14 17:32:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.23 2009/07/31 08:50:27 drochner Exp $
 bin/rhythmbox
 bin/rhythmbox-client
 lib/librhythmbox-core.la
@@ -25,6 +25,7 @@ lib/rhythmbox/plugins/artdisplay/__init__.pyc
 lib/rhythmbox/plugins/artdisplay/__init__.pyo
 lib/rhythmbox/plugins/artdisplay/artdisplay.rb-plugin
 lib/rhythmbox/plugins/artdisplay/rhythmbox-missing-artwork.svg
+lib/rhythmbox/plugins/audiocd/album-info.ui
 lib/rhythmbox/plugins/audiocd/audiocd-ui.xml
 lib/rhythmbox/plugins/audiocd/audiocd.rb-plugin
 lib/rhythmbox/plugins/audiocd/libaudiocd.la
@@ -36,7 +37,6 @@ lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.rb-plugin
 lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.la
 lib/rhythmbox/plugins/cd-recorder/cd-recorder.rb-plugin
 lib/rhythmbox/plugins/cd-recorder/libcd-recorder.la
-lib/rhythmbox/plugins/cd-recorder/recorder.ui
 lib/rhythmbox/plugins/daap/daap-prefs.ui
 lib/rhythmbox/plugins/daap/daap-ui.xml
 lib/rhythmbox/plugins/daap/daap.rb-plugin
@@ -137,6 +137,9 @@ lib/rhythmbox/plugins/rb/Loader.pyo
 lib/rhythmbox/plugins/rb/__init__.py
 lib/rhythmbox/plugins/rb/__init__.pyc
 lib/rhythmbox/plugins/rb/__init__.pyo
+lib/rhythmbox/plugins/rb/stringmatch.py
+lib/rhythmbox/plugins/rb/stringmatch.pyc
+lib/rhythmbox/plugins/rb/stringmatch.pyo
 lib/rhythmbox/plugins/status-icon/libstatus-icon.la
 lib/rhythmbox/plugins/status-icon/status-icon-preferences.ui
 lib/rhythmbox/plugins/status-icon/status-icon-ui.xml
@@ -183,7 +186,6 @@ share/doc/rhythmbox/RBPlayerGstTee.html
 share/doc/rhythmbox/RBPlaylistManager.html
 share/doc/rhythmbox/RBPlaylistSource.html
 share/doc/rhythmbox/RBPropertyView.html
-share/doc/rhythmbox/RBProxyConfig.html
 share/doc/rhythmbox/RBQueryCreator.html
 share/doc/rhythmbox/RBRandomPlayOrder.html
 share/doc/rhythmbox/RBRating.html
@@ -418,6 +420,7 @@ share/icons/hicolor/scalable/apps/rhythmbox.svg
 share/locale/af/LC_MESSAGES/rhythmbox.mo
 share/locale/am/LC_MESSAGES/rhythmbox.mo
 share/locale/ar/LC_MESSAGES/rhythmbox.mo
+share/locale/as/LC_MESSAGES/rhythmbox.mo
 share/locale/az/LC_MESSAGES/rhythmbox.mo
 share/locale/be/LC_MESSAGES/rhythmbox.mo
 share/locale/be@latin/LC_MESSAGES/rhythmbox.mo
@@ -460,6 +463,7 @@ share/locale/nb/LC_MESSAGES/rhythmbox.mo
 share/locale/ne/LC_MESSAGES/rhythmbox.mo
 share/locale/nl/LC_MESSAGES/rhythmbox.mo
 share/locale/oc/LC_MESSAGES/rhythmbox.mo
+share/locale/or/LC_MESSAGES/rhythmbox.mo
 share/locale/pa/LC_MESSAGES/rhythmbox.mo
 share/locale/pl/LC_MESSAGES/rhythmbox.mo
 share/locale/ps/LC_MESSAGES/rhythmbox.mo
@@ -472,6 +476,7 @@ share/locale/sk/LC_MESSAGES/rhythmbox.mo
 share/locale/sr/LC_MESSAGES/rhythmbox.mo
 share/locale/sr@latin/LC_MESSAGES/rhythmbox.mo
 share/locale/sv/LC_MESSAGES/rhythmbox.mo
+share/locale/ta/LC_MESSAGES/rhythmbox.mo
 share/locale/th/LC_MESSAGES/rhythmbox.mo
 share/locale/tr/LC_MESSAGES/rhythmbox.mo
 share/locale/uk/LC_MESSAGES/rhythmbox.mo
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index 0e187d90888..c6217a33a4f 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.28 2009/06/04 11:44:24 drochner Exp $
+$NetBSD: distinfo,v 1.29 2009/07/31 08:50:27 drochner Exp $
 
-SHA1 (rhythmbox-0.12.2.tar.bz2) = dd72ffd092760fc70b5a86e7f5ccf8157e56fb98
-RMD160 (rhythmbox-0.12.2.tar.bz2) = bf50fe01295c8a4fc185b0f811dccff829dbfac4
-Size (rhythmbox-0.12.2.tar.bz2) = 4909310 bytes
+SHA1 (rhythmbox-0.12.3.tar.bz2) = f1def95f92993ade14f7b0ec2323e9d2e4aaad03
+RMD160 (rhythmbox-0.12.3.tar.bz2) = 8fc030b320065578b4a0851ecd87c5753b6dce93
+Size (rhythmbox-0.12.3.tar.bz2) = 4999529 bytes
+SHA1 (patch-aa) = a31b22483c63ee73bf32ca583afcc82c29e9562a
+SHA1 (patch-ab) = ad082691fc80177a6d6f843278f04a0f5399c205
diff --git a/audio/rhythmbox/patches/patch-aa b/audio/rhythmbox/patches/patch-aa
new file mode 100644
index 00000000000..2e6db05ffdc
--- /dev/null
+++ b/audio/rhythmbox/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.10 2009/07/31 08:50:27 drochner Exp $
+
+--- plugins/coherence/upnp_coherence/UpnpSource.py.orig	2009-06-30 01:38:57.000000000 +0200
++++ plugins/coherence/upnp_coherence/UpnpSource.py
+@@ -132,7 +132,7 @@ class UpnpSource(rb.BrowserSource,log.Lo
+ 
+                     if duration is not None:
+                         h,m,s = duration.split(':')
+-                        seconds = int(h)*3600 + int(m)*60 + int(s)
++                        seconds = int(h)*3600 + int(m)*60 + int(round(float(s)))
+                         self.info("%r %r:%r:%r %r", duration, h, m , s, seconds)
+                         self.__db.set(entry, rhythmdb.PROP_DURATION, seconds)
+ 
diff --git a/audio/rhythmbox/patches/patch-ab b/audio/rhythmbox/patches/patch-ab
new file mode 100644
index 00000000000..74e6f0557ec
--- /dev/null
+++ b/audio/rhythmbox/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.8 2009/07/31 08:50:27 drochner Exp $
+
+--- plugins/audiocd/sj-metadata-musicbrainz3.c.orig	2009-07-23 20:24:18.000000000 +0200
++++ plugins/audiocd/sj-metadata-musicbrainz3.c
+@@ -231,6 +231,8 @@ mb_list_albums (SjMetadata *metadata, ch
+   }
+ 
+   priv->disc = mb_read_disc (priv->cdrom);
++  if (!priv->disc)
++	return NULL;
+   if (url != NULL) {
+     mb_get_submission_url (priv->disc, NULL, 0, buffer, sizeof (buffer));
+     *url = g_strdup (buffer);