From cbb1046c26224c38a9cdaa80c20232af75a5b2ac Mon Sep 17 00:00:00 2001
From: cgiboudeaux <>
Date: Sep 13 2021 14:30:46 +0000
Subject: Update amarok to version 2.9.75git.20210830T182443~10309f00af / rev 128 via SR 917455
https://build.opensuse.org/request/show/917455
by user cgiboudeaux + dimstar_suse
New snapshot
---
diff --git a/.files b/.files
index 1d54055..3525b7d 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index d93ea27..9cb3547 100644
--- a/.rev
+++ b/.rev
@@ -1157,4 +1157,12 @@ https://git.reviewboard.kde.org/r/104878/ (forwarded request 116659 from StefanB
* Fix disambiguation found by gettext 0.21
903742
+
+ de68b509264329b60408f0db4defa31e
+ 2.9.75git.20210830T182443~10309f00af
+
+ dimstar_suse
+ New snapshot
+ 917455
+
diff --git a/.servicemark b/.servicemark
index 9149fb2..f96ab2b 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-4620ea13d44650829da33373aaf07c16
+508601583a06c38ae24786dcd60cb114
diff --git a/0001-Work-around-QTBUG-75797-for-openQA.patch b/0001-Work-around-QTBUG-75797-for-openQA.patch
index eed7133..14a49ec 100644
--- a/0001-Work-around-QTBUG-75797-for-openQA.patch
+++ b/0001-Work-around-QTBUG-75797-for-openQA.patch
@@ -1,4 +1,4 @@
-From aff6614f03590301f29cd670947cfd8116fccf00 Mon Sep 17 00:00:00 2001
+From cda902acd673499f038fbdbf61116c4fbb3ea0af Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux
Date: Tue, 14 May 2019 11:53:01 +0200
Subject: [PATCH] Work around QTBUG-75797 for openQA
@@ -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 ad729e5085..12c1557b3b 100644
+index 59f759d275..de48b95bae 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,6 +29,7 @@
@@ -19,15 +19,18 @@ index ad729e5085..12c1557b3b 100644
#include
#ifdef WITH_QT_WEBENGINE
-@@ -47,6 +48,11 @@ AMAROK_EXPORT OcsData ocsData;
+@@ -50,6 +51,11 @@ int main( int argc, char *argv[] )
+ QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
+ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
- int main( int argc, char *argv[] )
- {
+ QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
+ if(fmt.redBufferSize() < 8)
+ fmt.setRedBufferSize(8);
+ QSurfaceFormat::setDefaultFormat(fmt);
+
App app(argc, argv);
- app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+ app.setApplicationDisplayName(i18n("Amarok"));
+--
+2.33.0
+
diff --git a/_servicedata b/_servicedata
index 14e7e85..b3d255a 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://invent.kde.org/multimedia/amarok.git
- 053657d827d5eceb427b5fdb3ab74771d005acee
\ No newline at end of file
+ 10309f00af91bd3d304fd47aaa63572795356e40
\ No newline at end of file
diff --git a/amarok-2.9.75git.20210626T134054~59b22189f6.tar.xz b/amarok-2.9.75git.20210626T134054~59b22189f6.tar.xz
deleted file mode 120000
index 2ab6e3e..0000000
--- a/amarok-2.9.75git.20210626T134054~59b22189f6.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeihpd2bklksgkcjp74anmwnsq6svheutpghqec67hsi7btdc6jgo6q
\ No newline at end of file
diff --git a/amarok-2.9.75git.20210830T182443~10309f00af.tar.xz b/amarok-2.9.75git.20210830T182443~10309f00af.tar.xz
new file mode 120000
index 0000000..533de55
--- /dev/null
+++ b/amarok-2.9.75git.20210830T182443~10309f00af.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeiajw52mttvaxnpka4bmaaht6ruoiycvfs7zpurxqtwfenvnu6n7tm
\ No newline at end of file
diff --git a/amarok-lang.tar.xz b/amarok-lang.tar.xz
index 016780c..b2f1872 120000
--- a/amarok-lang.tar.xz
+++ b/amarok-lang.tar.xz
@@ -1 +1 @@
-/ipfs/bafybeigebhyzxxwphiti4pjly6e6xxews7ckgl4o7tgwkukufl556onz2q
\ No newline at end of file
+/ipfs/bafybeicfufui6f6irl52m5gvbdz4z4m3udcmkcm2skfy37rckxnchvqosi
\ No newline at end of file
diff --git a/amarok.changes b/amarok.changes
index 3f1aead..adfc71c 100644
--- a/amarok.changes
+++ b/amarok.changes
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Wed Sep 08 06:43:42 UTC 2021 - christophe@krop.fr
+
+- Update to version 2.9.75git.20210830T182443~10309f00af:
+ * Set Attributes before constructing the Application
+ * Port away from KRandom, bump Qt req. ver. to 5.10
+- Rebase amarok-2.9.75git.20210830T182443~10309f00af.tar.xz
+- Update translations
+
+-------------------------------------------------------------------
Fri Jul 02 14:27:25 UTC 2021 - christophe@krop.fr
- Update to version 2.9.75git.20210626T134054~59b22189f6:
diff --git a/amarok.spec b/amarok.spec
index cf1c9df..8302f88 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -17,7 +17,7 @@
Name: amarok
-Version: 2.9.75git.20210626T134054~59b22189f6
+Version: 2.9.75git.20210830T182443~10309f00af
Release: 0
Summary: Media Player
License: GPL-2.0-or-later
@@ -137,6 +137,9 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%fdupes -s %{buildroot}
+# E: devel-file-in-non-devel-package
+rm %{buildroot}%{_kf5_libdir}/libamarok{core,lib,shared,-sqlcollection,-transcoding}.so
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -156,13 +159,13 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%{_kf5_htmldir}/en/amarok/
%{_kf5_iconsdir}/hicolor/*/*/*
%{_kf5_knsrcfilesdir}/amarok.knsrc
-%{_kf5_libdir}/libamarok-sqlcollection.so*
-%{_kf5_libdir}/libamarok-transcoding.so*
+%{_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*
-%{_kf5_libdir}/libamarokshared.so*
+%{_kf5_libdir}/libamarokcore.so.*
+%{_kf5_libdir}/libamaroklib.so.*
+%{_kf5_libdir}/libamarokpud.so
+%{_kf5_libdir}/libamarokshared.so.*
%{_kf5_libdir}/libampache_account_login.so
%{_kf5_libdir}/libgpodder_service_config.so
%{_kf5_notifydir}/amarok.notifyrc