From 6ba0e8a8c4548703afb4fe689153b859b8cc8c31 Mon Sep 17 00:00:00 2001 From: Bernhard M. Wiedemann Date: Oct 02 2020 16:31:05 +0000 Subject: update 2020-10-02 16:31 --- diff --git a/.files b/.files index 05e621b..bcd825f 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 2dab41a..92d98ca 100644 --- a/.rev +++ b/.rev @@ -1090,4 +1090,23 @@ https://git.reviewboard.kde.org/r/104878/ (forwarded request 116659 from StefanB * Use https for bugs.kde.org 824812 + + 8d7dc6223e297d3f4dd32e74ec907e48 + 2.9.70git.20200930T124856~3973278a68 + + dimstar_suse + - Update to version 2.9.70git.20200930T124856~3973278a68: + * Replace qtscript with qjs engine + * Drop superfluous ZLIB linking + * Add FindMariaDB.cmake module and use it if MySQL is not found + * FindMySQL.cmake: Split out MySQL Embedded detection into FindMySQLe.cmake + * Port Amarok Script Engine from deprecated QScriptEngine to QJSEngine + * Update stylesheet to QT5 + * Replace deprecated Phonon module with PulseAudio + * cmake: install amarok.knsrc in newer ECM 5.58.0+ location + * appdata: use canonical help URL +- Drop amarok_mariadb.patch +- Update translations + 838840 + diff --git a/.servicemark b/.servicemark index 4992de6..29d8a06 100644 --- a/.servicemark +++ b/.servicemark @@ -1 +1 @@ -a94c0c15c3f1d7def40ceb4f7e363054 +ecb61573d9624c7dfab70b9b6b179b46 diff --git a/_servicedata b/_servicedata index 81bc8e7..4f4e731 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://invent.kde.org/multimedia/amarok.git - 4ae108506f46d7ea02bc58dc635a8329dc6a29f0 \ No newline at end of file + 3973278a68275f12278244bc0e960c5947c931b9 \ No newline at end of file diff --git a/amarok-2.9.70git.20200731T193253~4ae108506f.tar.xz b/amarok-2.9.70git.20200731T193253~4ae108506f.tar.xz deleted file mode 120000 index 6255347..0000000 --- a/amarok-2.9.70git.20200731T193253~4ae108506f.tar.xz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeidtahpe2vqlvxpjzt6ewaaokvwxbvrp6hgj6oznibvhy24alhupoe \ No newline at end of file diff --git a/amarok-2.9.70git.20200930T124856~3973278a68.tar.xz b/amarok-2.9.70git.20200930T124856~3973278a68.tar.xz new file mode 120000 index 0000000..fbd127b --- /dev/null +++ b/amarok-2.9.70git.20200930T124856~3973278a68.tar.xz @@ -0,0 +1 @@ +/ipfs/bafybeid6irrdhwiwk4lyvb6fea7and5uklnacu644whek3njtlkqkws3ie \ No newline at end of file diff --git a/amarok-lang.tar.xz b/amarok-lang.tar.xz index 7e119c9..00e494d 120000 --- a/amarok-lang.tar.xz +++ b/amarok-lang.tar.xz @@ -1 +1 @@ -/ipfs/bafybeiam65zyrqonsoxwys43b4djludmpbbmczappt53zb5v6b5uiybtcy \ No newline at end of file +/ipfs/bafybeictpmcgs7mz4nbvcnfoaioaj4kshxnopwsd7i3fzoayxvob32lc3a \ No newline at end of file diff --git a/amarok.changes b/amarok.changes index 57f6db7..0fb0371 100644 --- a/amarok.changes +++ b/amarok.changes @@ -1,4 +1,20 @@ ------------------------------------------------------------------- +Wed Sep 30 14:37:15 UTC 2020 - christophe@krop.fr + +- Update to version 2.9.70git.20200930T124856~3973278a68: + * Replace qtscript with qjs engine + * Drop superfluous ZLIB linking + * Add FindMariaDB.cmake module and use it if MySQL is not found + * FindMySQL.cmake: Split out MySQL Embedded detection into FindMySQLe.cmake + * Port Amarok Script Engine from deprecated QScriptEngine to QJSEngine + * Update stylesheet to QT5 + * Replace deprecated Phonon module with PulseAudio + * cmake: install amarok.knsrc in newer ECM 5.58.0+ location + * appdata: use canonical help URL +- Drop amarok_mariadb.patch +- Update translations + +------------------------------------------------------------------- Fri Aug 07 07:11:19 UTC 2020 - christophe@krop.fr - Update to version 2.9.70git.20200731T193253~4ae108506f: diff --git a/amarok.spec b/amarok.spec index 6da04f6..e5694d3 100644 --- a/amarok.spec +++ b/amarok.spec @@ -16,8 +16,10 @@ # +# Leap 15.1 compatibility +%{!?_kf5_knsrcfilesdir: %global _kf5_knsrcfilesdir %{_kf5_configdir}} Name: amarok -Version: 2.9.70git.20200731T193253~4ae108506f +Version: 2.9.70git.20200930T124856~3973278a68 Release: 0 Summary: Media Player License: GPL-2.0-or-later @@ -25,8 +27,6 @@ Group: Productivity/Multimedia/Sound/Players URL: https://amarok.kde.org/ Source0: %{name}-%{version}.tar.xz Source1: %{name}-lang.tar.xz -# PATCH-FIX-OPENSUSE -Patch0: amarok_mariadb.patch # PATCH-FIX-OPENSUSE flac_mimetype_bnc671581.diff bnc#671581 ctrippe@gmx.net -- Support for the changed mimetype for flac files Patch1: flac_mimetype_bnc671581.diff # PATCH-FIX-OPENSUSE @@ -54,7 +54,10 @@ BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: cmake(KF5Archive) +BuildRequires: cmake(KF5Attica) BuildRequires: cmake(KF5Codecs) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5Crash) BuildRequires: cmake(KF5DBusAddons) @@ -67,7 +70,6 @@ BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5KCMUtils) BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5Kirigami2) BuildRequires: cmake(KF5NewStuff) BuildRequires: cmake(KF5Notifications) BuildRequires: cmake(KF5NotifyConfig) @@ -76,19 +78,18 @@ BuildRequires: cmake(KF5Solid) BuildRequires: cmake(KF5TextEditor) BuildRequires: cmake(KF5ThreadWeaver) BuildRequires: cmake(KF5Wallet) +BuildRequires: cmake(KF5WidgetsAddons) BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(Phonon4Qt5) BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5DBus) BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Qml) -BuildRequires: cmake(Qt5QuickControls2) BuildRequires: cmake(Qt5QuickWidgets) -BuildRequires: cmake(Qt5Script) -BuildRequires: cmake(Qt5ScriptTools) BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(Qt5UiTools) BuildRequires: cmake(Qt5WebEngine) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) @@ -98,6 +99,7 @@ BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(taglib) BuildRequires: pkgconfig(taglib-extras) +BuildRequires: pkgconfig(zlib) # needed by the context view Requires: kirigami2 Requires: libqt5-qtquickcontrols @@ -114,7 +116,7 @@ Vorbis, audio CDs, podcasts and streams. Play lists can be stored in %lang_package %prep -%autosetup -a1 -p1 +%autosetup -p1 -a1 cat >> CMakeLists.txt << EOF ki18n_install(po) EOF @@ -139,7 +141,6 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %fdupes -s %{buildroot} %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files @@ -157,6 +158,7 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %{_kf5_dbusinterfacesdir}/ %{_kf5_htmldir}/en/amarok/ %{_kf5_iconsdir}/hicolor/*/*/* +%{_kf5_knsrcfilesdir}/amarok.knsrc %{_kf5_libdir}/libamarok-sqlcollection.so* %{_kf5_libdir}/libamarok-transcoding.so* %{_kf5_libdir}/libamarok_service_lastfm_config.so diff --git a/amarok_mariadb.patch b/amarok_mariadb.patch deleted file mode 100644 index 1055e58..0000000 --- a/amarok_mariadb.patch +++ /dev/null @@ -1,34 +0,0 @@ -Add amarok_mariadb.patch (taken from Arch Linux) to make embedded MySQL server -work with our mariadb - -Author: Wolfgang Bauer - -diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake -index 0bd7fdfd07..8973729f1f 100644 ---- a/cmake/modules/FindMySQL.cmake -+++ b/cmake/modules/FindMySQL.cmake -@@ -38,14 +38,16 @@ if(MYSQLCONFIG_EXECUTABLE) - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - -- if(NOT MC_MYSQL_EMBEDDED_LIBRARIES OR NOT "${MC_return_embedded}" STREQUAL "0") -- # At least on OpenSUSE and FreeBSD --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}) -- else() -- set(MYSQL_EMBEDDED_LIBRARIES ${MC_MYSQL_EMBEDDED_LIBRARIES}) -- endif() -+ # 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 -+ ) - endif() - - # Try searching manually via find_path/find_library, possibly with hints