From bcd34b590b405b98a9a2a1f99b3dfbd371c2347e Mon Sep 17 00:00:00 2001
From: Justin Zobel <justin.zobel@gmail.com>
Date: Dec 03 2023 11:16:38 +0000
Subject: Update to 5.90.0


---

diff --git a/desktop-settings-shortcut.patch b/desktop-settings-shortcut.patch
deleted file mode 100644
index 19aaef8..0000000
--- a/desktop-settings-shortcut.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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 83c7132..ef08e4b 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -5,8 +5,8 @@
 
 Name:    plasma-desktop
 Summary: Plasma Desktop shell
-Version: 5.27.80
-Release: 5%{?dist}
+Version: 5.90.0
+Release: 1%{?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,9 +14,6 @@ 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
@@ -52,7 +49,6 @@ BuildRequires:  scim-devel
 
 BuildRequires:  kf6-rpm-macros
 BuildRequires:  extra-cmake-modules
-BuildRequires:  cmake(KF6Plasma)
 BuildRequires:  cmake(KF6DocTools)
 BuildRequires:  cmake(KF6I18n)
 BuildRequires:  cmake(KF6KCMUtils)
@@ -83,6 +79,10 @@ BuildRequires:  kwin-devel
 BuildRequires:  plasma-breeze-qt6
 BuildRequires:  plasma-workspace-devel
 
+BuildRequires:  cmake(PlasmaActivities)
+BuildRequires:  cmake(PlasmaActivitiesStats)
+BuildRequires:  cmake(Plasma)
+
 # Optional
 %if 0%{?fedora}
 BuildRequires:  cmake(AppStreamQt)
@@ -90,8 +90,6 @@ BuildRequires:  cmake(AppStreamQt)
 #BuildRequires:  cmake(KAccounts) intltool
 BuildRequires:  cmake(KUserFeedbackQt6)
 BuildRequires:  PackageKit-Qt6-devel
-BuildRequires:  cmake(KF6Activities)
-BuildRequires:  cmake(KF6ActivitiesStats)
 BuildRequires:  libcanberra-devel
 BuildRequires:  boost-devel
 BuildRequires:  pulseaudio-libs-devel
@@ -258,7 +256,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kaccess.desktop
 %{_datadir}/kglobalaccel/org.kde.plasma.emojier.desktop
 %{_datadir}/qlogging-categories6/*.categories
 %{_kf6_datadir}/dbus-1/interfaces/org.kde.touchpad.xml
-%{_kf6_datadir}/kconf_update/*
 %{_kf6_datadir}/kcmkeys
 %{_kf6_datadir}/knsrcfiles/
 %{_kf6_datadir}/kcm_recentFiles/workspace/settings/qml/recentFiles/BlacklistApplicationView.qml
@@ -289,6 +286,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kaccess.desktop
 
 
 %changelog
+* Sun Dec 03 2023 Justin Zobel <justin.zobel@gmail.com> - 5.90.0-1
+- Update to 5.90.0
+
 * Wed Nov 29 2023 Jan Grulich <jgrulich@redhat.com> - 5.27.80-5
 - Rebuild (qt6)