gentoo resync : 22.12.2021

4 files changed, 56 insertions, 59 deletions

diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 5bd3fed3ff20..f1801f8be5d9 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,7 +1,6 @@
 AUX libkworkspace-5.21.90-standalone.patch 4996 BLAKE2B 1f09de9fbd1426fc065066897b1b966cda3993f0b1b6ac2a490d4c3c71863b93212e58ccc87353dc836fd58d969cc22c0a3ab8e6c6aacf81ac35823624e693dd SHA512 8702b74cdefbfc793e9ec0a1ce6ed6cca9f92b6c2d8c60d1a40c1530336af9c212d460ebca31ba8d28e3bcb02c1e6ae99dbea39d3572f1658e8d3575d1d947ca
 AUX libkworkspace-5.22.80-standalone.patch 4984 BLAKE2B e0f5c36ab657600326d0cbd29fe51c5ac6cf264caa7ec4c04473a2c5bf88113d8496b45618db103dd2e078efc1350b9fc613b25aeaa58bf0957d22ca4d37e5a0 SHA512 20c790d4860aec20b415c5c236537a5d8caf5666432c513adda0782694548320dc918c0d093ee0b716943df1fdab56c03a56f18ec691b0fc517443c35d0335ff
-DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47
+AUX libkworkspace-5.23.3-synchronous-dbus-calls.patch 1532 BLAKE2B ac54ae6e42b9e20633b33d3f42e00b184f0d65fa57ffffab7695a1463631b7f577a25722d8c3dcc51bfd55023cf30d22d1a73eb1f9c065a3800a81d6ecf27569 SHA512 927ab4b0641285094b6599384012a629b27ec596291c124b3dc01176dfb781b0b551b920d651738b518dba4f0b71426d671f8d977856c6c12221e3e6cb57f3d9
 DIST plasma-workspace-5.23.4.tar.xz 9012468 BLAKE2B 491c211bbfdecb1a4e7adb15647c6f9d7d2ded3314ddef855b79b4a222e1bedb4ac88b8a380d66ea296b6696248d67d0ce4757853d01300abdfbe85394936abe SHA512 730e8a69e5dc2e22db1356832aa2adc9255de179ed139c0abe06ad6b44dd0cffb8f214b32eb1f882eb73c337f44e16f64873789130939e25b2b8bab23d2dcfc2
-EBUILD libkworkspace-5.22.5.ebuild 1323 BLAKE2B 9c12d79979232dd53793878411e837800219b0da9a762aae21abcb4c7b6a0d7c0dca0e18f464a7607f75f4a7145c01acef15720730dd6599acd1b02ea6e10fe8 SHA512 62a495d6647173f8845e549b749f64b0b93136f1535a7943417e55bff603d9c7fc3259ec32e2901018332ad00145e7b8708864ebc1f795bb35bc63846ffebe37
-EBUILD libkworkspace-5.23.4.ebuild 1326 BLAKE2B 030ab1b313e6c1e13dfe580fc864120fbe174c5c6464f0ab92dbbd9d1f3a27f76f58f62fb0c62e2148e27aae4d00475f3c1a3ec6f712c307df8e33ef8beb442d SHA512 5d9581a1ec9b6ef4116a67b54ff991e13e413b0282ba28db62e6793910f32e66fd7cddc783f52f31876d61875c9b7f87fd688ce132919dde6a83c8c67ee84ee3
+EBUILD libkworkspace-5.23.4-r1.ebuild 1487 BLAKE2B 3ef83e814198a034b2abe01575d478edbfa99273a4060324a9d87f5b913a7299ea929295b4c0795e8e9b726d27ed6590144f2f18d6d7b560bba6c345a0079b8f SHA512 d79f548ef37bd87f0a35be5ecec6dde502f885dfe61b77a109763bcc24163ad2f3f92c5bf30826ef6d785b9db882273a326e327d78a5ca144226fe8c80e9968c
 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.22.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.22.5.ebuild
deleted file mode 100644
index fcf6591d2def..000000000000
--- a/kde-plasma/libkworkspace/libkworkspace-5.22.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Workspace library to interact with the Plasma session manager"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-"
-
-S="${S}/${PN}"
-
-src_prepare() {
-	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
-		rm -rf po/*/docs || die
-		cp -a ../po ./ || die
-	fi
-
-	eapply "${FILESDIR}/${PN}-5.21.90-standalone.patch"
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die
-	cat >> CMakeLists.txt <<- _EOF_ || die
-		ki18n_install(po)
-	_EOF_
-
-	ecm_src_prepare
-}
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.23.4.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.23.4-r1.ebuild
index aacfb311c9ba..73ad0d49376d 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.23.4.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.23.4-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
@@ -37,6 +37,11 @@ DEPEND="${RDEPEND}
 
 S="${S}/${PN}"
 
+PATCHES=(
+	# Pending: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1164
+	"${FILESDIR}"/${PN}-5.23.3-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