[pkgsrc/trunk]: pkgsrc/audio/amarok Update to 2.5.0

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/23eb75da43b4
branches:  trunk
changeset: 601296:23eb75da43b4
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Mar 20 10:28:29 2012 +0000

description:
Update to 2.5.0

Version 2.5
  FEATURES:
    * Now It's possible to use formated strings for prefix and suffix in
      Playlist's layout items.

  BUGFIXES:
    * Do not crash when iPod doesn't have a master playlist. (BR 288936)
    * Fix Last.fm not finding KDE Wallet. (BR 286741)
    * Put a border around bottom toolbars, visually separating them from
      browser contents. (BR 277741)
    * Align the bottom toolbars.
    * Allow albums with empty name but nonempty artist in local collection.
    * Fix collection info display (track count, free space) for iPod and MTP
      devices. (BR 232093)
    * Fix crash at exit with Qt 4.8
    * Fix moving applets rightward in the context toolbar.
    * Fix breadcrumbs not working properly for the file browser.
    * Disable cover fetching action for tracks not in the collection to avoid
      crash when trying to "save as" a cover. (BR 287604)
    * Show default cover in tag dialog when track is not in the collection.
    * Fix directory selection when opening album location in tag dialog.
    * Fix crash in CoverFoundDialog if progress dialog is cancelled just
      before fetch is done.
    * Correctly parse disambiguation pages for songs in the English Wikipedia.
    * Fix wrong context view applets sizes on start up in some cases.
    * Fix Amarok consuming CPU until main window is shown. (BR 278897)
    * Fix last.fm 'scrobble composer' option's fallback to artist (BR 286215)
    * Fix volume control from within Amarok.
    * Fix slow startup because of imported playlists. (BR 284761)
    * Fix audio CD detection on Amarok start. (BR 276032)
    * Set a default filename scheme for USB Mass Storage (BR 285900)
    * Fixed crash during MusicBrainz search. (BR 277475)

  CHANGES:
    * Load Last.fm friend/neighbour avatars on demand.
    * Update tracks in the recently played widget only when needed.
    * Allow editing the SearchWidget during a search animation.
    * Update the collection view while UMS is scanning.
    * Don't block the UI while scanning UMS device.
    * Allow going back and forward in Amazon store. Thanks to GCI student
      Nikola Miljkovic.

diffstat:

 audio/amarok/Makefile                                                              |    9 +-
 audio/amarok/PLIST                                                                 |  753 ++++++++-
 audio/amarok/distinfo                                                              |   14 +-
 audio/amarok/patches/patch-CMakeLists.txt                                          |   16 -
 audio/amarok/patches/patch-cmake_modules_FindTagLib.cmake                          |   29 +
 audio/amarok/patches/patch-src_context_widgets_RatingWidget.cpp                    |   13 +
 audio/amarok/patches/patch-src_dialogs_TagDialogBase.ui                            |   13 +
 audio/amarok/patches/patch-src_playlist_view_listview_PrettyItemDelegate.cpp       |   13 +
 audio/amarok/patches/patch-src_playlistgenerator_constraints_TagMatchEditWidget.ui |   13 +
 9 files changed, 757 insertions(+), 116 deletions(-)

diffs (truncated from 1249 to 300 lines):

diff -r 9c5db961bab4 -r 23eb75da43b4 audio/amarok/Makefile
--- a/audio/amarok/Makefile     Tue Mar 20 10:27:00 2012 +0000
+++ b/audio/amarok/Makefile     Tue Mar 20 10:28:29 2012 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.105 2012/03/03 00:12:36 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2012/03/20 10:28:29 markd Exp $
 #
 
 DISTNAME=      amarok-${VERS}
-VERS=          2.4.0
-PKGREVISION=   8
+VERS=          2.5.0
 CATEGORIES=    audio multimedia
 MASTER_SITES=  ftp://ftp.kde.org/pub/kde/stable/amarok/${VERS}/src/
 EXTRACT_SUFX=  .tar.bz2
@@ -18,7 +17,6 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 USE_TOOLS+=    msgfmt pkg-config
 
@@ -55,6 +53,7 @@
 BUILDLINK_API_DEPENDS.taglib+= taglib>=1.6nb1
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../audio/taglib-extras/buildlink3.mk"
+.include "../../devel/qjson/buildlink3.mk"
 .include "../../devel/qtscriptgenerator/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../meta-pkgs/kde4/kde4.mk"
@@ -63,7 +62,7 @@
 .include "../../security/qca2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 # for plasma
-.include "../../x11/kdebase-workspace4/buildlink3.mk"
+.include "../../x11/kde-workspace4/buildlink3.mk"
 BUILDLINK_API_DEPENDS.kdelibs+=        kdelibs4>=4.5.0
 .include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 9c5db961bab4 -r 23eb75da43b4 audio/amarok/PLIST
--- a/audio/amarok/PLIST        Tue Mar 20 10:27:00 2012 +0000
+++ b/audio/amarok/PLIST        Tue Mar 20 10:28:29 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2011/01/27 17:24:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.39 2012/03/20 10:28:29 markd Exp $
 bin/amarok
 bin/amarok_afttagger
 bin/amarokcollectionscanner
@@ -22,6 +22,7 @@
 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_spectrum_analyzer.so
 lib/kde4/amarok_context_applet_tabs.so
 lib/kde4/amarok_context_applet_upcomingEvents.so
 lib/kde4/amarok_context_applet_videoclip.so
@@ -32,18 +33,23 @@
 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_spectrum_analyzer.so
 lib/kde4/amarok_data_engine_tabs.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
+lib/kde4/amarok_device_massstorage.so
+lib/kde4/amarok_device_nfs.so
+lib/kde4/amarok_device_smb.so
 lib/kde4/amarok_runnerscript_javascript.so
+lib/kde4/amarok_service_amazonstore.so
 lib/kde4/amarok_service_ampache.so
 lib/kde4/amarok_service_jamendo.so
 lib/kde4/amarok_service_lastfm.so
 lib/kde4/amarok_service_magnatunestore.so
 lib/kde4/amarok_service_mp3tunes.so
 lib/kde4/amarok_service_opmldirectory.so
+lib/kde4/kcm_amarok_service_amazonstore.so
 lib/kde4/kcm_amarok_service_ampache.so
 lib/kde4/kcm_amarok_service_lastfm.so
 lib/kde4/kcm_amarok_service_magnatunestore.so
@@ -62,13 +68,10 @@
 lib/libamaroklib.so.1.0.0
 lib/libamarokocsclient.so
 lib/libamarokocsclient.so.4
-lib/libamarokocsclient.so.4.5.0
+lib/libamarokocsclient.so.4.8.0
 lib/libamarokpud.so
 lib/libamarokpud.so.1
 lib/libamarokpud.so.1.0.0
-lib/libamarokqtjson.so
-lib/libamarokqtjson.so.1
-lib/libamarokqtjson.so.1.0.0
 lib/libampache_account_login.so
 share/applications/kde4/amarok.desktop
 share/applications/kde4/amarok_containers.desktop
@@ -82,59 +85,228 @@
 share/doc/kde/HTML/de/amarok/common
 share/doc/kde/HTML/de/amarok/index.cache.bz2
 share/doc/kde/HTML/de/amarok/index.docbook
-share/doc/kde/HTML/en/amarok/Addingmusic.png
-share/doc/kde/HTML/en/amarok/Amarok-addingmusic2.png
-share/doc/kde/HTML/en/amarok/Amarok-context.png
-share/doc/kde/HTML/en/amarok/Amarok-contextadd.png
-share/doc/kde/HTML/en/amarok/Amarok-removefromplaylist.png
-share/doc/kde/HTML/en/amarok/Amarok-renameplaylist.png
-share/doc/kde/HTML/en/amarok/Amarok2.1covermanager.png
-share/doc/kde/HTML/en/amarok/Amarok2.1dynamicplaylist.png
-share/doc/kde/HTML/en/amarok/Amarok2.1ipod.png
-share/doc/kde/HTML/en/amarok/Amarok2.1pleditor.png
-share/doc/kde/HTML/en/amarok/Amarok2.1rating.png
-share/doc/kde/HTML/en/amarok/Amarok2.1right.png
-share/doc/kde/HTML/en/amarok/Amarok2.1scriptmanager.png
-share/doc/kde/HTML/en/amarok/Amarok_-_internet_services.png
-share/doc/kde/HTML/en/amarok/Amarokbreadcrumb.png
-share/doc/kde/HTML/en/amarok/Amarokcollection.png
-share/doc/kde/HTML/en/amarok/Amarokfull.png
-share/doc/kde/HTML/en/amarok/Amarokmediasources-files.png
-share/doc/kde/HTML/en/amarok/Amarokmediasources-home.png
-share/doc/kde/HTML/en/amarok/Amarokrightmenu.png
-share/doc/kde/HTML/en/amarok/Amarokripcd.png
-share/doc/kde/HTML/en/amarok/Amaroksystray.png
-share/doc/kde/HTML/en/amarok/Applications-internet.png
-share/doc/kde/HTML/en/amarok/Cd_collection_sansa.png
-share/doc/kde/HTML/en/amarok/Configurecollection.png
-share/doc/kde/HTML/en/amarok/Context-applets-amarok.png
-share/doc/kde/HTML/en/amarok/Controlamarok.png
-share/doc/kde/HTML/en/amarok/Document-save.png
-share/doc/kde/HTML/en/amarok/Edit-redo.png
-share/doc/kde/HTML/en/amarok/Edit-undo.png
-share/doc/kde/HTML/en/amarok/Firstruncollection2.png
-share/doc/kde/HTML/en/amarok/Folder-amarok.png
-share/doc/kde/HTML/en/amarok/Hi32-action-collection-amarok.png
-share/doc/kde/HTML/en/amarok/Hi48-action-clear-playlist-amarok.png
-share/doc/kde/HTML/en/amarok/Hi48-action-media-standard-track-progression-amarok.png
-share/doc/kde/HTML/en/amarok/Hi48-action-music-amarok.png
-share/doc/kde/HTML/en/amarok/Hi48-action-podcast-amarok.png
-share/doc/kde/HTML/en/amarok/Mediasources.png
-share/doc/kde/HTML/en/amarok/Preferences-other.png
-share/doc/kde/HTML/en/amarok/Pud-amarok.png
-share/doc/kde/HTML/en/amarok/View-list-tree.png
-share/doc/kde/HTML/en/amarok/View-media-playlist.png
+share/doc/kde/HTML/en/amarok/Amarok2-4-1MergeIcon.png
+share/doc/kde/HTML/en/amarok/Amarok2WrenchIcon.png
+share/doc/kde/HTML/en/amarok/Face-smile.png
+share/doc/kde/HTML/en/amarok/Icon-application-exit.png
+share/doc/kde/HTML/en/amarok/Icon-bookmark-new-list.png
+share/doc/kde/HTML/en/amarok/Icon-configure.png
+share/doc/kde/HTML/en/amarok/Icon-dialog-information.png
+share/doc/kde/HTML/en/amarok/Icon-document-save.png
+share/doc/kde/HTML/en/amarok/Icon-edit-clear-locationbar-rtl.png
+share/doc/kde/HTML/en/amarok/Icon-emblem-favorite.png
+share/doc/kde/HTML/en/amarok/Icon-flag-green.png
+share/doc/kde/HTML/en/amarok/Icon-folder-new.png
+share/doc/kde/HTML/en/amarok/Icon-folder-remote.png
+share/doc/kde/HTML/en/amarok/Icon-go-down.png
+share/doc/kde/HTML/en/amarok/Icon-go-home.png
+share/doc/kde/HTML/en/amarok/Icon-go-next.png
+share/doc/kde/HTML/en/amarok/Icon-go-previous.png
+share/doc/kde/HTML/en/amarok/Icon-go-up.png
+share/doc/kde/HTML/en/amarok/Icon-list-add.png
+share/doc/kde/HTML/en/amarok/Icon-media-playback-pause.png
+share/doc/kde/HTML/en/amarok/Icon-media-playback-start.png
+share/doc/kde/HTML/en/amarok/Icon-media-playback-stop.png
+share/doc/kde/HTML/en/amarok/Icon-view-refresh.png
+share/doc/kde/HTML/en/amarok/advancedtok.png
+share/doc/kde/HTML/en/amarok/amarok-context.png
+share/doc/kde/HTML/en/amarok/amarok-contextadd.png
+share/doc/kde/HTML/en/amarok/amarok-e17.png
+share/doc/kde/HTML/en/amarok/amarok-fluxbox.png
+share/doc/kde/HTML/en/amarok/amarok-gnome.png
+share/doc/kde/HTML/en/amarok/amarok-lxde.png
+share/doc/kde/HTML/en/amarok/amarok-mac-port-install.png
+share/doc/kde/HTML/en/amarok/amarok-maintoolbar.png
+share/doc/kde/HTML/en/amarok/amarok-managing-media.png
+share/doc/kde/HTML/en/amarok/amarok-merge-icon.png
+share/doc/kde/HTML/en/amarok/amarok-newdynamic-detail.png
+share/doc/kde/HTML/en/amarok/amarok-newdynamic.png
+share/doc/kde/HTML/en/amarok/amarok-renameplaylist.png
+share/doc/kde/HTML/en/amarok/amarok-slimtoolbar.png
+share/doc/kde/HTML/en/amarok/amarok-xfce.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1albumtageditdialog.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1albumtageditpertrackdialog.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1configplayback.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1configscripts.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1configspeakersetup.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1configuredialog.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1configuredialogcollection.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1configuredialogplugins.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1databaseconfig.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1editfilterdialog.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1filenamelayoutchooseroptions.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1mergedviewcollection.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1non-mergedviewcollection.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1notifications.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1phononbackends.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1phonondevices.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1saveplaylistchoices.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1tageditdialog.png
+share/doc/kde/HTML/en/amarok/amarok2-4-1viewmenu.png
+share/doc/kde/HTML/en/amarok/amarok2-4-playlistsearchfilter.png
+share/doc/kde/HTML/en/amarok/amarok2-4.png
+share/doc/kde/HTML/en/amarok/amarok2-4collectionsortingmenu.png
+share/doc/kde/HTML/en/amarok/amarok2-4helpmenu.png
+share/doc/kde/HTML/en/amarok/amarok2-4musicbrainztagger.png
+share/doc/kde/HTML/en/amarok/amarok2-4organizefilesadvanceddialog.png
+share/doc/kde/HTML/en/amarok/amarok2-4organizefilesbasicdialog.png
+share/doc/kde/HTML/en/amarok/amarok2-4queueeditor.png
+share/doc/kde/HTML/en/amarok/amarok2-4searchplaylist.png
+share/doc/kde/HTML/en/amarok/amarok2-4transcodetracksdialog.png
+share/doc/kde/HTML/en/amarok/amarok24_configureshortcutdetail.png
+share/doc/kde/HTML/en/amarok/amarok24_configureshortcutsdialog.png
+share/doc/kde/HTML/en/amarok/amarok24_settingsmenu.png
+share/doc/kde/HTML/en/amarok/amarok24_settingsmenu_withreplaygain.png
+share/doc/kde/HTML/en/amarok/amarok24_toolsmenu_withtwoscripts.png
+share/doc/kde/HTML/en/amarok/amarok2_moodbar.png
+share/doc/kde/HTML/en/amarok/amarok_add-on_installer.png
+share/doc/kde/HTML/en/amarok/amarok_addtoplaylist.png
+share/doc/kde/HTML/en/amarok/amarok_addtoplaylist1.png
+share/doc/kde/HTML/en/amarok/amarok_amarokmenu2-4.png
+share/doc/kde/HTML/en/amarok/amarok_connecting_media_devices.png
+share/doc/kde/HTML/en/amarok/amarok_cover_manager.png
+share/doc/kde/HTML/en/amarok/amarok_cover_manager_newcover.png
+share/doc/kde/HTML/en/amarok/amarok_dynamic_playlist.png
+share/doc/kde/HTML/en/amarok/amarok_layout11.png
+share/doc/kde/HTML/en/amarok/amarok_layout22.png
+share/doc/kde/HTML/en/amarok/amarok_layout23.png
+share/doc/kde/HTML/en/amarok/amarok_layout24.png
+share/doc/kde/HTML/en/amarok/amarok_layout25.png
+share/doc/kde/HTML/en/amarok/amarok_layout26.png
+share/doc/kde/HTML/en/amarok/amarok_layout27.png
+share/doc/kde/HTML/en/amarok/amarok_layout28.png
+share/doc/kde/HTML/en/amarok/amarok_loading_media_devices.png
+share/doc/kde/HTML/en/amarok/amarok_main_toolbar.png
+share/doc/kde/HTML/en/amarok/amarok_media_devices.png
+share/doc/kde/HTML/en/amarok/amarok_on_mac.png
+share/doc/kde/HTML/en/amarok/amarok_playlist.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_bookmarking.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_contextmenu.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_functions.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_d.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_d_ss.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_editor.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_nog1.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_nog1_s.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_nog2.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_nog2_s.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_v.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_layout_v1_s.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_manipulation.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_search2.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_search_ex.png
+share/doc/kde/HTML/en/amarok/amarok_playlist_sortingleavel.png
+share/doc/kde/HTML/en/amarok/amarok_removeformplaylist.png
+share/doc/kde/HTML/en/amarok/amarok_saved_playlists.png
+share/doc/kde/HTML/en/amarok/amarok_script_info.png
+share/doc/kde/HTML/en/amarok/amarok_script_manager.png
+share/doc/kde/HTML/en/amarok/amarok_show_only_matches.png
+share/doc/kde/HTML/en/amarok/amarok_slim_toolbar.png
+share/doc/kde/HTML/en/amarok/amarok_tracks_media_devices1.png
+share/doc/kde/HTML/en/amarok/amarok_windowlayout.png
+share/doc/kde/HTML/en/amarok/amarokbreadcrumb.png
+share/doc/kde/HTML/en/amarok/amarokmediasources-files.png
+share/doc/kde/HTML/en/amarok/amarokmediasources-home.png
+share/doc/kde/HTML/en/amarok/amaroknew2-4.png
+share/doc/kde/HTML/en/amarok/amarokrightmenu.png
+share/doc/kde/HTML/en/amarok/amarokripcd.png
+share/doc/kde/HTML/en/amarok/amaroksystray.png
+share/doc/kde/HTML/en/amarok/amaroktoplevelmenus2-4.png
+share/doc/kde/HTML/en/amarok/amarokwindow_context.png
+share/doc/kde/HTML/en/amarok/amarokwindow_mediasources.png
+share/doc/kde/HTML/en/amarok/amarokwindow_playlist.png
+share/doc/kde/HTML/en/amarok/apgpresetsmatchallgroup.png
+share/doc/kde/HTML/en/amarok/applications-internet.png
+share/doc/kde/HTML/en/amarok/cd_collection_sansa.png
 share/doc/kde/HTML/en/amarok/common
+share/doc/kde/HTML/en/amarok/configure_amarok.png
+share/doc/kde/HTML/en/amarok/contextpane.png
+share/doc/kde/HTML/en/amarok/contextpanestopped.png
+share/doc/kde/HTML/en/amarok/controlamarok.png
+share/doc/kde/HTML/en/amarok/document-new.png
+share/doc/kde/HTML/en/amarok/document-save.png
+share/doc/kde/HTML/en/amarok/dynamic_playlist.png
+share/doc/kde/HTML/en/amarok/edit-copy.png
+share/doc/kde/HTML/en/amarok/edit-redo.png
+share/doc/kde/HTML/en/amarok/edit-undo.png
+share/doc/kde/HTML/en/amarok/favor-menu.png
+share/doc/kde/HTML/en/amarok/firstruncollection2.png
+share/doc/kde/HTML/en/amarok/folder-amarok.png
+share/doc/kde/HTML/en/amarok/generatedlist.png
+share/doc/kde/HTML/en/amarok/generatingtree.png
+share/doc/kde/HTML/en/amarok/hi32-action-collection-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-action-clear-playlist-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-action-edit-playlist-queue.png
+share/doc/kde/HTML/en/amarok/hi48-action-media-standard-track-progression-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-action-music-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-action-podcast-amarok.png
 share/doc/kde/HTML/en/amarok/index.cache.bz2
 share/doc/kde/HTML/en/amarok/index.docbook