gentoo auto-resync : 15:09:2024 - 12:11:38

4 files changed, 35 insertions, 1 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 9cfed2c4b0a1..fc54ef88a8e2 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index b13bbeb5f6d8..63b2924938ac 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -7,10 +7,11 @@ AUX plasma-workspace-6.1.4-fix-mediacontroller-1.patch 1373 BLAKE2B eaf2d564cfc8
 AUX plasma-workspace-6.1.4-fix-mediacontroller-2.patch 1987 BLAKE2B 8870c3a21575b64d47ca62f2488e1f6c9b0724105e0089c9b8e7d95653797bdad29ffa7422dad7395efdf03b2e6e6854ecc4b23c0c61c93d17ee626879b85fd6 SHA512 b44c7f3b0f216c6279627db5b4a59ff8167fc4583bca85978252d38f5878c976ca995b52ac4581cf0d07aafef9e21c2c440baed9dee912beba2d38fb63d1b484
 AUX plasma-workspace-6.1.4-fix-svg-images.patch 1275 BLAKE2B d47e2a77c33cd03429b7a9704f0e3102ea22d0feee339a48653038e3ab6bbcf7ae00faed9608e275d4697bd3eecab1748883ed0ef648fee4a28964b8c6174925 SHA512 c34c138037fc76306aa51d26a48c20796ad524cae973e7d403194a84e4f2a987b6b7bf8c788fa9c7da6250e3d2517f8c72a5c9c62556c0c496e74bd703f3f973
 AUX plasma-workspace-6.1.4-restart-unhide-timer-on-dnd.patch 1068 BLAKE2B 2f593499840a799e7683e599c2150f8c7e8f485b1ccb03c853915a4ec6cef1a9953f2d7b95bfac5a8b701d32c637b24201562d82aaaa3dc84450b1eb22f5aa10 SHA512 7d70cdbb370dbefe3721eb57ac66943db29f574401c5a47ec8c6ed897d928bb5e2d8f9e3bb608574c9e73f367d3f6db7dc85bf7f07dcd88be3b04b5336eb3981
+AUX plasma-workspace-6.1.5-fix-wayland-session-restore-saving.patch 1348 BLAKE2B 50a20d279325cd82ec7aa5b9dbdaa96003612e32ee7fcc421e9e1ac5017f31eb5386107f6231469faa18573cc9870fe7c02006e557278669446c6aab1791236b SHA512 6004732cae3cadc4cd1b56bc27807784a4bbd57985c550e66ab95e9c81101b9230ef408d02b2d472da7df81d942e300d90e5ae7ad2f04ccb6cabc00680bbe140
 DIST plasma-workspace-5.27.11.1.tar.xz 19490624 BLAKE2B eef62c13407073aea855878b0e8a109b2ea4532e9bffe97903e7163747b56ac01d881d9649c6a4d220a569e6fcaa9e7fb34996c8bb9a3f0abd5f6fa2e73abc47 SHA512 72bb17ba874be28ed15eb8536caa00cf0fb7777ad76728107ea8baa6216c5655a595d1364ec146f4c33b876c239c249bada9f75e3b0604d29de5f06bd327d006
 DIST plasma-workspace-6.1.4.tar.xz 19294480 BLAKE2B c0ebf51f6f67f43a09dcffe40fae7114b6234719e56053f36600999e289eb42e5d2ca281da0259fa0c60f5b3a3cfef4a8bb912f48cbf05eefc60fb5bc48193ec SHA512 c7ac27c60e75998e2cc6abb96004ce2abd84b7a7978de4fc256bf06892fca818595e2a5dd505768bcce9be4103ccecbb34d82761c0f7be45a402ca6173e90f05
 DIST plasma-workspace-6.1.5.tar.xz 19305196 BLAKE2B 4eb75be1404d84519fabdb148accbeb48227aebd2fadeee5c27ba37dc158685b8bf9283f41172dff86dbe07ffe47a62097f873e907dd44ada61a53b3dd1f04b8 SHA512 1b68ddb1d287733ec16900a14b56bf1dbdfb9bce0d10666c1a710612dee6cc786629ea0a924627d58f1268a9594e3bfae587d57bcd7c926bf48b8e914c5d9238
 EBUILD plasma-workspace-5.27.11.1-r1.ebuild 7049 BLAKE2B 9aa8f728e227338b85a7f351e47f73fa83844c4228644883d801d5da3965b430b8cfd57cfa4ad17acabf9535bb57e8c33da58ca9fca6b098ef414ebb96c879a7 SHA512 a81b272671b6f5eed5173dd3378e34534522dfec5aac040b4d2a1ff45bf0db2200fcbaccf7b6319be026a566af7aac92daa6fd2ee43aba57949e579b7233cda8
 EBUILD plasma-workspace-6.1.4-r1.ebuild 7168 BLAKE2B e8b42d176996edcf9fde59d7f0ba3900bc60c12b96d0e25678954383ee98b9bf400f34c850290902bd23fb3122f8f91f749c266c5bbf104f133d6541d31c845b SHA512 475e735aeff60c49b2f36a77056ef234da46d4ceee3810d7cdfbfb120a76f67c2927f6b609302ab09f98b15ae38165a6b35aea5e4d6faf08d690d5ae116fbc5d
-EBUILD plasma-workspace-6.1.5.ebuild 6917 BLAKE2B 50af8eaf1f961c13c5a31e2d773f7a8db0893d4c353c16e2d5d55270cc0cf1e3e1c68b4e17bd76af9661ba7a56e80205a2c86f94ce7bffcca7bcb4655b0c3ba4 SHA512 b73c922420f0a3ebedba09937a9323c16afe5b88f838639460bb600ebd4699d56a27964121541ca9f09b2e91235ca636b7168b71063b548cd98c5a98f74c251d
+EBUILD plasma-workspace-6.1.5-r1.ebuild 6995 BLAKE2B f8b843736e7fc46fcec6fe8afaa2152e5f2a278c1a601b6cfcffa657fe1eb819c29d5c16332f1339b0ccc35375b64e1cac11429a1dbf264c89c359bd23fcdf04 SHA512 04c3c1193138ab71d997a9cd6a32c7914ae8003246728f709b308a771c44e5c82c24b40a8211f2bd107fdd74413b1fa965278bdb2758f0b4f2605f3a1a039640
 MISC metadata.xml 1026 BLAKE2B 49c2bc5fdc752caf8f45ce982633df0542a008ba1ef0cc99d32b64d6cd73c237d9c98484cac16fa32210156a080e17ad365c2d4eeb81cd3e9a7dc2119b1f7395 SHA512 4cdf77f6be4ce18148936e2a7012b86c70cdcc9de8b99455b3db65a4a52990eb604082ca098cdaee5fe6762bb9d138861f687f8d5fbedb3f60eef7c7be3a42cb
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-wayland-session-restore-saving.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-wayland-session-restore-saving.patch
new file mode 100644
index 000000000000..925be20afcc9
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.5-fix-wayland-session-restore-saving.patch
@@ -0,0 +1,32 @@
+From 4dff1973116597210cf9fb1c102e5c9433d13b1d Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Sat, 14 Sep 2024 13:22:05 +0000
+Subject: [PATCH] startkde: Fix wayland session restore saving
+
+When we added manual saving support to plasma-shutdown a guard was
+changed in the normal shutdown path. This guard was wrong, we want to
+check we're in the restorePreviousLogout path here.
+
+This amends 804976c5ecec1fbf5f6e7e09970a8269bdf748d2
+
+BUG: 436318
+---
+ startkde/plasma-shutdown/shutdown.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/startkde/plasma-shutdown/shutdown.cpp b/startkde/plasma-shutdown/shutdown.cpp
+index 11c002bcd80..ab93cca6ef7 100644
+--- a/startkde/plasma-shutdown/shutdown.cpp
++++ b/startkde/plasma-shutdown/shutdown.cpp
+@@ -84,7 +84,7 @@ void Shutdown::ksmServerComplete()
+ {
+     const KConfigGroup c(KSharedConfig::openConfig(QStringLiteral("ksmserverrc")), QStringLiteral("General"));
+ 
+-    if (c.readEntry("loginMode", "restorePreviousLogout") == QLatin1String("restoreSavedSession")) {
++    if (c.readEntry("loginMode", "restorePreviousLogout") == QLatin1String("restorePreviousLogout")) {
+         // Now record windows that are not session managed
+         int ret = QProcess::execute(QStringLiteral(PLASMA_FALLBACK_SESSION_SAVE_BIN));
+         if (ret) {
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.1.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r1.ebuild
index 9a0e73749591..2042824ee0f6 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-6.1.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.1.5-r1.ebuild
@@ -161,6 +161,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+	"${FILESDIR}/${P}-fix-wayland-session-restore-saving.patch" # KDE-bug 436318
 )
 
 src_prepare() {