| 1 |
commit: 9997de4d0f1d79abc4339f8c5ab233606b7486d3 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 1 18:22:58 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 1 18:22:58 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9997de4d |
| 7 |
|
| 8 |
kde-plasma/kscreenlocker: Make ConsoleKit switch always accessible |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/kscreenlocker-5.19.5-ck-unlock.patch | 32 ++++++++++++++++++++++ |
| 14 |
.../kscreenlocker-5.19.49.9999.ebuild | 4 ++- |
| 15 |
kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild | 4 ++- |
| 16 |
3 files changed, 38 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-plasma/kscreenlocker/files/kscreenlocker-5.19.5-ck-unlock.patch b/kde-plasma/kscreenlocker/files/kscreenlocker-5.19.5-ck-unlock.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000000..bb15eba72b |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-plasma/kscreenlocker/files/kscreenlocker-5.19.5-ck-unlock.patch |
| 23 |
@@ -0,0 +1,32 @@ |
| 24 |
+From 1bac5f6e50bc3255ab0e4c9183e7456f53acfdd5 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 26 |
+Date: Sat, 1 Aug 2020 20:05:17 +0200 |
| 27 |
+Subject: [PATCH] Provide ConsoleKit switch irrespective of HAVE_LOGINCTL |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ CMakeLists.txt | 2 -- |
| 31 |
+ 1 file changed, 2 deletions(-) |
| 32 |
+ |
| 33 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 34 |
+index 60d3ee1..aaebc82 100644 |
| 35 |
+--- a/CMakeLists.txt |
| 36 |
++++ b/CMakeLists.txt |
| 37 |
+@@ -92,7 +92,6 @@ set_package_properties(loginctl PROPERTIES |
| 38 |
+ ) |
| 39 |
+ set(HAVE_LOGINCTL ${loginctl_FOUND}) |
| 40 |
+ |
| 41 |
+-if ( NOT HAVE_LOGINCTL ) |
| 42 |
+ find_package(ConsoleKit) |
| 43 |
+ set_package_properties(ConsoleKit PROPERTIES |
| 44 |
+ URL "https://github.com/ConsoleKit2/ConsoleKit2" |
| 45 |
+@@ -100,7 +99,6 @@ if ( NOT HAVE_LOGINCTL ) |
| 46 |
+ TYPE RECOMMENDED |
| 47 |
+ ) |
| 48 |
+ set(HAVE_CONSOLEKIT ${ConsoleKit_FOUND}) |
| 49 |
+-endif () |
| 50 |
+ |
| 51 |
+ if (HAVE_LOGINCTL OR HAVE_CONSOLEKIT) |
| 52 |
+ set(HAVE_UNLOCK_CAPABILITY TRUE) |
| 53 |
+-- |
| 54 |
+2.28.0 |
| 55 |
+ |
| 56 |
|
| 57 |
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild |
| 58 |
index adac48392d..490270a765 100644 |
| 59 |
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild |
| 60 |
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild |
| 61 |
@@ -57,6 +57,8 @@ PDEPEND=" |
| 62 |
|
| 63 |
RESTRICT+=" test" |
| 64 |
|
| 65 |
+PATCHES=( "${FILESDIR}/${PN}-5.19.5-ck-unlock.patch" ) |
| 66 |
+ |
| 67 |
src_prepare() { |
| 68 |
ecm_src_prepare |
| 69 |
|
| 70 |
@@ -77,7 +79,7 @@ src_test() { |
| 71 |
src_configure() { |
| 72 |
local mycmakeargs=( |
| 73 |
-DCMAKE_DISABLE_FIND_PACKAGE_Seccomp=ON |
| 74 |
- $(cmake_use_find_package consolekit loginctl) |
| 75 |
+ $(cmake_use_find_package consolekit ConsoleKit) |
| 76 |
-DPAM_REQUIRED=$(usex pam) |
| 77 |
$(cmake_use_find_package pam PAM) |
| 78 |
) |
| 79 |
|
| 80 |
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild |
| 81 |
index 10fdd8806a..3b3966efc6 100644 |
| 82 |
--- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild |
| 83 |
+++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild |
| 84 |
@@ -57,6 +57,8 @@ PDEPEND=" |
| 85 |
|
| 86 |
RESTRICT+=" test" |
| 87 |
|
| 88 |
+PATCHES=( "${FILESDIR}/${PN}-5.19.5-ck-unlock.patch" ) |
| 89 |
+ |
| 90 |
src_prepare() { |
| 91 |
ecm_src_prepare |
| 92 |
|
| 93 |
@@ -76,7 +78,7 @@ src_test() { |
| 94 |
|
| 95 |
src_configure() { |
| 96 |
local mycmakeargs=( |
| 97 |
- $(cmake_use_find_package consolekit loginctl) |
| 98 |
+ $(cmake_use_find_package consolekit ConsoleKit) |
| 99 |
-DPAM_REQUIRED=$(usex pam) |
| 100 |
$(cmake_use_find_package pam PAM) |
| 101 |
) |
Archives