From 6b8bbf92b3c5e1bf6ff1bccad92809061b6d9ba7 Mon Sep 17 00:00:00 2001
From: Alessandro Astone <ales.astone@gmail.com>
Date: Nov 27 2023 17:53:35 +0000
Subject: Backport patch to fix desktop settings shortcut


---

diff --git a/desktop-settings-shortcut.patch b/desktop-settings-shortcut.patch
new file mode 100644
index 0000000..19aaef8
--- /dev/null
+++ b/desktop-settings-shortcut.patch
@@ -0,0 +1,26 @@
+From f16d0e61a858056dbc7195938176a9094d1122f6 Mon Sep 17 00:00:00 2001
+From: Alessandro Astone <ales.astone@gmail.com>
+Date: Mon, 27 Nov 2023 12:14:41 +0100
+Subject: [PATCH] containments/desktop: Restore desktop settings shortcut
+
+This used to be alt+d,alt+s and is documented as such in khelpcenter
+---
+ containments/desktop/package/contents/ui/main.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml
+index b1a5f3f67..a8958d0fb 100644
+--- a/containments/desktop/package/contents/ui/main.qml
++++ b/containments/desktop/package/contents/ui/main.qml
+@@ -385,7 +385,7 @@ ContainmentItem {
+             id: configAction
+             text: i18n("Configure Desktop and Wallpaper…")
+             icon.name: "preferences-desktop-wallpaper"
+-            shortcut: "alt+d,s"
++            shortcut: "alt+d,alt+s"
+             onTriggered: Plasmoid.containment.configureRequested(Plasmoid)
+         }
+ 
+-- 
+2.43.0
+
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index 96aed29..577f3d6 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -6,7 +6,7 @@
 Name:    plasma-desktop
 Summary: Plasma Desktop shell
 Version: 5.27.80
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LicenseRef-KDE-Accepted-GPL AND LicenseRef-KDE-Accepted-LGPL
 URL:     https://invent.kde.org/plasma/%{name}
@@ -14,6 +14,9 @@ URL:     https://invent.kde.org/plasma/%{name}
 Source0: https://download.kde.org/%{stable_kf6}/plasma/%{version}/%{name}-%{version}.tar.xz
 
 ## upstream patches
+# OpenQA uses this shortcut, but it broke in Plasma 6 alpha
+# https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/1876
+Patch0: desktop-settings-shortcut.patch
 
 ## downstream patches
 # default kickoff favorites: +konsole +apper
@@ -193,7 +196,7 @@ BuildArch: noarch
 
 
 %prep
-%autosetup -p0
+%autosetup -p1
 
 
 %build
@@ -286,6 +289,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kaccess.desktop
 
 
 %changelog
+* Mon Nov 27 2023 Alessandro Astone <ales.astone@gmail.com> - 5.27.80-4
+- Backport patch to fix desktop settings shortcut
+
 * Sat Nov 25 2023 Alessandro Astone <ales.astone@gmail.com> - 5.27.80-3
 - kio-extras is KF6