Update audio/amarok to recent upstream

This fixes the previous botched update. Existing patches
have been merged or made obsolete, while we still need to
massage CMakeLists and CMake modules to find things onFreeBSD.

While here, drop redundant USES=ssl (it is in the main USES
clause already) and add missing USE_KDE=wallet.

11 files changed, 304 insertions, 137 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index f2dcb2dd75ff..24488dd388a6 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -32,7 +32,7 @@ USE_KDE=	archive auth attica bookmarks codecs config configwidgets \
 		guiaddons i18n iconthemes itemviews jobwidgets kdeclarative \
 		kcmutils kio kirigami2 newstuff notifications notifyconfig \
 		package parts service solid sonnet texteditor textwidgets \
-		threadweaver widgetsaddons windowsystem xmlgui \
+		threadweaver wallet widgetsaddons windowsystem xmlgui \
 		ecm_build
 USE_XORG=	ice sm x11 xext
 USE_LDCONFIG=	yes
@@ -67,7 +67,7 @@ MP3TUNES_LIB_DEPENDS=	libloudmouth-1.so:net-im/loudmouth \
 			libcurl.so:ftp/curl
 MP3TUNES_LIB_DEPENDS_OFF=	libgcrypt.so:security/libgcrypt
 MP3TUNES_USE=		GNOME=glib20,libxml2
-MP3TUNES_USES=		gnome ssl
+MP3TUNES_USES=		gnome
 
 MP3TUNES_CMAKE_BOOL=	WITH_MP3Tunes
 MP3TUNES_CMAKE_BOOL_OFF=	WITH_Libgcrypt
diff --git a/audio/amarok/files/patch-CMakeLists.txt b/audio/amarok/files/patch-CMakeLists.txt
index 5c63ac9870c8..9bcacdf53c77 100644
--- a/audio/amarok/files/patch-CMakeLists.txt
+++ b/audio/amarok/files/patch-CMakeLists.txt
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig	2019-04-30 03:42:56 UTC
+--- CMakeLists.txt.orig	2021-02-13 22:36:08 UTC
 +++ CMakeLists.txt
-@@ -207,6 +207,8 @@ if( WITH_PLAYER )
-     # zlib is required for mysql embedded
-     find_package(ZLIB REQUIRED)
-     set_package_properties( ZLIB PROPERTIES DESCRIPTION "zlib" TYPE REQUIRED )
-+    # SSL is required for mysql embedded
-+    find_package(OpenSSL REQUIRED)
- 
-     # We tell users that we need 1.0.3, but we really check just >= 1.0.0. This is because
-     # upstream forgot to update version in lastfm/global.h, so it looks like 1.0.2. :-(
+@@ -212,6 +212,8 @@ if( WITH_PLAYER )
+         # zlib is required for mysql embedded
+         find_package(ZLIB REQUIRED)
+         set_package_properties( ZLIB PROPERTIES DESCRIPTION "zlib" TYPE REQUIRED )
++        # SSL is required for mysql embedded
++        find_package(OpenSSL REQUIRED)
+     else()
+         add_definitions( "-DNO_MYSQL_EMBEDDED" )
+     endif()
diff --git a/audio/amarok/files/patch-cmake_modules_FindLoudmouth.cmake b/audio/amarok/files/patch-cmake_modules_FindLoudmouth.cmake
index 397c6b05dc7a..5982fd6a9ca4 100644
--- a/audio/amarok/files/patch-cmake_modules_FindLoudmouth.cmake
+++ b/audio/amarok/files/patch-cmake_modules_FindLoudmouth.cmake
@@ -1,6 +1,6 @@
---- cmake/modules/FindLoudmouth.cmake.orig	2018-11-19 18:18:20.197436000 +0100
-+++ cmake/modules/FindLoudmouth.cmake	2018-11-19 18:25:49.793954000 +0100
-@@ -13,14 +13,6 @@
+--- cmake/modules/FindLoudmouth.cmake.orig	2021-02-13 22:39:45 UTC
++++ cmake/modules/FindLoudmouth.cmake
+@@ -13,13 +13,6 @@ if (LOUDMOUTH_INCLUDE_DIRS AND LOUDMOUTH_LIBRARIES)
    set(LOUDMOUTH_FOUND TRUE)
  
  else ()
@@ -11,16 +11,15 @@
 -    pkg_search_module(LOUDMOUTH loudmouth-1.0)
 -  
 -  else()
--
+ 
      find_path(LOUDMOUTH_INCLUDE_DIRS loudmouth/loudmouth.h /usr/include/loudmouth-1.0
        ${_LOUDMOUTHIncDir}
-     )
-@@ -30,8 +22,6 @@
+@@ -29,8 +22,6 @@ else ()
+       PATHS
        ${_LOUDMOUTHLinkDir}
      )
- 
--  endif()
 -
+-  endif()
+ 
    if (LOUDMOUTH_INCLUDE_DIRS AND LOUDMOUTH_LIBRARIES)
      set(LOUDMOUTH_FOUND TRUE)
-   else ()
diff --git a/audio/amarok/files/patch-cmake_modules_FindMySQL.cmake b/audio/amarok/files/patch-cmake_modules_FindMySQL.cmake
index 89acc30d09d3..5ad15d35db03 100644
--- a/audio/amarok/files/patch-cmake_modules_FindMySQL.cmake
+++ b/audio/amarok/files/patch-cmake_modules_FindMySQL.cmake
@@ -1,35 +1,6 @@
---- cmake/modules/FindMySQL.cmake.orig	2019-04-30 03:42:56 UTC
+--- cmake/modules/FindMySQL.cmake.orig	2021-02-13 22:39:45 UTC
 +++ cmake/modules/FindMySQL.cmake
-@@ -31,18 +31,20 @@ if(MYSQLCONFIG_EXECUTABLE)
-         OUTPUT_STRIP_TRAILING_WHITESPACE
-     )
- 
--    execute_process(
--        COMMAND ${MYSQLCONFIG_EXECUTABLE} --libmysqld-libs
--        RESULT_VARIABLE MC_return_embedded
--        OUTPUT_VARIABLE MC_MYSQL_EMBEDDED_LIBRARIES
--        OUTPUT_STRIP_TRAILING_WHITESPACE
--    )
--
-     if(NOT MC_MYSQL_EMBEDDED_LIBRARIES)
-         # At least on OpenSUSE --libmysql-libs doesn't exist, so we just use
-         # MYSQL_LIBRARIES for that. We'll see if that's enough when testing
-         # below.
--        set(MYSQL_EMBEDDED_LIBRARIES ${MYSQL_LIBRARIES})
-+        # mysql-config removed --libmysql-libs, but amarok need libmysqld other
-+        # than libmysqlclient to run mysql embedded server.
-+        find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld libmysqld
-+            PATHS
-+                $ENV{MYSQL_DIR}/libmysql_r/.libs
-+                $ENV{MYSQL_DIR}/lib
-+                $ENV{MYSQL_DIR}/lib/mysql
-+            PATH_SUFFIXES
-+                mysql
-+        )
-     else()
-         set(MYSQL_EMBEDDED_LIBRARIES ${MC_MYSQL_EMBEDDED_LIBRARIES})
-     endif()
-@@ -51,7 +53,7 @@ endif()
+@@ -33,7 +33,7 @@ endif()
  # Try searching manually via find_path/find_library,  possibly with hints
  # from pkg-config
  find_package(PkgConfig)
@@ -38,14 +9,3 @@
  
  find_path(MYSQL_INCLUDE_DIR mysql.h
      PATHS
-@@ -101,6 +103,10 @@ if(MYSQL_EMBEDDED_LIBRARIES)
-     #    string(STRIP ${_mysql_libs} _mysql_libs)
-     #    set(MYSQL_EMBEDDED_LIBRARIES ${_mysql_libs})
-     #endif()
-+
-+    string(CONCAT MC_MYSQL_LIBRARIES ${MYSQL_LIBRARIES} " -llz4")
-+    string(STRIP ${MC_MYSQL_LIBRARIES} MC_MYSQL_LIBRARIES)
-+    set(MYSQL_LIBRARIES ${MC_MYSQL_LIBRARIES})
-     cmake_push_check_state()
-     set(CMAKE_REQUIRED_INCLUDES ${MYSQL_INCLUDE_DIR})
-     set(CMAKE_REQUIRED_LIBRARIES ${MYSQL_EMBEDDED_LIBRARIES})
diff --git a/audio/amarok/files/patch-cmake_modules_FindMySQLe.cmake b/audio/amarok/files/patch-cmake_modules_FindMySQLe.cmake
new file mode 100644
index 000000000000..2fbb5a572f20
--- /dev/null
+++ b/audio/amarok/files/patch-cmake_modules_FindMySQLe.cmake
@@ -0,0 +1,39 @@
+--- cmake/modules/FindMySQLe.cmake.orig	2021-02-13 22:45:16 UTC
++++ cmake/modules/FindMySQLe.cmake
+@@ -51,6 +51,7 @@
+ if(NOT MYSQLE_LIBRARIES)
+ # mysql-config removed --libmysql-libs, but amarok needs libmysqld other
+ # than libmysqlclient to run mysql embedded server.
++    message(STATUS "Looking for mysqld libmysqld..")
+     find_library(MYSQLE_LIBRARIES NAMES mysqld libmysqld
+         PATHS
+             $ENV{MYSQL_DIR}/libmysql_r/.libs
+@@ -61,10 +62,14 @@
+         PATH_SUFFIXES
+             mysql
+     )
++    message(STATUS ".. found ${MYSQLE_LIBRARIES}")
++else()
++    message(STATUS "Embedded MySQL libs already set ${MYSQLE_LIBRARIES}")
+ endif()
+ 
+ if(PC_MYSQL_VERSION)
+     set(MySQLe_VERSION_STRING ${PC_MYSQL_VERSION})
++    message(STATUS ".. version ${MySQLe_VERSION_STRING}")
+ endif()
+ 
+ if(MYSQLE_LIBRARIES)
+@@ -75,6 +80,13 @@
+     #    string(STRIP ${_mysql_libs} _mysql_libs)
+     #    set(MYSQLE_LIBRARIES ${_mysql_libs})
+     #endif()
++    find_library(_lz4_libraries NAMES lz4 liblz4 PATHS  $ENV{MYSQL_DIR}/lib ${PC_MYSQL_LIBDIR} ${PC_MYSQL_LIBRARY_DIRS})
++    if (_lz4_libraries)
++        message(STATUS ".. adding ${_lz4_libraries}")
++        list(APPEND MYSQLE_LIBRARIES ${_lz4_libraries})
++    endif()
++    message(STATUS ".. compile-checking ${MYSQLE_LIBRARIES}")
++    unset(HAVE_MYSQL_OPT_EMBEDDED_CONNECTION)
+     cmake_push_check_state()
+     set(CMAKE_REQUIRED_INCLUDES ${MYSQL_INCLUDE_DIR})
+     set(CMAKE_REQUIRED_LIBRARIES ${MYSQLE_LIBRARIES})
diff --git a/audio/amarok/files/patch-kf5-5.61-headers b/audio/amarok/files/patch-kf5-5.61-headers
deleted file mode 100644
index 089fc634c0ad..000000000000
--- a/audio/amarok/files/patch-kf5-5.61-headers
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/PluginManager.h.orig	2019-08-14 20:35:52.115749000 +0000
-+++ src/PluginManager.h	2019-08-14 20:36:11.135552000 +0000
-@@ -22,6 +22,7 @@
- #include <KPluginInfo>
- #include <KPluginMetaData>
- 
-+#include <QVector>
- 
- namespace Plugins {
- 
diff --git a/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlestorage_CMakeLists.txt b/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlestorage_CMakeLists.txt
deleted file mode 100644
index b47f24e64ed9..000000000000
--- a/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlestorage_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt.orig	2019-04-30 03:42:56 UTC
-+++ src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt
-@@ -25,6 +25,8 @@ target_link_libraries(amarok_storage-mysqlestorage
-     ${MYSQL_EMBEDDED_LIBRARIES}
-     ${CMAKE_DL_LIBS}
-     ${ZLIB_LIBRARIES}
-+    ${OPENSSL_SSL_LIBRARY}
-+    ${OPENSSL_CRYPTO_LIBRARY}
- )
- 
- if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "FreeBSD")
diff --git a/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlserverstorage_CMakeLists.txt b/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlserverstorage_CMakeLists.txt
deleted file mode 100644
index e88c485be85a..000000000000
--- a/audio/amarok/files/patch-src_core-impl_storage_sql_mysqlserverstorage_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core-impl/storage/sql/mysqlserverstorage/CMakeLists.txt.orig	2019-04-30 03:42:56 UTC
-+++ src/core-impl/storage/sql/mysqlserverstorage/CMakeLists.txt
-@@ -25,6 +25,8 @@ target_link_libraries(amarok_storage-mysqlserverstorag
-     ${MYSQL_LIBRARIES}
-     ${CMAKE_DL_LIBS}
-     ${ZLIB_LIBRARIES}
-+    ${OPENSSL_SSL_LIBRARY}
-+    ${OPENSSL_CRYPTO_LIBRARY}
- )
- 
- if(NOT WIN32 AND NOT APPLE)
diff --git a/audio/amarok/files/patch-src_musicbrainz_MusicDNSAudioDecoder.cpp b/audio/amarok/files/patch-src_musicbrainz_MusicDNSAudioDecoder.cpp
deleted file mode 100644
index 7e84d1dcce0b..000000000000
--- a/audio/amarok/files/patch-src_musicbrainz_MusicDNSAudioDecoder.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-If this is not defined, libavutil/common.h fails because of this check:
-
-#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) && !defined(UINT64_C)
-#error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS
-#endif
-
-Not submitted upstream, as newer releases build with -std=c++0x, which always
-sets __STD_CONSTANT_MACROS by default.
---- src/musicbrainz/MusicDNSAudioDecoder.cpp.orig	2013-08-14 20:22:52 UTC
-+++ src/musicbrainz/MusicDNSAudioDecoder.cpp
-@@ -14,6 +14,8 @@
-  * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
-  ****************************************************************************************/
- 
-+#define __STDC_CONSTANT_MACROS
-+
- #define DEBUG_PREFIX "MusicDNSAudioDecoder"
- 
- #include "MusicDNSAudioDecoder.h"
diff --git a/audio/amarok/files/patch-src_playlist_proxymodels_SortScheme.cpp b/audio/amarok/files/patch-src_playlist_proxymodels_SortScheme.cpp
deleted file mode 100644
index 31611edd4b3a..000000000000
--- a/audio/amarok/files/patch-src_playlist_proxymodels_SortScheme.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/playlist/proxymodels/SortScheme.cpp.orig	2013-08-14 20:22:52 UTC
-+++ src/playlist/proxymodels/SortScheme.cpp
-@@ -123,13 +123,13 @@ SortScheme::trimToLevel( int lastLevel )
- SortScheme::const_iterator
- SortScheme::begin() const
- {
--    return QStack::begin();
-+    return QStack<SortLevel>::begin();
- }
- 
- SortScheme::const_iterator
- SortScheme::end() const
- {
--    return QStack::end();
-+    return QStack<SortLevel>::end();
- }
- 
- }   //namespace Playlist
diff --git a/audio/amarok/pkg-plist b/audio/amarok/pkg-plist
index 2c26f75c8ccf..4ab3bfeec210 100644
--- a/audio/amarok/pkg-plist
+++ b/audio/amarok/pkg-plist
@@ -2,7 +2,6 @@ bin/amarok
 bin/amarok_afttagger
 bin/amarokcollectionscanner
 bin/amarokpkg
-etc/xdg/amarok.knsrc
 etc/xdg/amarok_homerc
 lib/libamarok-sqlcollection.so
 lib/libamarok-sqlcollection.so.1
@@ -20,6 +19,7 @@ lib/libamarokpud.so
 lib/libamarokshared.so
 lib/libamarokshared.so.1
 lib/libamarokshared.so.1.0.0
+lib/libamarok_service_lastfm_config.so
 lib/libampache_account_login.so
 %%QT_PLUGINDIR%%/amarok_collection-audiocdcollection.so
 %%QT_PLUGINDIR%%/amarok_collection-daapcollection.so
@@ -36,11 +36,13 @@ lib/libampache_account_login.so
 %%QT_PLUGINDIR%%/amarok_importer-itunes.so
 %%QT_PLUGINDIR%%/amarok_importer-rhythmbox.so
 %%QT_PLUGINDIR%%/amarok_service_ampache.so
+%%QT_PLUGINDIR%%/amarok_service_lastfm.so
 %%QT_PLUGINDIR%%/amarok_service_magnatunestore.so
 %%QT_PLUGINDIR%%/amarok_service_opmldirectory.so
 %%QT_PLUGINDIR%%/amarok_storage-mysqlestorage.so
 %%QT_PLUGINDIR%%/amarok_storage-mysqlserverstorage.so
 %%QT_PLUGINDIR%%/kcm_amarok_service_ampache.so
+%%QT_PLUGINDIR%%/kcm_amarok_service_lastfm.so
 %%QT_PLUGINDIR%%/kcm_amarok_service_magnatunestore.so
 %%QT_QMLDIR%%/org/kde/amarok/albums/libamarok_context_applet_albums.so
 %%QT_QMLDIR%%/org/kde/amarok/albums/qmldir
@@ -367,6 +369,7 @@ lib/libampache_account_login.so
 %%DATADIR%%/images/hover_info_dynamic_playlists.png
 %%DATADIR%%/images/hover_info_files.png
 %%DATADIR%%/images/hover_info_internet.png
+%%DATADIR%%/images/hover_info_lastfm.png
 %%DATADIR%%/images/hover_info_magnatune.png
 %%DATADIR%%/images/hover_info_playlists.png
 %%DATADIR%%/images/hover_info_podcasts.png
@@ -407,13 +410,238 @@ lib/libampache_account_login.so
 share/applications/org.kde.amarok.desktop
 share/applications/org.kde.amarok_containers.desktop
 share/config.kcfg/amarokconfig.kcfg
-share/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml
-share/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml
-share/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml
 share/dbus-1/interfaces/org.kde.amarok.App.xml
 share/dbus-1/interfaces/org.kde.amarok.Collection.xml
-share/dbus-1/interfaces/org.kde.amarok.Mpris1Extensions.Player.xml
 share/dbus-1/interfaces/org.kde.amarok.Mpris2Extensions.Player.xml
+share/doc/HTML/en/amarok/Face-smile.png
+share/doc/HTML/en/amarok/Icon-action-dynamic-amarok.png
+share/doc/HTML/en/amarok/Icon-application-exit.png
+share/doc/HTML/en/amarok/Icon-bookmark-new-list.png
+share/doc/HTML/en/amarok/Icon-configure.png
+share/doc/HTML/en/amarok/Icon-dialog-information.png
+share/doc/HTML/en/amarok/Icon-document-export.png
+share/doc/HTML/en/amarok/Icon-document-import.png
+share/doc/HTML/en/amarok/Icon-document-new.png
+share/doc/HTML/en/amarok/Icon-document-properties.png
+share/doc/HTML/en/amarok/Icon-document-save.png
+share/doc/HTML/en/amarok/Icon-edit-clear-list.png
+share/doc/HTML/en/amarok/Icon-edit-clear-locationbar-rtl.png
+share/doc/HTML/en/amarok/Icon-edit-copy.png
+share/doc/HTML/en/amarok/Icon-edit-delete.png
+share/doc/HTML/en/amarok/Icon-emblem-favorite.png
+share/doc/HTML/en/amarok/Icon-emblem-mounted.png
+share/doc/HTML/en/amarok/Icon-flag-green.png
+share/doc/HTML/en/amarok/Icon-folder-new.png
+share/doc/HTML/en/amarok/Icon-folder-remote.png
+share/doc/HTML/en/amarok/Icon-go-down.png
+share/doc/HTML/en/amarok/Icon-go-home.png
+share/doc/HTML/en/amarok/Icon-go-next.png
+share/doc/HTML/en/amarok/Icon-go-previous.png
+share/doc/HTML/en/amarok/Icon-go-up.png
+share/doc/HTML/en/amarok/Icon-list-add.png
+share/doc/HTML/en/amarok/Icon-list-remove.png
+share/doc/HTML/en/amarok/Icon-media-playback-pause.png
+share/doc/HTML/en/amarok/Icon-media-playback-start.png
+share/doc/HTML/en/amarok/Icon-media-playback-stop.png
+share/doc/HTML/en/amarok/Icon-preferences-other.png
+share/doc/HTML/en/amarok/Icon-view-list-tree.png
+share/doc/HTML/en/amarok/Icon-view-refresh.png
+share/doc/HTML/en/amarok/action-collection-amarok48.png
+share/doc/HTML/en/amarok/amarok-2-6-duplicates-during-collection-scan.png
+share/doc/HTML/en/amarok/amarok-apg-presets-toolbar.png
+share/doc/HTML/en/amarok/amarok-e17.png
+share/doc/HTML/en/amarok/amarok-fluxbox.png
+share/doc/HTML/en/amarok/amarok-gnome.png
+share/doc/HTML/en/amarok/amarok-lxde.png
+share/doc/HTML/en/amarok/amarok-mac-port-install.png
+share/doc/HTML/en/amarok/amarok-maintoolbar.png
+share/doc/HTML/en/amarok/amarok-managing-media.png
+share/doc/HTML/en/amarok/amarok-newdynamic-detail.png
+share/doc/HTML/en/amarok/amarok-newdynamic.png
+share/doc/HTML/en/amarok/amarok-slimtoolbar.png
+share/doc/HTML/en/amarok/amarok-statsyncing.png
+share/doc/HTML/en/amarok/amarok-xfce.png
+share/doc/HTML/en/amarok/amarok2-4-1albumtageditdialog.png
+share/doc/HTML/en/amarok/amarok2-4-1albumtageditpertrackdialog.png
+share/doc/HTML/en/amarok/amarok2-4-1editfilterdialog.png
+share/doc/HTML/en/amarok/amarok2-4-1filenamelayoutchooseroptions.png
+share/doc/HTML/en/amarok/amarok2-4-1tageditdialog.png
+share/doc/HTML/en/amarok/amarok2-4musicbrainztagger.png
+share/doc/HTML/en/amarok/amarok2-4organizefilesadvanceddialog.png
+share/doc/HTML/en/amarok/amarok2-4queueeditor.png
+share/doc/HTML/en/amarok/amarok2-4searchplaylist.png
+share/doc/HTML/en/amarok/amarok2-6configgeneralmenu.png
+share/doc/HTML/en/amarok/amarok2-6flactranscodemenu.png
+share/doc/HTML/en/amarok/amarok2-6helpmenu.png
+share/doc/HTML/en/amarok/amarok2-6playlistalbumcontextmenu.png
+share/doc/HTML/en/amarok/amarok2-6trackcontextmenu.png
+share/doc/HTML/en/amarok/amarok2-6viewconfigmenu.png
+share/doc/HTML/en/amarok/amarok2-6viewundocksymbols.png
+share/doc/HTML/en/amarok/amarok2-7networkrequestsviewer.png
+share/doc/HTML/en/amarok/amarok2-7renamesavedplaylist.png
+share/doc/HTML/en/amarok/amarok2-7scriptsconfigmenu.png
+share/doc/HTML/en/amarok/amarok2-7thetoolbar.png
+share/doc/HTML/en/amarok/amarok2-8menutools.png
+share/doc/HTML/en/amarok/amarok24_configureshortcutdetail.png
+share/doc/HTML/en/amarok/amarok24_configureshortcutsdialog.png
+share/doc/HTML/en/amarok/amarok24_settingsmenu.png
+share/doc/HTML/en/amarok/amarok24_settingsmenu_withreplaygain.png
+share/doc/HTML/en/amarok/amarok2_moodbar.png
+share/doc/HTML/en/amarok/amarok2dot8pud.png
+share/doc/HTML/en/amarok/amarok_2-6_layout.png
+share/doc/HTML/en/amarok/amarok_2-8_appletexplorer_default.png
+share/doc/HTML/en/amarok/amarok_2-8_collectionbrowser_merged.png
+share/doc/HTML/en/amarok/amarok_2-8_collectionbrowser_nonmerged.png
+share/doc/HTML/en/amarok/amarok_2-8_collectionbrowsersearchfield.png
+share/doc/HTML/en/amarok/amarok_2-8_collectionsortingmenu.png
+share/doc/HTML/en/amarok/amarok_2-8_configurationdialogdatabase.png
+share/doc/HTML/en/amarok/amarok_2-8_configurationdialogdatabaseenabled.png
+share/doc/HTML/en/amarok/amarok_2-8_configurationdialoggeneral.png
+share/doc/HTML/en/amarok/amarok_2-8_configurationdialoglocalcollection.png
+share/doc/HTML/en/amarok/amarok_2-8_configurationdialognotifications.png
+share/doc/HTML/en/amarok/amarok_2-8_configurationdialogplayback.png
+share/doc/HTML/en/amarok/amarok_2-8_configurationdialogplugins.png
+share/doc/HTML/en/amarok/amarok_2-8_configurationdialogscripts.png
+share/doc/HTML/en/amarok/amarok_2-8_contextview_default.png
+share/doc/HTML/en/amarok/amarok_2-8_default.png
+share/doc/HTML/en/amarok/amarok_2-8_mediasourcespanedefault.png
+share/doc/HTML/en/amarok/amarok_2-8_organizefilestranscode.png
+share/doc/HTML/en/amarok/amarok_2-8_organizetracks.png
+share/doc/HTML/en/amarok/amarok_2-8_playlistbottombar.png
+share/doc/HTML/en/amarok/amarok_2-8_playlistfilteroptions.png
+share/doc/HTML/en/amarok/amarok_2-8_playlistlayouteditor.png
+share/doc/HTML/en/amarok/amarok_2-8_playlistpane.png
+share/doc/HTML/en/amarok/amarok_2-8_playlistsortinglevels.png
+share/doc/HTML/en/amarok/amarok_2-8_popupdropperadd.png
+share/doc/HTML/en/amarok/amarok_2-8_popupdropperremove.png
+share/doc/HTML/en/amarok/amarok_2-8_remotecollections_samba_server.png
+share/doc/HTML/en/amarok/amarok_2-8_remotecollections_samba_server1.png
+share/doc/HTML/en/amarok/amarok_2-8_savecurrentplaylistoptions.png
+share/doc/HTML/en/amarok/amarok_2-8_startwindowdefault.png
+share/doc/HTML/en/amarok/amarok_2-8_systray_window.png
+share/doc/HTML/en/amarok/amarok_2-8_upnp_collection.png
+share/doc/HTML/en/amarok/amarok_2-8_upnp_collection_plugin.png
+share/doc/HTML/en/amarok/amarok_add-on_installer.png
+share/doc/HTML/en/amarok/amarok_addtoplaylist1.png
+share/doc/HTML/en/amarok/amarok_amarokmenu2-4.png
+share/doc/HTML/en/amarok/amarok_ampache_client2.png
+share/doc/HTML/en/amarok/amarok_connecting_media_devices.png
+share/doc/HTML/en/amarok/amarok_cover_manager.png
+share/doc/HTML/en/amarok/amarok_cover_manager_newcover.png
+share/doc/HTML/en/amarok/amarok_dynamic_playlist.png
+share/doc/HTML/en/amarok/amarok_layout11.png
+share/doc/HTML/en/amarok/amarok_layout22.png
+share/doc/HTML/en/amarok/amarok_layout23.png
+share/doc/HTML/en/amarok/amarok_layout24.png
+share/doc/HTML/en/amarok/amarok_layout25.png
+share/doc/HTML/en/amarok/amarok_layout26.png
+share/doc/HTML/en/amarok/amarok_layout27.png
+share/doc/HTML/en/amarok/amarok_layout28.png
+share/doc/HTML/en/amarok/amarok_loading_media_devices.png
+share/doc/HTML/en/amarok/amarok_locale_selection.png
+share/doc/HTML/en/amarok/amarok_main_toolbar.png
+share/doc/HTML/en/amarok/amarok_media_devices.png
+share/doc/HTML/en/amarok/amarok_on_mac.png
+share/doc/HTML/en/amarok/amarok_playlist_layout_d_ss.png
+share/doc/HTML/en/amarok/amarok_playlist_layout_editor.png
+share/doc/HTML/en/amarok/amarok_playlist_layout_nog1_s.png
+share/doc/HTML/en/amarok/amarok_playlist_layout_nog2_s.png
+share/doc/HTML/en/amarok/amarok_playlist_layout_v1_s.png
+share/doc/HTML/en/amarok/amarok_playlist_search_ex.png
+share/doc/HTML/en/amarok/amarok_saved_playlists.png
+share/doc/HTML/en/amarok/amarok_show_only_matches.png
+share/doc/HTML/en/amarok/amarok_slim_toolbar.png
+share/doc/HTML/en/amarok/amarok_systray_2-8_4-11.png
+share/doc/HTML/en/amarok/amarok_tracks_media_devices1.png
+share/doc/HTML/en/amarok/amarokbreadcrumb.png
+share/doc/HTML/en/amarok/amarokconfigurationdialog2-7phononbackend.png
+share/doc/HTML/en/amarok/amarokconfigurationdialog2-7phonondevice.png
+share/doc/HTML/en/amarok/amarokconfigurationdialog2-7phononhardware.png
+share/doc/HTML/en/amarok/amarokconfigurationdialog2-7scriptconsole.png
+share/doc/HTML/en/amarok/amarokmediasources-files.png
+share/doc/HTML/en/amarok/amarokmediasources-home.png
+share/doc/HTML/en/amarok/amaroknew2-4.png
+share/doc/HTML/en/amarok/amarokripcd.png
+share/doc/HTML/en/amarok/amaroktoplevelmenus2-4.png
+share/doc/HTML/en/amarok/apgpresetsmatchallgroup.png
+share/doc/HTML/en/amarok/applications-internet.png
+share/doc/HTML/en/amarok/bookmarking_menu.png
+share/doc/HTML/en/amarok/cd_collection_sansa.png
+share/doc/HTML/en/amarok/controlamarok.png
+share/doc/HTML/en/amarok/document-save.png
+share/doc/HTML/en/amarok/edit-redo.png
+share/doc/HTML/en/amarok/edit-undo.png
+share/doc/HTML/en/amarok/favor.png
+share/doc/HTML/en/amarok/firstruncollection2.png
+share/doc/HTML/en/amarok/folder-amarok.png
+share/doc/HTML/en/amarok/generatedlist.png
+share/doc/HTML/en/amarok/generatingtree.png
+share/doc/HTML/en/amarok/hi48-action-amarok_lyrics.png
+share/doc/HTML/en/amarok/hi48-action-clear-playlist-amarok.png
+share/doc/HTML/en/amarok/hi48-action-current-track-amarok.png
+share/doc/HTML/en/amarok/hi48-action-edit-playlist-queue.png
+share/doc/HTML/en/amarok/hi48-action-filename-album-amarok.png
+share/doc/HTML/en/amarok/hi48-action-filename-genre-amarok.png
+share/doc/HTML/en/amarok/hi48-action-info-amarok.png
+share/doc/HTML/en/amarok/hi48-action-label-amarok.png
+share/doc/HTML/en/amarok/hi48-action-media-standard-track-progression-amarok.png
+share/doc/HTML/en/amarok/hi48-action-music-amarok.png
+share/doc/HTML/en/amarok/hi48-action-podcast-amarok.png
+share/doc/HTML/en/amarok/hi48-action-similarartists-amarok.png
+share/doc/HTML/en/amarok/hi48-action-upcomingevents-amarok.png
+share/doc/HTML/en/amarok/hi48-action-view-media-analyzer-amarok.png
+share/doc/HTML/en/amarok/hi48-image-x-generic.png
+share/doc/HTML/en/amarok/index.cache.bz2
+share/doc/HTML/en/amarok/index.docbook
+share/doc/HTML/en/amarok/installation1-1.png
+share/doc/HTML/en/amarok/installation2.png
+share/doc/HTML/en/amarok/installation3.png
+share/doc/HTML/en/amarok/installation4.png
+share/doc/HTML/en/amarok/ipod-connected-dialog.png
+share/doc/HTML/en/amarok/last-fm-spelling-correction.png
+share/doc/HTML/en/amarok/matchedtrackspage.png
+share/doc/HTML/en/amarok/media_sources1.png
+share/doc/HTML/en/amarok/mediasources.png
+share/doc/HTML/en/amarok/mediasources10.png
+share/doc/HTML/en/amarok/mediasources5.png
+share/doc/HTML/en/amarok/mediasources6.png
+share/doc/HTML/en/amarok/mediasources7.png
+share/doc/HTML/en/amarok/mediasources8.png
+share/doc/HTML/en/amarok/mediasourcesex.png
+share/doc/HTML/en/amarok/metadatadialog.png
+share/doc/HTML/en/amarok/nocover_amarok.png
+share/doc/HTML/en/amarok/oraganize_menu.png
+share/doc/HTML/en/amarok/otherplatforms_nonkde.png
+share/doc/HTML/en/amarok/otherplatforms_osx.png
+share/doc/HTML/en/amarok/otherplatforms_windows.png
+share/doc/HTML/en/amarok/playlist-layout-item-configuration-amarok.png
+share/doc/HTML/en/amarok/playlist_save.png
+share/doc/HTML/en/amarok/playlistlayout1.png
+share/doc/HTML/en/amarok/playlistlayout2.png
+share/doc/HTML/en/amarok/playlistlayout3.png
+share/doc/HTML/en/amarok/playlistlayout4.png
+share/doc/HTML/en/amarok/playlistmenu.png
+share/doc/HTML/en/amarok/playlistpic.png
+share/doc/HTML/en/amarok/playlistqueue.png
+share/doc/HTML/en/amarok/queue.png
+share/doc/HTML/en/amarok/queueend.png
+share/doc/HTML/en/amarok/remotecollections_ampache_client1.png
+share/doc/HTML/en/amarok/remotecollections_ampache_client2.png
+share/doc/HTML/en/amarok/remotecollections_daap.png
+share/doc/HTML/en/amarok/searchincollection_example_editbox.png
+share/doc/HTML/en/amarok/searchincollection_example_editbox2.png
+share/doc/HTML/en/amarok/slim_toolbar.png
+share/doc/HTML/en/amarok/sorting.png
+share/doc/HTML/en/amarok/tagedit_fromfile_advanced.png
+share/doc/HTML/en/amarok/tagedit_fromfile_advanced_example.png
+share/doc/HTML/en/amarok/tagedit_fromfile_basic.png
+share/doc/HTML/en/amarok/tagedit_fromfile_basic_example.png
+share/doc/HTML/en/amarok/toolbar_main.png
+share/doc/HTML/en/amarok/tools_bookmarkmanager.png
+share/doc/HTML/en/amarok/tools_covermanager.png
+share/doc/HTML/en/amarok/tools_equalizer.png
+share/doc/HTML/en/amarok/track_progression.png
+share/doc/HTML/en/amarok/view-media-playlist.png
 share/icons/hicolor/128x128/apps/amarok.png
 share/icons/hicolor/16x16/apps/amarok.png
 share/icons/hicolor/22x22/apps/amarok.png
@@ -423,6 +651,7 @@ share/icons/hicolor/64x64/apps/amarok.png
 share/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
 share/kconf_update/amarok.upd
 share/knotifications5/amarok.notifyrc
+share/knsrcfiles/amarok.knsrc
 share/kpackage/amarok/org.kde.amarok.albums/contents.rcc
 share/kpackage/amarok/org.kde.amarok.albums/metadata.json
 share/kpackage/amarok/org.kde.amarok.analyzer/contents.rcc
@@ -442,15 +671,24 @@ share/kservices5/amarok.protocol
 share/kservices5/amarok_collection-mysqlcollection.desktop
 share/kservices5/amarok_service_ampache.desktop
 share/kservices5/amarok_service_ampache_config.desktop
+share/kservices5/amarok_service_lastfm.desktop
+share/kservices5/amarok_service_lastfm_config.desktop
 share/kservices5/amarok_service_magnatunestore.desktop
 share/kservices5/amarok_service_magnatunestore_config.desktop
 share/kservices5/amarok_storage-mysqlestorage.desktop
 share/kservices5/amarok_storage-mysqlserverstorage.desktop
 share/kservices5/amarokitpc.protocol
+share/kservices5/amaroklastfm.protocol
 share/kservicetypes5/amarok-contextapplet.desktop
 share/kservicetypes5/amarok-plugin.desktop
 share/kservicetypes5/amarok_codecinstall.desktop
+share/metainfo/org.kde.amarok.albums.appdata.xml
+share/metainfo/org.kde.amarok.analyzer.appdata.xml
 share/metainfo/org.kde.amarok.appdata.xml
 share/metainfo/org.kde.amarok.context.appdata.xml
+share/metainfo/org.kde.amarok.currenttrack.appdata.xml
+share/metainfo/org.kde.amarok.lyrics.appdata.xml
+share/metainfo/org.kde.amarok.photos.appdata.xml
+share/metainfo/org.kde.amarok.wikipedia.appdata.xml
 share/solid/actions/amarok-play-audiocd.desktop
 @dir share/mime/packages