kde-plasma/kscreenlocker: Make ConsoleKit switch always accessible

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2020-08-01 20:22:58 +02:00
parent c58d0a1d31
commit 7be87d0319
2 changed files with 35 additions and 1 deletions

View File

@@ -0,0 +1,32 @@
From 1bac5f6e50bc3255ab0e4c9183e7456f53acfdd5 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 1 Aug 2020 20:05:17 +0200
Subject: [PATCH] Provide ConsoleKit switch irrespective of HAVE_LOGINCTL
---
CMakeLists.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60d3ee1..aaebc82 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,7 +92,6 @@ set_package_properties(loginctl PROPERTIES
)
set(HAVE_LOGINCTL ${loginctl_FOUND})
-if ( NOT HAVE_LOGINCTL )
find_package(ConsoleKit)
set_package_properties(ConsoleKit PROPERTIES
URL "https://github.com/ConsoleKit2/ConsoleKit2"
@@ -100,7 +99,6 @@ if ( NOT HAVE_LOGINCTL )
TYPE RECOMMENDED
)
set(HAVE_CONSOLEKIT ${ConsoleKit_FOUND})
-endif ()
if (HAVE_LOGINCTL OR HAVE_CONSOLEKIT)
set(HAVE_UNLOCK_CAPABILITY TRUE)
--
2.28.0

View File

@@ -57,6 +57,8 @@ PDEPEND="
RESTRICT+=" test"
PATCHES=( "${FILESDIR}/${PN}-5.19.5-ck-unlock.patch" )
src_prepare() {
ecm_src_prepare
@@ -77,7 +79,7 @@ src_test() {
src_configure() {
local mycmakeargs=(
-DCMAKE_DISABLE_FIND_PACKAGE_Seccomp=ON
$(cmake_use_find_package consolekit loginctl)
$(cmake_use_find_package consolekit ConsoleKit)
-DPAM_REQUIRED=$(usex pam)
$(cmake_use_find_package pam PAM)
)