diff --git a/.files b/.files
index 9b0ad11..75d6ce4 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 52f80af..c14bccf 100644
--- a/.rev
+++ b/.rev
@@ -1032,4 +1032,41 @@ https://git.reviewboard.kde.org/r/104878/ (forwarded request 116659 from StefanB
* Removed obsolete PackagePath role from AppletModel
779414
+
+ dfb78f30ad55de7d80d9cd22935e69d9
+ 2.9.70git.20200505T221221~fd05592cd8
+
+ dimstar_suse
+ - 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
+ 802611
+
diff --git a/.servicemark b/.servicemark
index 0d6df24..d921116 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-4bb1003d45920d41948a555c556ab2cf
+d72666941992c57b95ac82f1213bbeab
diff --git a/0001-Work-around-QTBUG-75797-for-openQA.patch b/0001-Work-around-QTBUG-75797-for-openQA.patch
index 7161567..eed7133 100644
--- a/0001-Work-around-QTBUG-75797-for-openQA.patch
+++ b/0001-Work-around-QTBUG-75797-for-openQA.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Work around QTBUG-75797 for openQA
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 @@ index c8ce816d60..55b7df022f 100644
+ QSurfaceFormat::setDefaultFormat(fmt);
+
App app(argc, argv);
+ app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
- #ifdef WITH_QT_WEBENGINE
---
-2.21.0
-
diff --git a/_servicedata b/_servicedata
index bda39bf..00835f2 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
git://anongit.kde.org/amarok
- 2084224e4c30d282936333a6894071245b62dc7b
+ fd05592cd8d1c1262b0641a0b85d6444d0e91f31
\ No newline at end of file
diff --git a/amarok-2.9.70git.20200225T224218~2084224e4c.tar.xz b/amarok-2.9.70git.20200225T224218~2084224e4c.tar.xz
deleted file mode 120000
index 24dd0ce..0000000
--- a/amarok-2.9.70git.20200225T224218~2084224e4c.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeig5natid7i2ilglywjashv63rcfpjhmoowhvf5cvmm2hjpu5pl7oe
\ No newline at end of file
diff --git a/amarok-2.9.70git.20200505T221221~fd05592cd8.tar.xz b/amarok-2.9.70git.20200505T221221~fd05592cd8.tar.xz
new file mode 120000
index 0000000..7aaf170
--- /dev/null
+++ b/amarok-2.9.70git.20200505T221221~fd05592cd8.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeiawfkeio6p5ylo256slevd263by5p2rsfjrthwltyhzcvie52r55e
\ No newline at end of file
diff --git a/amarok-lang.tar.xz b/amarok-lang.tar.xz
index 553dbee..7e119c9 120000
--- a/amarok-lang.tar.xz
+++ b/amarok-lang.tar.xz
@@ -1 +1 @@
-/ipfs/bafybeihcad6wqwew2ditglyjmjzzj4uihmtg2vaejr5k2cv6utzjogt27a
\ No newline at end of file
+/ipfs/bafybeiam65zyrqonsoxwys43b4djludmpbbmczappt53zb5v6b5uiybtcy
\ No newline at end of file
diff --git a/amarok.changes b/amarok.changes
index 4b1b6c7..d24a3a8 100644
--- a/amarok.changes
+++ b/amarok.changes
@@ -1,4 +1,38 @@
-------------------------------------------------------------------
+Sat May 09 10:13:26 UTC 2020 - christophe@krop.fr
+
+- 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
+
+-------------------------------------------------------------------
Wed Feb 26 12:49:20 UTC 2020 - christophe@krop.fr
- Update to version 2.9.70git.20200225T224218~2084224e4c:
diff --git a/amarok.spec b/amarok.spec
index 5c7748b..0670a7c 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -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(KF5Crash)
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 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%{_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*
diff --git a/amarok_mariadb.patch b/amarok_mariadb.patch
index 22dcbf3..1055e58 100644
--- a/amarok_mariadb.patch
+++ b/amarok_mariadb.patch
@@ -4,24 +4,31 @@ work with our mariadb
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