From f45ab48b36f1f4b095c8a08737362409f871a2e1 Mon Sep 17 00:00:00 2001
From: Mark Wagie <mark@manjaro.org>
Date: Fri, 29 Mar 2024 11:46:43 -0600
Subject: [PATCH 1/3] [cinnamon] drop mugshot

---
 community/cinnamon/Packages-Desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/community/cinnamon/Packages-Desktop b/community/cinnamon/Packages-Desktop
index d1d48ca2..dc9f7984 100644
--- a/community/cinnamon/Packages-Desktop
+++ b/community/cinnamon/Packages-Desktop
@@ -162,7 +162,7 @@ manjaro-settings-manager-notifier  # optional for manjaro-settings-manager
 #>basic midori                     # dropped to AUR
 mintstick
 >extra mousetweaks                 # optional for onboard
->extra mugshot
+#>extra mugshot                    # obsolete
 >multilib lib32-mesa-utils         # Why?
 >extra onboard
 >extra parcellite

From 574681f57308fc005162c154a0d64ef984307ab0 Mon Sep 17 00:00:00 2001
From: Philip Mueller <philm@manjaro.org>
Date: Tue, 2 Apr 2024 15:55:15 +0700
Subject: [PATCH 2/3] [gaming] update to plasma 6

---
 oem/gaming-oem-kde6/Packages-Desktop | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/oem/gaming-oem-kde6/Packages-Desktop b/oem/gaming-oem-kde6/Packages-Desktop
index 57aec7a4..631d1f7b 100644
--- a/oem/gaming-oem-kde6/Packages-Desktop
+++ b/oem/gaming-oem-kde6/Packages-Desktop
@@ -114,7 +114,7 @@ packagekit-qt5
 sddm
 sddm-kcm
 
-## Plasma5
+## Plasma6
 audiocd-kio
 bluedevil
 kde-gtk-config
@@ -128,13 +128,12 @@ ksshaskpass
 kwallet-pam
 kwayland-integration
 kwin
-qt5-virtualkeyboard  # Virtual keyboard support for kwin-wayland
+qt6-virtualkeyboard  # Virtual keyboard support for kwin-wayland
 kwrited
 milou
 plasma-desktop
 plasma-nm
 plasma-pa
-#plasma-simplemenu
 plasma-workspace
 >extra plasma-workspace-wallpapers
 powerdevil
@@ -238,7 +237,6 @@ plasma-systemmonitor
 powertop
 #>extra qbittorrent
 neofetch
-systemd-kcm
 plymouth-kcm
 #>extra thunderbird
 >extra vlc
@@ -248,7 +246,7 @@ yakuake
 #manjaro-documentation-en
 
 ## Settings packages
-#manjaro-kde-settings
+manjaro-kde-settings
 manjaro-browser-settings
 
 ## Xorg Input Drivers

From 7cacbb7ff8ec42037f69cf5f8731b00d06382644 Mon Sep 17 00:00:00 2001
From: Philip Mueller <philm@manjaro.org>
Date: Tue, 2 Apr 2024 15:58:58 +0700
Subject: [PATCH 3/3] [kde6] use calamares 3.2

---
 manjaro/kde-dev/Packages-Desktop | 2 +-
 manjaro/kde-dev/Packages-Live    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manjaro/kde-dev/Packages-Desktop b/manjaro/kde-dev/Packages-Desktop
index f1b07628..745bb294 100644
--- a/manjaro/kde-dev/Packages-Desktop
+++ b/manjaro/kde-dev/Packages-Desktop
@@ -162,7 +162,7 @@ konsole
 ksystemlog
 kwalletmanager
 gwenview
-partitionmanager
+#partitionmanager
 >extra print-manager
 >extra skanlite
 spectacle
diff --git a/manjaro/kde-dev/Packages-Live b/manjaro/kde-dev/Packages-Live
index df7f5296..078b5803 100644
--- a/manjaro/kde-dev/Packages-Live
+++ b/manjaro/kde-dev/Packages-Live
@@ -1,4 +1,4 @@
-calamares-git
+calamares5
 >manjaro grub-theme-live-manjaro
 gsmartcontrol
 #manjaro-architect