update to 0.12.2

changes:
Support for cover art images embedded in song metadata
New plugin that sets your IM status to describe the current playing song
Last.fm submission protocol v1.2 (including the 'now playing' feature)
New status icon plugin
Replaced libglade with GtkBuilder
Switched from playbin to playbin2 when crossfading is disabled, providing
 gapless playback and better support for visualization
-bugfixes
-translation updates

5 files changed, 50 insertions, 75 deletions

diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index c95ac46a8fd..9309ab2b556 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2009/05/26 20:26:58 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2009/06/04 11:44:24 drochner Exp $
 #
 
-DISTNAME=	rhythmbox-0.12.1
+DISTNAME=	rhythmbox-0.12.2
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rhythmbox/0.12/}
 EXTRACT_SUFX=	.tar.bz2
@@ -36,7 +36,6 @@ BUILDLINK_API_DEPENDS.musicbrainz+=	musicbrainz>=2.1.0
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libsexy/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../multimedia/gnome-media/buildlink3.mk"
diff --git a/audio/rhythmbox/PLIST b/audio/rhythmbox/PLIST
index fbe41758fb2..b77b2b8cd01 100644
--- a/audio/rhythmbox/PLIST
+++ b/audio/rhythmbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2009/05/26 18:15:20 drochner Exp $
+@comment $NetBSD: PLIST,v 1.21 2009/06/04 11:44:24 drochner Exp $
 bin/rhythmbox
 bin/rhythmbox-client
 lib/librhythmbox-core.la
@@ -8,6 +8,9 @@ lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyo
 lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.py
 lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyc
 lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyo
+lib/rhythmbox/plugins/artdisplay/EmbeddedCoverArtSearch.py
+lib/rhythmbox/plugins/artdisplay/EmbeddedCoverArtSearch.pyc
+lib/rhythmbox/plugins/artdisplay/EmbeddedCoverArtSearch.pyo
 lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.py
 lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyc
 lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyo
@@ -25,29 +28,29 @@ lib/rhythmbox/plugins/artdisplay/rhythmbox-missing-artwork.svg
 lib/rhythmbox/plugins/audiocd/audiocd-ui.xml
 lib/rhythmbox/plugins/audiocd/audiocd.rb-plugin
 lib/rhythmbox/plugins/audiocd/libaudiocd.la
-lib/rhythmbox/plugins/audiocd/multiple-album.glade
+lib/rhythmbox/plugins/audiocd/multiple-album.ui
 lib/rhythmbox/plugins/audioscrobbler/as-icon.png
-lib/rhythmbox/plugins/audioscrobbler/audioscrobbler-prefs.glade
+lib/rhythmbox/plugins/audioscrobbler/audioscrobbler-prefs.ui
 lib/rhythmbox/plugins/audioscrobbler/audioscrobbler-ui.xml
 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.glade
-lib/rhythmbox/plugins/daap/daap-prefs.glade
+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
 lib/rhythmbox/plugins/daap/libdaap.la
 lib/rhythmbox/plugins/daap/rb-daap-glue.h
-lib/rhythmbox/plugins/dontreallyclose/dontreallyclose.py
-lib/rhythmbox/plugins/dontreallyclose/dontreallyclose.pyc
-lib/rhythmbox/plugins/dontreallyclose/dontreallyclose.pyo
-lib/rhythmbox/plugins/dontreallyclose/dontreallyclose.rb-plugin
 lib/rhythmbox/plugins/generic-player/generic-player-ui.xml
 lib/rhythmbox/plugins/generic-player/generic-player.rb-plugin
 lib/rhythmbox/plugins/generic-player/libgeneric-player.la
-${PLIST.hal}lib/rhythmbox/plugins/ipod/ipod-info.glade
-${PLIST.hal}lib/rhythmbox/plugins/ipod/ipod-init.glade
+lib/rhythmbox/plugins/im-status/__init__.py
+lib/rhythmbox/plugins/im-status/__init__.pyc
+lib/rhythmbox/plugins/im-status/__init__.pyo
+lib/rhythmbox/plugins/im-status/im-status.rb-plugin
+${PLIST.hal}lib/rhythmbox/plugins/ipod/ipod-info.ui
+${PLIST.hal}lib/rhythmbox/plugins/ipod/ipod-init.ui
 ${PLIST.hal}lib/rhythmbox/plugins/ipod/ipod-ui.xml
 ${PLIST.hal}lib/rhythmbox/plugins/ipod/ipod.rb-plugin
 ${PLIST.hal}lib/rhythmbox/plugins/ipod/libipod.la
@@ -55,7 +58,7 @@ lib/rhythmbox/plugins/iradio/iradio-initial.pls
 lib/rhythmbox/plugins/iradio/iradio-ui.xml
 lib/rhythmbox/plugins/iradio/iradio.rb-plugin
 lib/rhythmbox/plugins/iradio/libiradio.la
-lib/rhythmbox/plugins/iradio/station-properties.glade
+lib/rhythmbox/plugins/iradio/station-properties.ui
 lib/rhythmbox/plugins/jamendo/JamendoConfigureDialog.py
 lib/rhythmbox/plugins/jamendo/JamendoConfigureDialog.pyc
 lib/rhythmbox/plugins/jamendo/JamendoConfigureDialog.pyo
@@ -68,8 +71,8 @@ lib/rhythmbox/plugins/jamendo/JamendoSource.pyo
 lib/rhythmbox/plugins/jamendo/__init__.py
 lib/rhythmbox/plugins/jamendo/__init__.pyc
 lib/rhythmbox/plugins/jamendo/__init__.pyo
-lib/rhythmbox/plugins/jamendo/jamendo-loading.glade
-lib/rhythmbox/plugins/jamendo/jamendo-prefs.glade
+lib/rhythmbox/plugins/jamendo/jamendo-loading.ui
+lib/rhythmbox/plugins/jamendo/jamendo-prefs.ui
 lib/rhythmbox/plugins/jamendo/jamendo.rb-plugin
 lib/rhythmbox/plugins/jamendo/jamendo_logo.png
 lib/rhythmbox/plugins/jamendo/jamendo_logo_medium.png
@@ -97,7 +100,7 @@ lib/rhythmbox/plugins/lyrics/WinampcnParser.pyo
 lib/rhythmbox/plugins/lyrics/__init__.py
 lib/rhythmbox/plugins/lyrics/__init__.pyc
 lib/rhythmbox/plugins/lyrics/__init__.pyo
-lib/rhythmbox/plugins/lyrics/lyrics-prefs.glade
+lib/rhythmbox/plugins/lyrics/lyrics-prefs.ui
 lib/rhythmbox/plugins/lyrics/lyrics.rb-plugin
 lib/rhythmbox/plugins/magnatune/BuyAlbumHandler.py
 lib/rhythmbox/plugins/magnatune/BuyAlbumHandler.pyc
@@ -111,9 +114,9 @@ lib/rhythmbox/plugins/magnatune/TrackListHandler.pyo
 lib/rhythmbox/plugins/magnatune/__init__.py
 lib/rhythmbox/plugins/magnatune/__init__.pyc
 lib/rhythmbox/plugins/magnatune/__init__.pyo
-lib/rhythmbox/plugins/magnatune/magnatune-loading.glade
-lib/rhythmbox/plugins/magnatune/magnatune-prefs.glade
-lib/rhythmbox/plugins/magnatune/magnatune-purchase.glade
+lib/rhythmbox/plugins/magnatune/magnatune-loading.ui
+lib/rhythmbox/plugins/magnatune/magnatune-prefs.ui
+lib/rhythmbox/plugins/magnatune/magnatune-purchase.ui
 lib/rhythmbox/plugins/magnatune/magnatune.rb-plugin
 lib/rhythmbox/plugins/magnatune/magnatune_logo_color_small.png
 lib/rhythmbox/plugins/magnatune/magnatune_logo_color_tiny.png
@@ -134,6 +137,10 @@ 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/status-icon/libstatus-icon.la
+lib/rhythmbox/plugins/status-icon/status-icon-preferences.ui
+lib/rhythmbox/plugins/status-icon/status-icon-ui.xml
+lib/rhythmbox/plugins/status-icon/status-icon.rb-plugin
 lib/rhythmbox/plugins/upnp_coherence/MediaPlayer.py
 lib/rhythmbox/plugins/upnp_coherence/MediaPlayer.pyc
 lib/rhythmbox/plugins/upnp_coherence/MediaPlayer.pyo
@@ -149,7 +156,7 @@ lib/rhythmbox/plugins/upnp_coherence/__init__.pyo
 lib/rhythmbox/plugins/upnp_coherence/coherence.rb-plugin
 lib/rhythmbox/plugins/visualizer/libvisualizer.la
 lib/rhythmbox/plugins/visualizer/rb-visualizer-glue.h
-lib/rhythmbox/plugins/visualizer/visualizer-controls.glade
+lib/rhythmbox/plugins/visualizer/visualizer-controls.ui
 lib/rhythmbox/plugins/visualizer/visualizer-ui.xml
 lib/rhythmbox/plugins/visualizer/visualizer.rb-plugin
 libexec/rhythmbox-metadata
@@ -192,7 +199,6 @@ share/doc/rhythmbox/RBSourceList.html
 share/doc/rhythmbox/RBSourceListModel.html
 share/doc/rhythmbox/RBStatusbar.html
 share/doc/rhythmbox/RBStringValueMap.html
-share/doc/rhythmbox/RBTrayIcon.html
 share/doc/rhythmbox/RBURIDialog.html
 share/doc/rhythmbox/RhythmDB.html
 share/doc/rhythmbox/RhythmDBImportJob.html
@@ -213,10 +219,10 @@ share/doc/rhythmbox/rhythmbox-RBPodcastSource.html
 share/doc/rhythmbox/rhythmbox-RBSourceGroup.html
 share/doc/rhythmbox/rhythmbox-eel-gconf-extensions.html
 share/doc/rhythmbox/rhythmbox-rb-async-queue-watch.html
+share/doc/rhythmbox/rhythmbox-rb-builder-helpers.html
 share/doc/rhythmbox/rhythmbox-rb-debug.html
 share/doc/rhythmbox/rhythmbox-rb-dialog.html
 share/doc/rhythmbox/rhythmbox-rb-file-helpers.html
-share/doc/rhythmbox/rhythmbox-rb-glade-helpers.html
 share/doc/rhythmbox/rhythmbox-rb-header.html
 share/doc/rhythmbox/rhythmbox-rb-rating-helper.html
 share/doc/rhythmbox/rhythmbox-rb-removable-media-source.html
@@ -409,6 +415,7 @@ share/icons/hicolor/24x24/apps/rhythmbox.png
 share/icons/hicolor/32x32/apps/rhythmbox.png
 share/icons/hicolor/48x48/apps/rhythmbox.png
 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/az/LC_MESSAGES/rhythmbox.mo
@@ -431,6 +438,7 @@ share/locale/fi/LC_MESSAGES/rhythmbox.mo
 share/locale/fr/LC_MESSAGES/rhythmbox.mo
 share/locale/ga/LC_MESSAGES/rhythmbox.mo
 share/locale/gl/LC_MESSAGES/rhythmbox.mo
+share/locale/gu/LC_MESSAGES/rhythmbox.mo
 share/locale/he/LC_MESSAGES/rhythmbox.mo
 share/locale/hi/LC_MESSAGES/rhythmbox.mo
 share/locale/hr/LC_MESSAGES/rhythmbox.mo
@@ -483,18 +491,8 @@ share/omf/rhythmbox/rhythmbox-oc.omf
 share/omf/rhythmbox/rhythmbox-ru.omf
 share/omf/rhythmbox/rhythmbox-sv.omf
 share/omf/rhythmbox/rhythmbox-zh_CN.omf
-share/rhythmbox/glade/create-playlist.glade
-share/rhythmbox/glade/general-prefs.glade
-share/rhythmbox/glade/library-prefs.glade
-share/rhythmbox/glade/playback-prefs.glade
-share/rhythmbox/glade/playlist-save.glade
-share/rhythmbox/glade/plugins.glade
-share/rhythmbox/glade/podcast-feed-properties.glade
-share/rhythmbox/glade/podcast-prefs.glade
-share/rhythmbox/glade/podcast-properties.glade
-share/rhythmbox/glade/song-info-multiple.glade
-share/rhythmbox/glade/song-info.glade
-share/rhythmbox/glade/uri-new.glade
+share/rhythmbox/create-playlist.ui
+share/rhythmbox/general-prefs.ui
 share/rhythmbox/icons/hicolor/16x16/actions/audio-cd-duplicate.png
 share/rhythmbox/icons/hicolor/16x16/actions/audio-cd-duplicate.svg
 share/rhythmbox/icons/hicolor/16x16/actions/audio-cd-new.png
@@ -548,8 +546,18 @@ share/rhythmbox/icons/hicolor/scalable/places/library-internet-radio.svg
 share/rhythmbox/icons/hicolor/scalable/places/playlist-automatic.svg
 share/rhythmbox/icons/hicolor/scalable/places/playlist.svg
 share/rhythmbox/icons/hicolor/scalable/status/rhythmbox-notplaying.svg
+share/rhythmbox/library-prefs.ui
+share/rhythmbox/playback-prefs.ui
+share/rhythmbox/playlist-save.ui
 share/rhythmbox/playlists.xml
+share/rhythmbox/plugins.ui
+share/rhythmbox/podcast-feed-properties.ui
+share/rhythmbox/podcast-prefs.ui
+share/rhythmbox/podcast-properties.ui
 share/rhythmbox/rhythmbox-ui.xml
+share/rhythmbox/song-info-multiple.ui
+share/rhythmbox/song-info.ui
+share/rhythmbox/uri-new.ui
 @dirrm share/rhythmbox/icons/hicolor/scalable/status
 @dirrm share/rhythmbox/icons/hicolor/scalable/places
 @dirrm share/rhythmbox/icons/hicolor/scalable/actions
@@ -570,7 +578,6 @@ share/rhythmbox/rhythmbox-ui.xml
 @dirrm share/rhythmbox/icons/hicolor/16x16
 @dirrm share/rhythmbox/icons/hicolor
 @dirrm share/rhythmbox/icons
-@dirrm share/rhythmbox/glade
 @dirrm share/rhythmbox
 @dirrm share/omf/rhythmbox
 @comment in rarian: @dirrm share/omf
@@ -613,6 +620,7 @@ share/rhythmbox/rhythmbox-ui.xml
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/rhythmbox/plugins/visualizer
 @dirrm lib/rhythmbox/plugins/upnp_coherence
+@dirrm lib/rhythmbox/plugins/status-icon
 @dirrm lib/rhythmbox/plugins/rb
 @dirrm lib/rhythmbox/plugins/python-console
 @dirrm lib/rhythmbox/plugins/power-manager
@@ -622,11 +630,12 @@ share/rhythmbox/rhythmbox-ui.xml
 @dirrm lib/rhythmbox/plugins/jamendo
 @dirrm lib/rhythmbox/plugins/iradio
 ${PLIST.hal}@dirrm lib/rhythmbox/plugins/ipod
+@dirrm lib/rhythmbox/plugins/im-status
 @dirrm lib/rhythmbox/plugins/generic-player
-@dirrm lib/rhythmbox/plugins/dontreallyclose
 @dirrm lib/rhythmbox/plugins/daap
 @dirrm lib/rhythmbox/plugins/cd-recorder
 @dirrm lib/rhythmbox/plugins/audioscrobbler
 @dirrm lib/rhythmbox/plugins/audiocd
 @dirrm lib/rhythmbox/plugins/artdisplay
 @dirrm lib/rhythmbox/plugins
+@dirrm lib/rhythmbox
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index 7fc42d94d70..0e187d90888 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.27 2009/05/26 20:23:50 wiz Exp $
+$NetBSD: distinfo,v 1.28 2009/06/04 11:44:24 drochner Exp $
 
-SHA1 (rhythmbox-0.12.1.tar.bz2) = e4360e67aad41adb2dbad0a13c508638de4dfa6c
-RMD160 (rhythmbox-0.12.1.tar.bz2) = 72964294d2bd8353c86a0f57bde7d7f37db88f41
-Size (rhythmbox-0.12.1.tar.bz2) = 4859015 bytes
-SHA1 (patch-aa) = c14ddcb59c473de0dcc1e180a8d9d47dc56aca59
-SHA1 (patch-ad) = 3e7807039a301fa849cd75a066a5931d2a700cee
+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
diff --git a/audio/rhythmbox/patches/patch-aa b/audio/rhythmbox/patches/patch-aa
deleted file mode 100644
index 0acc1a6dee4..00000000000
--- a/audio/rhythmbox/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2009/05/26 20:23:50 wiz Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=583926
-
---- plugins/cd-recorder/rb-recorder-gst.c.orig	2007-02-24 18:27:43.000000000 -0500
-+++ plugins/cd-recorder/rb-recorder-gst.c
-@@ -26,7 +26,9 @@
- #include <string.h>
- #include <math.h>
- #include <time.h>
-+#ifdef __linux__
- #include <sys/vfs.h>
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
diff --git a/audio/rhythmbox/patches/patch-ad b/audio/rhythmbox/patches/patch-ad
deleted file mode 100644
index 85fc05a867d..00000000000
--- a/audio/rhythmbox/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2009/05/26 20:23:50 wiz Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=583938
-
---- configure.orig	2009-04-28 09:40:11.000000000 +0200
-+++ configure
-@@ -20242,7 +20242,7 @@ $as_echo "$as_me: error: HAL support exp
-    { (exit 1); exit 1; }; }
-   fi
- 
--  if test "x$enable_hal" == "xyes"; then
-+  if test "x$enable_hal" = "xyes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_HAL 1