Sync with factory #2

Manually merged
anag_factory merged 9 commits from jsulig/amarok:leap-16.1 into leap-16.1 2026-02-11 09:38:19 +01:00
9 changed files with 61 additions and 31 deletions

View File

@@ -8,10 +8,10 @@ Subject: [PATCH] Work around QTBUG-75797 for openQA
1 file changed, 6 insertions(+)
diff --git a/src/main.cpp b/src/main.cpp
index 6bb07b64a7..d35fda12fb 100644
index 293a41323a..09f558bd17 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,6 +31,7 @@
@@ -29,6 +29,7 @@
#include <QCommandLineParser>
#include <QStandardPaths>
@@ -19,9 +19,9 @@ index 6bb07b64a7..d35fda12fb 100644
#include <QtGlobal>
#include <csignal>
@@ -44,6 +45,11 @@ int main( int argc, char *argv[] )
@@ -41,6 +42,11 @@ int main( int argc, char *argv[] )
{
QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+ QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
+ if(fmt.redBufferSize() < 8)
@@ -31,5 +31,3 @@ index 6bb07b64a7..d35fda12fb 100644
App app(argc, argv);
app.setApplicationDisplayName(i18n("Amarok"));
--
2.46.0

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2dce587b3c14bf920ea4d89076964eb974fc434570147280fcd1e43cf14ff1ac
size 47718388

View File

@@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEaIxjiyiAuKTxhFwdVj2d5l8ydWAFAmhtCuEACgkQVj2d5l8y
dWDmNwf/ZOunfwmooCH8Twv4S5wXtDI0zWynNIGeLRlKGVfTz/HkPal47PhaIQMD
kO9/VgtFmA6EqPb6bCbjGk6+ObU0kD83i1EPwpZ6UPCiTCm6lKtTe0EJYpKY3Piw
L5BaSGLYUuaxw+k6424WwoRT2haZJp/Rezf2TbCLPsIR8o/fg0sheVtC0RmI3xKh
8i3GUEMX4rZYgq2SsoqnyCCWDWrDiKIbTPFEpAL8dM5ifKw7D+s8CfHfhZh0IVxw
8wsKeiP4iOhVFuhbA2Oy90ieQVf0YZVMgEVJnamlYXYc7Syd8w4fhEPtxrQS9mWN
9gNdHTp4PvoVqH98qyTbMKU59gPKLg==
=WGA9
-----END PGP SIGNATURE-----

3
amarok-3.3.2.tar.xz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa436b09d3991be48cf37e6f0b71f58aebd5bffaba0fdce7ffd3c2b485d3660b
size 47742228

12
amarok-3.3.2.tar.xz.sig Normal file
View File

@@ -0,0 +1,12 @@
-----BEGIN PGP SIGNATURE-----
iQFPBAABCAA5FiEEaIxjiyiAuKTxhFwdVj2d5l8ydWAFAmlrabsbFIAAAAAABAAO
bWFudTIsMi41KzEuMTEsMiwyAAoJEFY9neZfMnVgNIQH/A8hAZKDCKTDwQGGIFwS
LNmhY4yeQnTJZdBPHjz6ggtA4pcsqH0daRofVyEm69Ty1ZmPGoZERFypljH8BJFC
/Q5+P6pOrcO4AweYP/myd+CmXq8bV0aMUSGX8V/vb1nnPdq1Gx8svGp2msB52KuE
JOH7TdaYSPjNSOZtbrowXEBVLAQYQ5RY10F8OZcIb3dIs3xCCO0jnZWjj+uxL1Rb
DzQWvyfeII//VNeTR8tkmL4ObJrOgjOiFtboZ83SHViiHV44D5V018d7kqwJvkRN
gP9ncQ81OirKuSJji4wYUESd2PjwNIQs45nWBMIpg9IZMtJQurbkiYi0IvZLRO9d
IZU=
=Pw+q
-----END PGP SIGNATURE-----

View File

@@ -1,3 +1,31 @@
-------------------------------------------------------------------
Tue Jan 20 17:47:30 UTC 2026 - Christophe Marin <christophe@krop.fr>
- Update to 3.3.2
https://blogs.kde.org/2026/01/18/amarok-3.3.2-released/
-------------------------------------------------------------------
Sat Aug 9 16:41:22 UTC 2025 - Christophe Marin <christophe@krop.fr>
- Update to 3.3.1
https://blogs.kde.org/2025/08/09/amarok-3.3.1-released/
* Enable saving and loading script console items, autocompletion
in script console, and re-enable some more scripting
functionality
* Convert the remaining main UI toolbuttons to use icons from
theme
* Clear out remnants of the now-discontinued MusicDNS service
* Fix example permission grant command in database settings (kde#386004)
* Fix equalizer gains not updating when selecting some presets (kde#463908)
* Fix continuing playback after timecoded tracks (cue files etc, (kde#270003)
* Fix MusicBrainz search
* Properly start CD playback if Amarok is not already running (kde#503310)
* Also transmit embedded cover art through MPRIS (kde#357620)
* Don't show transcoding dialog after canceling download (kde#275840)
* Load network information earlier to avoid crashes on startup (kde#507497)
* Try to export as-compatible-as-possible playlist files (kde#507329)
* Fix some random crashes during playback
-------------------------------------------------------------------
Wed Jul 9 10:12:04 UTC 2025 - Christophe Marin <christophe@krop.fr>

View File

@@ -1,7 +1,7 @@
#
# spec file for package amarok
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
%bcond_without released
Name: amarok
Version: 3.3.0
Version: 3.3.2
Release: 0
Summary: Media Player
License: GPL-2.0-or-later
@@ -135,6 +135,9 @@ This package provides documentation for the Amarok media player.
%prep
%autosetup -p1
# Reduce size of the context widget
sed -i 's#1.7#1.12#' src/MainWindow.cpp
%build
%cmake_kf6

View File

@@ -3,12 +3,12 @@ Subject: Disable plugins which cause automatic network requests by default
References: boo#1070899
diff --git a/src/services/lastfm/amarok_service_lastfm.json b/src/services/lastfm/amarok_service_lastfm.json
index 2097d4c700..a22ae393ed 100644
index 035ef66152..21054ba64c 100644
--- a/src/services/lastfm/amarok_service_lastfm.json
+++ b/src/services/lastfm/amarok_service_lastfm.json
@@ -53,7 +53,7 @@
@@ -63,7 +63,7 @@
"Description[tr]": "Last.fm işlevlerini Amarok ile tümleştiren bir hizmet",
"Description[uk]": "Служба, яка інтегрує функціональність Last.fm до Amarok",
"Description[x-test]": "xxA service that integrates Last.fm functionality into Amarokxx",
"Description[zh_TW]": "一種將 Last.fm 其功能性整合到 Amarok 中的服務",
- "EnabledByDefault": true,
+ "EnabledByDefault": false,
@@ -16,12 +16,12 @@ index 2097d4c700..a22ae393ed 100644
"License": "GPL",
"Name": "Last.fm",
diff --git a/src/services/magnatune/amarok_service_magnatunestore.json b/src/services/magnatune/amarok_service_magnatunestore.json
index bd9ae23938..cacc3b25de 100644
index 68dd12b6a1..0265f47405 100644
--- a/src/services/magnatune/amarok_service_magnatunestore.json
+++ b/src/services/magnatune/amarok_service_magnatunestore.json
@@ -53,7 +53,7 @@
@@ -63,7 +63,7 @@
"Description[tr]": "Kötü amaçlı olmayan Magnatune plak şirketinden etiketinden müzik önizle ve satın al",
"Description[uk]": "Прослухайте і купіть музику з ненав’язливої агенції звукозапису Magnatune",
"Description[x-test]": "xxPreview and buy music from the non-evil Magnatune record labelxx",
"Description[zh_TW]": "從標為不邪惡的 Magnatune 唱片標籤的音樂中,預聽並購買",
- "EnabledByDefault": true,
+ "EnabledByDefault": false,

View File

@@ -1,5 +1,5 @@
diff --git a/src/org.kde.amarok.desktop b/src/org.kde.amarok.desktop
index 506b2a0277..bcc85efcd4 100644
index d923bb44e5..b2ce0ddf98 100644
--- a/src/org.kde.amarok.desktop
+++ b/src/org.kde.amarok.desktop
@@ -194,7 +194,7 @@ Icon=amarok
@@ -9,5 +9,5 @@ index 506b2a0277..bcc85efcd4 100644
-MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;application/x-ogm-audio;audio/x-vorbis+ogg;audio/ogg;
+MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-flac;audio/flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;application/x-ogm-audio;audio/x-vorbis+ogg;audio/ogg;
X-DocPath=amarok/index.html
X-KDE-Keywords=music,podcast
X-KDE-Keywords[bg]=music,podcast
Keywords=music;podcast;
Keywords[ar]=موسيقى;مدونة صوتية;