Hello community, here is the log from the commit of package amarok for openSUSE:Leap:15.2 checked in at 2020-05-14 06:51:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/amarok (Old) and /work/SRC/openSUSE:Leap:15.2/.amarok.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok" Thu May 14 06:51:22 2020 rev:49 rq:803709 version:2.9.70git.20200505T221221~fd05592cd8 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/amarok/amarok.changes 2020-03-06 12:36:12.934572588 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.amarok.new.2738/amarok.changes 2020-05-14 06:51:25.783696219 +0200 @@ -1,0 +2,34 @@ +Sat May 09 10:13:26 UTC 2020 - [email protected] + +- Update to version 2.9.70git.20200505T221221~fd05592cd8: + * fix compilation on FreeBSD where --libmysql-libs does not exist + * Fix the define used to distinguish MariaDB from Mysql + * Add override identifiers + * Remove MPRIS1 support + * Use desktop entry spec compliant X-KDE-ServiceTypes keys + * Set StartupWMClass in desktop file + * Make icons look sharp with HiDPI + * Port from {from,to}Time_t to {from,to}SecsSinceEpoch + * Use currentDateTimeUtc().toTime_t() + * Add more override markers + * Remove Phabricator's .arcconfig + * Remove nepmukcollection + * Add more override markers + * Conclude porting of Last.fm to Amarok KF5 + * Fix copying and moving files to collection + * Fix dangling string pointers + * Add more override markers + * build: remove extra CMakeLists.txt + * build: re-enable the documentation + * Fix compatibility with modern MySQL + * DiagnosticDialog: Use QStringLiteral + * Fix a crash when trying to open the DiagnosticDialog + * Fix duplicate include guard + * Add more override markers + * PHAACG2.py: fix comparison with literal + * appdata: improve URLs +- Update translations +- Rebase amarok_mariadb.patch +- Rebase 0001-Work-around-QTBUG-75797-for-openQA.patch + +------------------------------------------------------------------- Old: ---- amarok-2.9.70git.20200225T224218~2084224e4c.tar.xz New: ---- amarok-2.9.70git.20200505T221221~fd05592cd8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.YtoOC5/_old 2020-05-14 06:51:26.351697443 +0200 +++ /var/tmp/diff_new_pack.YtoOC5/_new 2020-05-14 06:51:26.351697443 +0200 @@ -17,7 +17,7 @@ Name: amarok -Version: 2.9.70git.20200225T224218~2084224e4c +Version: 2.9.70git.20200505T221221~fd05592cd8 Release: 0 Summary: Media Player License: GPL-2.0-or-later @@ -60,6 +60,7 @@ BuildRequires: cmake(KF5DBusAddons) BuildRequires: cmake(KF5DNSSD) BuildRequires: cmake(KF5Declarative) +BuildRequires: cmake(KF5DocTools) BuildRequires: cmake(KF5GlobalAccel) BuildRequires: cmake(KF5GuiAddons) BuildRequires: cmake(KF5I18n) @@ -158,9 +159,11 @@ %{_kf5_configdir}/* %{_kf5_configkcfgdir}/ %{_kf5_dbusinterfacesdir}/ +%{_kf5_htmldir}/en/amarok/ %{_kf5_iconsdir}/hicolor/*/*/* %{_kf5_libdir}/libamarok-sqlcollection.so* %{_kf5_libdir}/libamarok-transcoding.so* +%{_kf5_libdir}/libamarok_service_lastfm_config.so %{_kf5_libdir}/libamarokcore.so* %{_kf5_libdir}/libamaroklib.so* %{_kf5_libdir}/libamarokpud.so* ++++++ 0001-Work-around-QTBUG-75797-for-openQA.patch ++++++ --- /var/tmp/diff_new_pack.YtoOC5/_old 2020-05-14 06:51:26.375697495 +0200 +++ /var/tmp/diff_new_pack.YtoOC5/_new 2020-05-14 06:51:26.379697503 +0200 @@ -8,7 +8,7 @@ 1 file changed, 6 insertions(+) diff --git a/src/main.cpp b/src/main.cpp -index c8ce816d60..55b7df022f 100644 +index ad729e5085..12c1557b3b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -29,6 +29,7 @@ @@ -29,8 +29,5 @@ + QSurfaceFormat::setDefaultFormat(fmt); + App app(argc, argv); + app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); - #ifdef WITH_QT_WEBENGINE --- -2.21.0 - ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.YtoOC5/_old 2020-05-14 06:51:26.411697572 +0200 +++ /var/tmp/diff_new_pack.YtoOC5/_new 2020-05-14 06:51:26.411697572 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">git://anongit.kde.org/amarok</param> - <param name="changesrevision">2084224e4c30d282936333a6894071245b62dc7b</param> + <param name="changesrevision">fd05592cd8d1c1262b0641a0b85d6444d0e91f31</param> </service> </servicedata> \ No newline at end of file ++++++ amarok-2.9.70git.20200225T224218~2084224e4c.tar.xz -> amarok-2.9.70git.20200505T221221~fd05592cd8.tar.xz ++++++ /work/SRC/openSUSE:Leap:15.2/amarok/amarok-2.9.70git.20200225T224218~2084224e4c.tar.xz /work/SRC/openSUSE:Leap:15.2/.amarok.new.2738/amarok-2.9.70git.20200505T221221~fd05592cd8.tar.xz differ: char 26, line 1 ++++++ amarok-lang.tar.xz ++++++ ++++ 150578 lines of diff (skipped) ++++++ amarok_mariadb.patch ++++++ --- /var/tmp/diff_new_pack.YtoOC5/_old 2020-05-14 06:51:27.531699987 +0200 +++ /var/tmp/diff_new_pack.YtoOC5/_new 2020-05-14 06:51:27.531699987 +0200 @@ -4,24 +4,31 @@ Author: Wolfgang Bauer diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake -index 7aab8ab..a6a59dc 100644 +index 0bd7fdfd07..8973729f1f 100644 --- a/cmake/modules/FindMySQL.cmake +++ b/cmake/modules/FindMySQL.cmake -@@ -42,7 +42,16 @@ if(MYSQLCONFIG_EXECUTABLE) - # 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. +@@ -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}) -+ # 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 +- 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 ++ PATH_SUFFIXES + mysql -+ ) - else() - set(MYSQL_EMBEDDED_LIBRARIES ${MC_MYSQL_EMBEDDED_LIBRARIES}) - endif() ++ ) + endif() + + # Try searching manually via find_path/find_library, possibly with hints
