1 |
commit: 6f484adc11d7d6f33b260ce439848867a8bb5724 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 30 14:20:12 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 30 14:32:15 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f484adc |
7 |
|
8 |
kde-plasma/libkworkspace: drop 5.23.3* |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
|
12 |
kde-plasma/libkworkspace/Manifest | 1 - |
13 |
...bkworkspace-5.23.3-synchronous-dbus-calls.patch | 48 ----------------- |
14 |
.../libkworkspace/libkworkspace-5.23.3.ebuild | 60 ---------------------- |
15 |
3 files changed, 109 deletions(-) |
16 |
|
17 |
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest |
18 |
index d16cc13a2fe9..b47676d433af 100644 |
19 |
--- a/kde-plasma/libkworkspace/Manifest |
20 |
+++ b/kde-plasma/libkworkspace/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
DIST plasma-workspace-5.22.5.tar.xz 8401412 BLAKE2B 3479549ffb302f8beca8f37853540bd71cc03a02183826435ec47ded0df69f4b19e103d8b6e2cd16af001a9c04a34e2f37a98a461f40fb8837ed7e7128a6fcba SHA512 753ba35c3f0c3a5affe10d3a6149f1ebca7ed51b0710c079606e33ceada94a50eee1c1bafbb465fcc194038915c33edef1d79e0865e5702aab7a334d6d508c47 |
23 |
-DIST plasma-workspace-5.23.3.tar.xz 9006500 BLAKE2B 651780480736ae0478b059e8dcff40d5411310693d3b0b24b9a8a5c442c45c555e69a99c3e0f20d82a4e0dc3a099537c172589e17afa2b34c68d314164913e73 SHA512 34f8835d35063b582b12b343475474b2c7b338ecef148871f28348fe73f2b1ea36d938553c8e97fd108ce441cbb7c97b450590b186c788608c9cf29c82d8c786 |
24 |
DIST plasma-workspace-5.23.4.tar.xz 9012468 BLAKE2B 491c211bbfdecb1a4e7adb15647c6f9d7d2ded3314ddef855b79b4a222e1bedb4ac88b8a380d66ea296b6696248d67d0ce4757853d01300abdfbe85394936abe SHA512 730e8a69e5dc2e22db1356832aa2adc9255de179ed139c0abe06ad6b44dd0cffb8f214b32eb1f882eb73c337f44e16f64873789130939e25b2b8bab23d2dcfc2 |
25 |
|
26 |
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 |
27 |
deleted file mode 100644 |
28 |
index 411bebf70412..000000000000 |
29 |
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch |
30 |
+++ /dev/null |
31 |
@@ -1,48 +0,0 @@ |
32 |
-From 9ecd45f28dc5c3a4b1716d09e0ba121ec5fb2a50 Mon Sep 17 00:00:00 2001 |
33 |
-From: Joe Breuer <kde@××××××××.net> |
34 |
-Date: Mon, 1 Nov 2021 07:19:51 +0000 |
35 |
-Subject: [PATCH] Fix sleep/suspend sometimes not working ... from |
36 |
- ksmserver-logout-greeter, by making the DBus calls synchronous. |
37 |
- |
38 |
---- |
39 |
- libkworkspace/sessionmanagementbackend.cpp | 9 +++++---- |
40 |
- 1 file changed, 5 insertions(+), 4 deletions(-) |
41 |
- |
42 |
-diff --git a/sessionmanagementbackend.cpp b/sessionmanagementbackend.cpp |
43 |
-index 83cd39395..a77a8a475 100644 |
44 |
---- a/sessionmanagementbackend.cpp |
45 |
-+++ b/sessionmanagementbackend.cpp |
46 |
-@@ -137,7 +137,6 @@ void LogindSessionBackend::shutdown() |
47 |
- { |
48 |
- // logind will confirm credentials with the caller, if the app quits after sending this |
49 |
- // this may fail |
50 |
-- // its not really needed for suspend tasks where the calling app won't be closing |
51 |
- m_login1->PowerOff(true).waitForFinished(); |
52 |
- } |
53 |
- |
54 |
-@@ -148,17 +147,19 @@ void LogindSessionBackend::reboot() |
55 |
- |
56 |
- void LogindSessionBackend::suspend() |
57 |
- { |
58 |
-- m_login1->Suspend(true); |
59 |
-+ // these need to be synchronous as well - ksmserver-logout-greeter specifically calls these |
60 |
-+ // and will quit immediately after |
61 |
-+ m_login1->Suspend(true).waitForFinished(); |
62 |
- } |
63 |
- |
64 |
- void LogindSessionBackend::hybridSuspend() |
65 |
- { |
66 |
-- m_login1->HybridSleep(true); |
67 |
-+ m_login1->HybridSleep(true).waitForFinished(); |
68 |
- } |
69 |
- |
70 |
- void LogindSessionBackend::hibernate() |
71 |
- { |
72 |
-- m_login1->Hibernate(true); |
73 |
-+ m_login1->Hibernate(true).waitForFinished();; |
74 |
- } |
75 |
- |
76 |
- bool LogindSessionBackend::canShutdown() const |
77 |
--- |
78 |
-GitLab |
79 |
- |
80 |
|
81 |
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.23.3.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.23.3.ebuild |
82 |
deleted file mode 100644 |
83 |
index 12ee0890aa83..000000000000 |
84 |
--- a/kde-plasma/libkworkspace/libkworkspace-5.23.3.ebuild |
85 |
+++ /dev/null |
86 |
@@ -1,60 +0,0 @@ |
87 |
-# Copyright 1999-2021 Gentoo Authors |
88 |
-# Distributed under the terms of the GNU General Public License v2 |
89 |
- |
90 |
-EAPI=8 |
91 |
- |
92 |
-ECM_TEST="true" |
93 |
-KDE_ORG_NAME="plasma-workspace" |
94 |
-KFMIN=5.86.0 |
95 |
-PVCUT=$(ver_cut 1-3) |
96 |
-QTMIN=5.15.2 |
97 |
-inherit ecm kde.org |
98 |
- |
99 |
-DESCRIPTION="Workspace library to interact with the Plasma session manager" |
100 |
- |
101 |
-LICENSE="GPL-2" # TODO: CHECK |
102 |
-SLOT="5" |
103 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
104 |
-IUSE="" |
105 |
- |
106 |
-RDEPEND=" |
107 |
- >=dev-qt/qtdbus-${QTMIN}:5 |
108 |
- >=dev-qt/qtx11extras-${QTMIN}:5 |
109 |
- >=kde-frameworks/kconfig-${KFMIN}:5 |
110 |
- >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
111 |
- >=kde-frameworks/ki18n-${KFMIN}:5 |
112 |
- >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
113 |
- >=kde-plasma/kscreenlocker-${PVCUT}:5 |
114 |
- x11-libs/libICE |
115 |
- x11-libs/libSM |
116 |
- x11-libs/libX11 |
117 |
- x11-libs/libXau |
118 |
-" |
119 |
-DEPEND="${RDEPEND} |
120 |
- >=kde-frameworks/kinit-${KFMIN}:5 |
121 |
- >=kde-plasma/kwin-${PVCUT}:5 |
122 |
-" |
123 |
- |
124 |
-S="${S}/${PN}" |
125 |
- |
126 |
-PATCHES=( |
127 |
- # Pending: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1164 |
128 |
- "${FILESDIR}"/${P}-synchronous-dbus-calls.patch # bug 818124 |
129 |
-) |
130 |
- |
131 |
-src_prepare() { |
132 |
- # delete colliding libkworkspace translations, let ecm_src_prepare do its magic |
133 |
- if [[ ${KDE_BUILD_TYPE} = release ]]; then |
134 |
- find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die |
135 |
- rm -rf po/*/docs || die |
136 |
- cp -a ../po ./ || die |
137 |
- fi |
138 |
- |
139 |
- eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" |
140 |
- sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die |
141 |
- cat >> CMakeLists.txt <<- _EOF_ || die |
142 |
- ki18n_install(po) |
143 |
- _EOF_ |
144 |
- |
145 |
- ecm_src_prepare |
146 |
-} |