Update to 2.3.1:

Changes

    * Improved responsiveness when expanding/collapsing items in the collection browser when using single-click mode.
    * The Collection scanner now runs with idle priority when invoked by Amarok. Batch scan users can invoke it with the --idlepriority flag.

Bugfixes

    * File browser: fixed sorting files by date. (BR 226941)
    * Fixed issue with file browser bookmarks not working when the file browser was showing "places".
    * Fixed crash when right clicking in file browser while it is showing "Places". (BR 237562)
    * Fixed strange selection behaviour in the music sources pane (BR 222760).
    * Fixed factor used when filtering lengths in collection browser.
    * Fixed wrong value used when filtering comments in collection browser.
    * Don't truncate the "Label:" label in the TagDialog. (BR 235957)
    * Display extended characters properly in names of Last.fm streams. (BR 222930)
    * Cover fetcher: prevent automatic fetcher from setting album's cover if it is done manually during the download. (BR 236839)
    * File browser: show folders first, files afterwards. Patch by <dystopticus@gmx.net>. (BR 226599)
    * Queued track's contextual menu entry about dequeueing was written wrong and misleading. (BR 235047)
    * Custom color setting in the On Screen Display was only applied after restart. Patch by Frank Steinmetzger <Warp_7@gmx.de>.
    * Track Rating was not always displayed correctly in the On Screen Display. Patch by Frank Steinmetzger <Warp_7@gmx.de>.
    * Improved layout for applet setting dialogs. Patch by Felix Geyer <debfx-kde@fobos.de>.
    * Made icons in applets react correctly in double-click environments. Thanks to Felix Geyer <debfx-kde@fobos.de>.
    * Several bug fixes for the bundled LyricWiki script. Patch by Oleg G <verdrehung@gmail.com>. (BR 233605)
    * Better fix for pausing SHOUTcast streams, without advancing to the next track after resume. (BR 192878)

Version 2.3.1-Beta 1
Features

    * Persistant Queue Saving: The playlist queue is now saved when Amarok is closed and restored upon startup. (BR 215057)
    * Automated Playlist Generator: allows smart creation of playlists that match user-specified constraints. Combines the features of "Smart Playlists" in Amarok 1.4 with the Bias system of Amarok 2.0.
    * It's now possible to mark all episodes in a channel as old or new at once.
    * New "Upcoming Events" applet, displays future concerts for the artist of the currently playing track. The event info is fetched from Last.fm.
    * New "Similar Artists" applet, displays a list of artists which are similar to the one currently played. The list is fetched from Last.fm.
    * The scripting system now offers a new function for detecting that a track has finished. Patch by Michael MacDonald <mars@antlersoft.com>. (BR 227312)
    * Support for the new System Tray technology from KDE SC 4.4. This adds nice animations and a better looking popup menu to the System Tray. Thanks to Aurelien Gateau <agateau@kde.org> for the patch.
    * Allow playlist layouts to group tracks by directory. (BR 230594)
    * Cover fetcher: The UI was improved. Now an icon view is used to display results, with an informational sidebar that may show interesting bits about an image.
    * Cover fetcher: Added ability to enter custom queries via Yahoo!, Google, or Discogs (in addition to Lasf.Fm). Note the source for automatic cover fetching is still Last.fm only.

Changes

    * Allow changing the number of recently added albums in the albums applet.
    * Magnatune.com store: Added "Home" link to all artist and album pages leading to the Magnatune.com front page.
    * Magnatune.com store: Improved Magnatune.com front page.
    * Magnatune.com store: Completely remove option to purhcase single albums as this is no longer supported by Magnatune.com and the API for doing so will be disabled in the future.
    * The new file browser now supports "places".
    * Added "up" and "home" buttons to the new filebrowser.
    * Items in the breadcrumb navigation bar are now hidden if there is not enough room to show all of them (similar to how it works in Dolphin) (BR 231497)
    * Improved performance (dramatic in some cases) when filtering the Playlist (231185).
    * Remove information that is already displayed elsewhere in the playlist from the playlist tooltips.
    * Make showing the playlist tooltips a per playlist layout option.
    * When bookmarking a view in the local collection, also store (and restore) the setings for "Show Cover Art" and "Show Years". (BR 230562)
    * Allow moodbar files witout the leading '.' (both .<trackfilename>.mood and <trackfilename>.mood now work)
    * Change example SQL command for setting up an external database to remove (sometimes incorrect) host name and possibly fix some random regression in some MySQL versions. (BR 225052)

Bugfixes

    * Fixed Youtube videoclip broken engine due to their recent change.
    * Fixed Wikipedia no loading the css on KDE 4.4 (due to a regression in Qt 4.6.) (BR 222875)
    * Settings dialog could become too wide with translations. (BR 233752)
    * Fixed re-mounting iPhoneOS devices after having been unplugged without being unmounted. Thanks to Jeffrey Dodge <hazridi@gmail.com>. (BR 233305)
    * Fixed connection to iPod Touch devices. Patch by Jeffrey Dodge <hazridi@gmail.com>. (BR 233257)
    * Fixed the deletion of empty directories after deleting, or organizing. (BR 190881)
    * Fixed a hang that would occur when organizing a track and the source file was the same as the destination file. (BR 233181)
    * Fixed the double delete confirmation dialog when organizing tracks. (BR 233200)
    * Fixed broken rendering of ratings in Current Track applet on startup.
    * Fixed command type names shown in the Bookmark Manager not being translated. (BR 226829)
    * Fixed crash on startup for users of MySQL 5.5. Thanks to Bartosz Fabianowski for figuring it out. (BR 231166)
    * Readded missing hover info for the new filebrowser.
    * Fixed missing images in the hover info shown for various browser categories.
    * Fixed crash when running some Amarok urls on startup. (such as when passed on the command line or cliked in another app) (BR 231626)
    * Fixed crashes when Amarok is started and the Info applet is loaded with certain version of Qt. (BR 227639) (BR 229756)
    * Fixed organize collection dialog deleting tracks at new location instead of old. (BR 217002)
    * Fixed a broken podcast feed that had a minor compliance issue in date format. (BR 231062)
    * Fixed "files" bookmarks not storing the actual path shown in the file browser (BR 231437)
    * Fixed incorrectly displayed cover images for albums with the same name, e.g. "Greatest Hits". (BR 170146)
    * Fixed problems with new Main Toolbar and SHOUTcast streams: Since these streams cannot be paused, we detect this now and stop them instead.
    * Fixed permission errors with each file copied to an iPhone via iFuse. Thanks to Colin Guthrie <cguthrie@mandriva.org> for the patch. (BR 231021)
    * Fixed issues with using random navigators while filetering or searching the Playlist. (BR 229226) (BR 222129)
    * Fixed crash related to the new playlist tooltips. (BR 229696)
    * Fixed some artist/album/track names not getting shown or getting shown incorrectly in the Current Track applet because of html encoding. (BR 222765)
    * Fixed issue with the Albums applet not correctly updating when playing a track by an artist not present in the local collection.
    * Fixed Albums applet not getting updated if the artist of the currently playing track was edited. (BR 210296)
    * Fixed bad window title for the details edit dialog in the playlist layout editor. (BR 227912)
    * Fixed wrong track getting dragged from the Playlist when sorting and/or filtering is active. (BR 226503)
    * Fixed visual indication for "Stop After This Track" not getting shown immediately when using the global shortcut. (BR 230569)
    * Cover fetcher: Fixed a crash involving reappearing cover found dialogs and pending cover fetches. (BR 230215)
    * Display tooltips with applet names in the context toolbar. (BR 230736)
    * File browser: "Add to Playlist" doesn't add playlist files to the playlist. (BR 229290)

6 files changed, 49 insertions, 91 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 20aecdb6f31..eb1e1836c9a 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2010/06/13 22:43:47 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2010/06/13 23:39:26 wiz Exp $
 #
 
 DISTNAME=	amarok-${VERS}
-VERS=		2.3.0
-PKGREVISION=	3
+VERS=		2.3.1
 CATEGORIES=	audio multimedia
 #MASTER_SITES=	http://download.kde.org/unstable/amarok/${VERS}/src/ \
 #		ftp://gd.tuwien.ac.at/kde/unstable/amarok/${VERS}/src/
@@ -35,7 +34,7 @@ SUBST_CLASSES+=		mysql
 SUBST_STAGE.mysql=	post-patch
 SUBST_MESSAGE.mysql=	Fixup paths for MySQL embedded
 SUBST_FILES.mysql=	cmake/modules/FindMySQLAmarok.cmake
-SUBST_FILES.mysql+=	src/collection/sqlcollection/mysqlecollection/CMakeLists.txt
+SUBST_FILES.mysql+=	src/core-impl/collections/sqlcollection/mysqlecollection/CMakeLists.txt
 SUBST_SED.mysql=	-e s:/opt/mysqle/:${BUILDLINK_PREFIX.mysql-server}:
 SUBST_SED.mysql+=	-e s:@@WLR@@:${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-server}/lib/mysql:
 
diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST
index d503ec8dfc8..6e24c15311c 100644
--- a/audio/amarok/PLIST
+++ b/audio/amarok/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2010/04/10 02:49:36 markd Exp $
+@comment $NetBSD: PLIST,v 1.35 2010/06/13 23:39:26 wiz Exp $
 bin/amarok
 bin/amarok_afttagger
 bin/amarokcollectionscanner
@@ -18,12 +18,16 @@ lib/kde4/amarok_context_applet_currenttrack.so
 lib/kde4/amarok_context_applet_info.so
 lib/kde4/amarok_context_applet_lyrics.so
 lib/kde4/amarok_context_applet_photos.so
+lib/kde4/amarok_context_applet_similarArtists.so
+lib/kde4/amarok_context_applet_upcomingEvents.so
 lib/kde4/amarok_context_applet_videoclip.so
 lib/kde4/amarok_context_applet_wikipedia.so
 lib/kde4/amarok_data_engine_current.so
 lib/kde4/amarok_data_engine_info.so
 lib/kde4/amarok_data_engine_lyrics.so
 lib/kde4/amarok_data_engine_photos.so
+lib/kde4/amarok_data_engine_similarArtists.so
+lib/kde4/amarok_data_engine_upcomingEvents.so
 lib/kde4/amarok_data_engine_videoclip.so
 lib/kde4/amarok_data_engine_wikipedia.so
 lib/kde4/amarok_massstorage-device.so
@@ -41,6 +45,9 @@ lib/kde4/kcm_amarok_service_mp3tunes.so
 lib/libamarok-sqlcollection.so
 lib/libamarok-sqlcollection.so.1
 lib/libamarok-sqlcollection.so.1.0.0
+lib/libamarokcore.so
+lib/libamarokcore.so.1
+lib/libamarokcore.so.1.0.0
 lib/libamaroklib.so
 lib/libamaroklib.so.1
 lib/libamaroklib.so.1.0.0
@@ -143,6 +150,7 @@ share/kde/apps/amarok/icons/hicolor/16x16/actions/media-track-queue-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/media-track-remove-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/media-track-repeat-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/music-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/playlist-generator.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/podcast-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/preferences-indicator-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/preferences-media-playback-amarok.png
@@ -202,6 +210,7 @@ share/kde/apps/amarok/icons/hicolor/22x22/actions/media-track-queue-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/media-track-remove-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/media-track-repeat-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/music-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/playlist-generator.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/podcast-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/preferences-indicator-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/preferences-media-playback-amarok.png
@@ -262,6 +271,7 @@ share/kde/apps/amarok/icons/hicolor/32x32/actions/media-track-queue-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/media-track-remove-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/media-track-repeat-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/music-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/playlist-generator.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/podcast-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/preferences-indicator-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/preferences-media-playback-amarok.png
@@ -345,12 +355,15 @@ share/kde/apps/amarok/icons/hicolor/48x48/actions/media-track-remove-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/media-track-repeat-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/music-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/photos-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/playlist-generator.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/podcast-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/preferences-indicator-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/preferences-media-playback-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/preferences-multimedia-player-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/preferences-view-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/remove-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/similarartists-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/upcomingevents-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/videoclip-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/view-media-visualization-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-ampache-amarok.png
@@ -402,6 +415,10 @@ share/kde/apps/amarok/images/info_frontpage_bg.png
 share/kde/apps/amarok/images/info_frontpage_logo.png
 share/kde/apps/amarok/images/info_frontpage_shadow.png
 share/kde/apps/amarok/images/lastfm-default-cover.png
+share/kde/apps/amarok/images/likeback_bug.png
+share/kde/apps/amarok/images/likeback_dislike.png
+share/kde/apps/amarok/images/likeback_feature.png
+share/kde/apps/amarok/images/likeback_like.png
 share/kde/apps/amarok/images/loading1.png
 share/kde/apps/amarok/images/loading2.png
 share/kde/apps/amarok/images/navigation_arrows.svg
@@ -465,12 +482,16 @@ share/kde4/services/amarok-context-applet-currenttrack.desktop
 share/kde4/services/amarok-context-applet-info.desktop
 share/kde4/services/amarok-context-applet-lyrics.desktop
 share/kde4/services/amarok-context-applet-photos.desktop
+share/kde4/services/amarok-context-applet-similarArtists.desktop
+share/kde4/services/amarok-context-applet-upcomingEvents.desktop
 share/kde4/services/amarok-context-applet-videoclip.desktop
 share/kde4/services/amarok-context-applet-wikipedia.desktop
 share/kde4/services/amarok-data-engine-current.desktop
 share/kde4/services/amarok-data-engine-info.desktop
 share/kde4/services/amarok-data-engine-lyrics.desktop
 share/kde4/services/amarok-data-engine-photos.desktop
+share/kde4/services/amarok-data-engine-similarArtists.desktop
+share/kde4/services/amarok-data-engine-upcomingEvents.desktop
 share/kde4/services/amarok-data-engine-videoclip.desktop
 share/kde4/services/amarok-data-engine-wikipedia.desktop
 share/kde4/services/amarok-scriptengine-applet-simple-javascript.desktop
@@ -538,7 +559,6 @@ share/locale/et/LC_MESSAGES/amarok.mo
 share/locale/et/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/et/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/et/LC_MESSAGES/amarokpkg.mo
-share/locale/fi/LC_MESSAGES/amarok.mo
 share/locale/fr/LC_MESSAGES/amarok.mo
 share/locale/fr/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/fr/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -551,6 +571,11 @@ share/locale/it/LC_MESSAGES/amarok.mo
 share/locale/it/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/it/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/it/LC_MESSAGES/amarokpkg.mo
+share/locale/ja/LC_MESSAGES/amarok.mo
+share/locale/lt/LC_MESSAGES/amarok.mo
+share/locale/lt/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/lt/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/lt/LC_MESSAGES/amarokpkg.mo
 share/locale/lv/LC_MESSAGES/amarok.mo
 share/locale/lv/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/lv/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -563,10 +588,6 @@ share/locale/nds/LC_MESSAGES/amarok.mo
 share/locale/nds/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/nds/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/nds/LC_MESSAGES/amarokpkg.mo
-share/locale/nl/LC_MESSAGES/amarok.mo
-share/locale/nl/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/nl/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/nl/LC_MESSAGES/amarokpkg.mo
 share/locale/pa/LC_MESSAGES/amarok.mo
 share/locale/pa/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/pa/LC_MESSAGES/amarokpkg.mo
@@ -582,10 +603,6 @@ share/locale/pt_BR/LC_MESSAGES/amarok.mo
 share/locale/pt_BR/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/pt_BR/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/pt_BR/LC_MESSAGES/amarokpkg.mo
-share/locale/ro/LC_MESSAGES/amarok.mo
-share/locale/ro/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/ro/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/ro/LC_MESSAGES/amarokpkg.mo
 share/locale/ru/LC_MESSAGES/amarok.mo
 share/locale/ru/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/ru/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -606,13 +623,20 @@ share/locale/sr@ijekavian/LC_MESSAGES/amarok.mo
 share/locale/sr@ijekavian/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/sr@ijekavian/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/sr@ijekavian/LC_MESSAGES/amarokpkg.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/amarok.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/sr@ijekavianlatin/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/amarokpkg.mo
+share/locale/sr@latin/LC_MESSAGES/amarok.mo
+share/locale/sr@latin/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/sr@latin/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/sr@latin/LC_MESSAGES/amarokpkg.mo
 share/locale/sv/LC_MESSAGES/amarok.mo
 share/locale/sv/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/sv/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/sv/LC_MESSAGES/amarokpkg.mo
 share/locale/th/LC_MESSAGES/amarok.mo
+share/locale/th/LC_MESSAGES/amarokpkg.mo
 share/locale/tr/LC_MESSAGES/amarok.mo
 share/locale/tr/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/tr/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -621,9 +645,11 @@ share/locale/uk/LC_MESSAGES/amarok.mo
 share/locale/uk/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/uk/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/uk/LC_MESSAGES/amarokpkg.mo
-share/locale/wa/LC_MESSAGES/amarok.mo
-share/locale/wa/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/zh_CN/LC_MESSAGES/amarok.mo
 share/locale/zh_CN/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/zh_CN/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/zh_CN/LC_MESSAGES/amarokpkg.mo
+share/locale/zh_TW/LC_MESSAGES/amarok.mo
+share/locale/zh_TW/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/zh_TW/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/zh_TW/LC_MESSAGES/amarokpkg.mo
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 3740ede86e4..ec76cbbb63f 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.40 2010/04/16 13:49:29 wiz Exp $
+$NetBSD: distinfo,v 1.41 2010/06/13 23:39:26 wiz Exp $
 
-SHA1 (amarok-2.3.0.tar.bz2) = 64856a21907d1ba7d198149a8a46276fc4cda7a6
-RMD160 (amarok-2.3.0.tar.bz2) = ff2a7cea8ffbd0e6b08a9b37ab7529e1b1d43a37
-Size (amarok-2.3.0.tar.bz2) = 9391281 bytes
-SHA1 (patch-aa) = 8d4ceda127a7932cce35b2d0308fb3e555bc84d6
-SHA1 (patch-ab) = 91e6bf8a84d63832641b6270c6f5215baa8f139e
-SHA1 (patch-ac) = cb03c67a811280eafcdb74f4211648cb171edc03
+SHA1 (amarok-2.3.1.tar.bz2) = 00a596384df8d155b91b40bb2484ec0a7f51da80
+RMD160 (amarok-2.3.1.tar.bz2) = 70e581bd681361d7837f1ed295191174e92e9f8f
+Size (amarok-2.3.1.tar.bz2) = 9823411 bytes
+SHA1 (patch-ab) = 7ce50979a50448ffc645a281083105aa8b7fd723
diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa
deleted file mode 100644
index 48a871c895e..00000000000
--- a/audio/amarok/patches/patch-aa
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-aa,v 1.17 2010/04/16 13:49:29 wiz Exp $
-
-Upstream patch for Info applet crash.
-
---- src/context/applets/info/InfoApplet.cpp.orig	2010-03-10 23:12:15.000000000 +0000
-+++ src/context/applets/info/InfoApplet.cpp
-@@ -40,18 +40,30 @@ QString InfoApplet::s_defaultHtml = "<ht
- 
- InfoApplet::InfoApplet( QObject* parent, const QVariantList& args )
-     : Context::Applet( parent, args )
-+    , m_webView( 0 )
-     , m_initialized( false )
-     , m_currentPlaylist( 0 )
-+   
- {
-     setHasConfigurationInterface( false );
-     setBackgroundHints( Plasma::Applet::NoBackground );
-+}
-+
-+InfoApplet::~InfoApplet()
-+{
-+    delete m_webView;
-+}
-+
-+
-+void  InfoApplet::init()
-+{
- 
-     dataEngine( "amarok-info" )->connectSource( "info", this );
- 
-     m_webView = new AmarokWebView( this );
- 
-     resize( 500, -1 );
--    
-+
-     QPalette p = m_webView->palette();
-     p.setColor( QPalette::Dark, QColor( 255, 255, 255, 0)  );
-     p.setColor( QPalette::Window, QColor( 255, 255, 255, 0)  );
-@@ -62,11 +74,6 @@ InfoApplet::InfoApplet( QObject* parent,
-     constraintsEvent();
- }
- 
--InfoApplet::~InfoApplet()
--{
--    delete m_webView;
--}
--
- void InfoApplet::constraintsEvent( Plasma::Constraints constraints )
- {
-     Q_UNUSED( constraints )
diff --git a/audio/amarok/patches/patch-ab b/audio/amarok/patches/patch-ab
index 6fff12da192..78b5feefb8b 100644
--- a/audio/amarok/patches/patch-ab
+++ b/audio/amarok/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2010/03/16 19:28:50 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2010/06/13 23:39:26 wiz Exp $
 
---- src/collection/sqlcollection/mysqlecollection/CMakeLists.txt.orig	2010-03-10 23:12:15.000000000 +0000
-+++ src/collection/sqlcollection/mysqlecollection/CMakeLists.txt
+--- src/core-impl/collections/sqlcollection/mysqlecollection/CMakeLists.txt.orig	2010-03-10 23:12:15.000000000 +0000
++++ src/core-impl/collections/sqlcollection/mysqlecollection/CMakeLists.txt
 @@ -49,6 +49,7 @@ if(APPLE)
  	SET_TARGET_PROPERTIES(amarok_collection-mysqlecollection PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
  endif(APPLE)
diff --git a/audio/amarok/patches/patch-ac b/audio/amarok/patches/patch-ac
deleted file mode 100644
index d26c8ee966d..00000000000
--- a/audio/amarok/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2010/04/16 13:49:29 wiz Exp $
-
-Upstream patch for Info applet crash.
-
---- src/context/applets/info/InfoApplet.h.orig	2010-03-10 23:12:15.000000000 +0000
-+++ src/context/applets/info/InfoApplet.h
-@@ -48,6 +48,8 @@ public:
-     InfoApplet( QObject* parent, const QVariantList& args );
-     virtual ~InfoApplet();
- 
-+    void init();
-+
-     void paintInterface( QPainter *painter, const QStyleOptionGraphicsItem *option, const QRect &contentsRect );
-     void constraintsEvent( Plasma::Constraints constraints = Plasma::AllConstraints );
-