From 77471363b556439c5c9f85bdda5722114f968792 Mon Sep 17 00:00:00 2001
From: cgiboudeaux <>
Date: Mar 02 2021 11:46:14 +0000
Subject: Update amarok to version 2.9.75git.20210220T172242~b94c362c1d / rev 126 via SR 874790


https://build.opensuse.org/request/show/874790
by user cgiboudeaux + RBrownSUSE
- Update to version 2.9.70git.20210220T172242~b94c362c1d:
  * replace QModelIndex.child to remove deprecated functions from Qt 5.8
  * Replace functions deprecated in Qt 5.7 and earlier
  * Properly use KLocalizedString for dynamic placeholder replacement
  * typo fixes
  * Use more secure URL
  * Don't use deprecated headers
  * Add CMake module used by release script
  * Bump plugin version to 74 in preparation for 2.9.71
  * Add multiplier 2 to the size of generated play-pause
    button and volume dial pixmaps.
  * Smoothen the rendering of play/pause button, volume
    dial and main toolbar's previous and next buttons on scaled UIs
- Update translations

---

diff --git a/.rev b/.rev
index 41f07f5..a52d425 100644
--- a/.rev
+++ b/.rev
@@ -1117,4 +1117,28 @@ https://git.reviewboard.kde.org/r/104878/ (forwarded request 116659 from StefanB
     <comment>new snapshot</comment>
     <requestid>858096</requestid>
   </revision>
+<<<<<<< Updated upstream
+=======
+  <revision rev="126" vrev="1">
+    <srcmd5>f0e93e20f7fd38986b53ed4fb405ac74</srcmd5>
+    <version>2.9.75git.20210220T172242~b94c362c1d</version>
+    <time>1614684432</time>
+    <user>RBrownSUSE</user>
+    <comment>- Update to version 2.9.70git.20210220T172242~b94c362c1d:
+  * replace QModelIndex.child to remove deprecated functions from Qt 5.8
+  * Replace functions deprecated in Qt 5.7 and earlier
+  * Properly use KLocalizedString for dynamic placeholder replacement
+  * typo fixes
+  * Use more secure URL
+  * Don't use deprecated headers
+  * Add CMake module used by release script
+  * Bump plugin version to 74 in preparation for 2.9.71
+  * Add multiplier 2 to the size of generated play-pause
+    button and volume dial pixmaps.
+  * Smoothen the rendering of play/pause button, volume
+    dial and main toolbar's previous and next buttons on scaled UIs
+- Update translations</comment>
+    <requestid>874790</requestid>
+  </revision>
+>>>>>>> Stashed changes
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index 6c3c89b..fbce6b3 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1,5 @@
+<<<<<<< Updated upstream
 75b9c1e10fa830ee021c5d071caa8bc0
+=======
+a0b9f9ec8f7133eb4c23b6b4f1976c33
+>>>>>>> Stashed changes
diff --git a/_service b/_service
index 0f18d6a..8ccbf64 100644
--- a/_service
+++ b/_service
@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
    <param name="changesgenerate">enable</param>
-   <param name="versionformat">2.9.70git.%ci~%h</param>
+   <param name="versionformat">2.9.75git.%ci~%h</param>
    <param name="url">https://invent.kde.org/multimedia/amarok.git</param>
    <param name="scm">git</param>
    <param name="filename">amarok</param>
diff --git a/_servicedata b/_servicedata
index 9b1294f..129d2cf 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,8 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://invent.kde.org/multimedia/amarok.git</param>
-              <param name="changesrevision">89d13c15ad9ed68189a7399f7fa79637be30c675</param></service></servicedata>
\ No newline at end of file
+<<<<<<< Updated upstream
+              <param name="changesrevision">89d13c15ad9ed68189a7399f7fa79637be30c675</param></service></servicedata>
+=======
+              <param name="changesrevision">b94c362c1dc3250025c52588a5ed28a84665dd6d</param></service></servicedata>
+>>>>>>> Stashed changes
diff --git a/amarok-2.9.75git.20210220T172242~b94c362c1d.tar.xz b/amarok-2.9.75git.20210220T172242~b94c362c1d.tar.xz
new file mode 120000
index 0000000..e8316f8
--- /dev/null
+++ b/amarok-2.9.75git.20210220T172242~b94c362c1d.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeibn4vskdxcbpi4gm7rvhypb2hkt77l6u3v5djpxvjdlaobpevdjyy
\ No newline at end of file
diff --git a/amarok.changes b/amarok.changes
index 24ccca9..ad9b2aa 100644
--- a/amarok.changes
+++ b/amarok.changes
@@ -1,4 +1,25 @@
 -------------------------------------------------------------------
+<<<<<<< Updated upstream
+=======
+Wed Feb 24 08:50:43 UTC 2021 - christophe@krop.fr
+
+- Update to version 2.9.70git.20210220T172242~b94c362c1d:
+  * replace QModelIndex.child to remove deprecated functions from Qt 5.8
+  * Replace functions deprecated in Qt 5.7 and earlier
+  * Properly use KLocalizedString for dynamic placeholder replacement
+  * typo fixes
+  * Use more secure URL
+  * Don't use deprecated headers
+  * Add CMake module used by release script
+  * Bump plugin version to 74 in preparation for 2.9.71
+  * Add multiplier 2 to the size of generated play-pause
+    button and volume dial pixmaps.
+  * Smoothen the rendering of play/pause button, volume
+    dial and main toolbar's previous and next buttons on scaled UIs
+- Update translations
+
+-------------------------------------------------------------------
+>>>>>>> Stashed changes
 Tue Dec 22 09:12:56 UTC 2020 - christophe@krop.fr
 
 - Update to version 2.9.70git.20201222T022603~89d13c15ad:
diff --git a/amarok.spec b/amarok.spec
index 310517d..f5fc243 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package amarok
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,10 +16,12 @@
 #
 
 
-# Leap 15.1 compatibility
-%{!?_kf5_knsrcfilesdir: %global _kf5_knsrcfilesdir %{_kf5_configdir}}
 Name:           amarok
+<<<<<<< Updated upstream
 Version:        2.9.70git.20201222T022603~89d13c15ad
+=======
+Version:        2.9.75git.20210220T172242~b94c362c1d
+>>>>>>> Stashed changes
 Release:        0
 Summary:        Media Player
 License:        GPL-2.0-or-later
@@ -35,22 +37,13 @@ Patch2:         disable-web-plugins-by-default.patch
 Patch3:         0001-Work-around-QTBUG-75797-for-openQA.patch
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
-BuildRequires:  fftw-devel
 BuildRequires:  gdk-pixbuf-devel
-BuildRequires:  libcurl-devel
 BuildRequires:  libgcrypt-devel
-BuildRequires:  libgpod-devel >= 0.7.0
 BuildRequires:  liblastfm-qt5-devel
-BuildRequires:  libmtp-devel >= 1.0.0
-BuildRequires:  libmygpo-qt5-devel
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  libmysqld-devel
-BuildRequires:  libofa-devel
-BuildRequires:  libqca-qt5-devel
-BuildRequires:  libxml2-devel
 BuildRequires:  loudmouth-devel
 BuildRequires:  mysql
-BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  cmake(KF5Archive)
@@ -80,7 +73,9 @@ BuildRequires:  cmake(KF5ThreadWeaver)
 BuildRequires:  cmake(KF5Wallet)
 BuildRequires:  cmake(KF5WidgetsAddons)
 BuildRequires:  cmake(KF5WindowSystem)
+BuildRequires:  cmake(Mygpo-qt5)
 BuildRequires:  cmake(Phonon4Qt5)
+BuildRequires:  cmake(Qca-qt5)
 BuildRequires:  cmake(Qt5Core)
 BuildRequires:  cmake(Qt5DBus)
 BuildRequires:  cmake(Qt5Gui)
@@ -93,16 +88,23 @@ BuildRequires:  cmake(Qt5UiTools)
 BuildRequires:  cmake(Qt5WebEngine)
 BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  cmake(Qt5Xml)
+BuildRequires:  pkgconfig(fftw3)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavformat)
 BuildRequires:  pkgconfig(libavutil)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libgpod-1.0)
+BuildRequires:  pkgconfig(libmtp) >= 1.0.0
+BuildRequires:  pkgconfig(libofa)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(taglib)
 BuildRequires:  pkgconfig(taglib-extras)
 BuildRequires:  pkgconfig(zlib)
 # needed by the context view
 Requires:       kirigami2
-Requires:       libqt5-qtquickcontrols
+Requires:       libqt5-qtquickcontrols2
 Requires:       libtag-extras1 >= 1.0
 Recommends:     %{name}-lang = %{version}
 Recommends:     (gstreamer-plugins-ugly if phonon4qt5-backend-gstreamer)