diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-08-01 20:22:58 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-08-01 20:22:58 +0200 |
| commit | 9997de4d0f1d79abc4339f8c5ab233606b7486d3 (patch) | |
| tree | 4633f7c616d10b976f03abd141546dd90c23e27d | |
| parent | kde-plasma/kscreenlocker: Disable seccomp sandboxing in 5.19 too (diff) | |
| download | kde-9997de4d.tar.gz kde-9997de4d.tar.bz2 kde-9997de4d.zip | |
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>
3 files changed, 38 insertions, 2 deletions
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 new file mode 100644 index 0000000000..bb15eba72b --- /dev/null +++ b/kde-plasma/kscreenlocker/files/kscreenlocker-5.19.5-ck-unlock.patch @@ -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 + diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild index adac48392d..490270a765 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild @@ -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) ) diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild index 10fdd8806a..3b3966efc6 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild @@ -57,6 +57,8 @@ PDEPEND=" RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${PN}-5.19.5-ck-unlock.patch" ) + src_prepare() { ecm_src_prepare @@ -76,7 +78,7 @@ src_test() { src_configure() { local mycmakeargs=( - $(cmake_use_find_package consolekit loginctl) + $(cmake_use_find_package consolekit ConsoleKit) -DPAM_REQUIRED=$(usex pam) $(cmake_use_find_package pam PAM) ) |