gentoo resync : 13.11.2021

3 files changed, 56 insertions, 2 deletions

diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 6bc4b8696320..27af0988faf9 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,7 +1,8 @@
 AUX libkworkspace-5.21.90-standalone.patch 4996 BLAKE2B 1f09de9fbd1426fc065066897b1b966cda3993f0b1b6ac2a490d4c3c71863b93212e58ccc87353dc836fd58d969cc22c0a3ab8e6c6aacf81ac35823624e693dd SHA512 8702b74cdefbfc793e9ec0a1ce6ed6cca9f92b6c2d8c60d1a40c1530336af9c212d460ebca31ba8d28e3bcb02c1e6ae99dbea39d3572f1658e8d3575d1d947ca
 AUX libkworkspace-5.22.80-standalone.patch 4984 BLAKE2B e0f5c36ab657600326d0cbd29fe51c5ac6cf264caa7ec4c04473a2c5bf88113d8496b45618db103dd2e078efc1350b9fc613b25aeaa58bf0957d22ca4d37e5a0 SHA512 20c790d4860aec20b415c5c236537a5d8caf5666432c513adda0782694548320dc918c0d093ee0b716943df1fdab56c03a56f18ec691b0fc517443c35d0335ff
+AUX libkworkspace-5.23.3-synchronous-dbus-calls.patch 1532 BLAKE2B ac54ae6e42b9e20633b33d3f42e00b184f0d65fa57ffffab7695a1463631b7f577a25722d8c3dcc51bfd55023cf30d22d1a73eb1f9c065a3800a81d6ecf27569 SHA512 927ab4b0641285094b6599384012a629b27ec596291c124b3dc01176dfb781b0b551b920d651738b518dba4f0b71426d671f8d977856c6c12221e3e6cb57f3d9
 DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
-DIST plasma-workspace-5.23.2.tar.xz 9005008 BLAKE2B 07b63db2c57032fbb85499dc2b1972316e5b42a900470c56c6b0821fd45b3e189b9a0684114f9f51d110a860f1f3b4aebd2b782cb372e8634d9660c512b06073 SHA512 18ff49d90b9232e5539c8dd274e9536f0965e4dd1725c3ba6c8f98e264d926d2bfc8cd5f2da7bdd643b45691b1b92dbf68197d8e85be534b18df5a9d70b2e799
+DIST plasma-workspace-5.23.3.tar.xz 9006500 BLAKE2B 651780480736ae0478b059e8dcff40d5411310693d3b0b24b9a8a5c442c45c555e69a99c3e0f20d82a4e0dc3a099537c172589e17afa2b34c68d314164913e73 SHA512 34f8835d35063b582b12b343475474b2c7b338ecef148871f28348fe73f2b1ea36d938553c8e97fd108ce441cbb7c97b450590b186c788608c9cf29c82d8c786
 EBUILD libkworkspace-5.22.5.ebuild 1323 BLAKE2B 9c12d79979232dd53793878411e837800219b0da9a762aae21abcb4c7b6a0d7c0dca0e18f464a7607f75f4a7145c01acef15720730dd6599acd1b02ea6e10fe8 SHA512 62a495d6647173f8845e549b749f64b0b93136f1535a7943417e55bff603d9c7fc3259ec32e2901018332ad00145e7b8708864ebc1f795bb35bc63846ffebe37
-EBUILD libkworkspace-5.23.2.ebuild 1326 BLAKE2B 030ab1b313e6c1e13dfe580fc864120fbe174c5c6464f0ab92dbbd9d1f3a27f76f58f62fb0c62e2148e27aae4d00475f3c1a3ec6f712c307df8e33ef8beb442d SHA512 5d9581a1ec9b6ef4116a67b54ff991e13e413b0282ba28db62e6793910f32e66fd7cddc783f52f31876d61875c9b7f87fd688ce132919dde6a83c8c67ee84ee3
+EBUILD libkworkspace-5.23.3.ebuild 1482 BLAKE2B 9cadeee199d8e7cc93215a95ef633c3b8d9236689ea01449ff8f4b2f51a19727eb7ab03244b4e2b79b0af30a9198eb59a7ef27a8fe8dc5099b67f3f1c1f4253a SHA512 c5a502c07a296e3f7a5fa7ee7609ef75f6d657a69aff02251b6703f78d9871b97bd586fefb0ce1f2ed63497eb92e904f97e51742fbfff3f5e8a9f99c01e683b4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch
new file mode 100644
index 000000000000..411bebf70412
--- /dev/null
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch
@@ -0,0 +1,48 @@
+From 9ecd45f28dc5c3a4b1716d09e0ba121ec5fb2a50 Mon Sep 17 00:00:00 2001
+From: Joe Breuer <kde@jmbreuer.net>
+Date: Mon, 1 Nov 2021 07:19:51 +0000
+Subject: [PATCH] Fix sleep/suspend sometimes not working ... from
+ ksmserver-logout-greeter, by making the DBus calls synchronous.
+
+---
+ libkworkspace/sessionmanagementbackend.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/sessionmanagementbackend.cpp b/sessionmanagementbackend.cpp
+index 83cd39395..a77a8a475 100644
+--- a/sessionmanagementbackend.cpp
++++ b/sessionmanagementbackend.cpp
+@@ -137,7 +137,6 @@ void LogindSessionBackend::shutdown()
+ {
+     // logind will confirm credentials with the caller, if the app quits after sending this
+     // this may fail
+-    // its not really needed for suspend tasks where the calling app won't be closing
+     m_login1->PowerOff(true).waitForFinished();
+ }
+ 
+@@ -148,17 +147,19 @@ void LogindSessionBackend::reboot()
+ 
+ void LogindSessionBackend::suspend()
+ {
+-    m_login1->Suspend(true);
++    // these need to be synchronous as well - ksmserver-logout-greeter specifically calls these
++    // and will quit immediately after
++    m_login1->Suspend(true).waitForFinished();
+ }
+ 
+ void LogindSessionBackend::hybridSuspend()
+ {
+-    m_login1->HybridSleep(true);
++    m_login1->HybridSleep(true).waitForFinished();
+ }
+ 
+ void LogindSessionBackend::hibernate()
+ {
+-    m_login1->Hibernate(true);
++    m_login1->Hibernate(true).waitForFinished();;
+ }
+ 
+ bool LogindSessionBackend::canShutdown() const
+-- 
+GitLab
+
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.23.2.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.23.3.ebuild
index aacfb311c9ba..12ee0890aa83 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.23.2.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.23.3.ebuild
@@ -37,6 +37,11 @@ DEPEND="${RDEPEND}
 
 S="${S}/${PN}"
 
+PATCHES=(
+	# Pending: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1164
+	"${FILESDIR}"/${P}-synchronous-dbus-calls.patch # bug 818124
+)
+
 src_prepare() {
 	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
 	if [[ ${KDE_BUILD_TYPE} = release ]]; then