From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 41E64138359 for ; Sat, 1 Aug 2020 18:45:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CEC3E0984; Sat, 1 Aug 2020 18:45:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2CDD5E0984 for ; Sat, 1 Aug 2020 18:45:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7176534EDB5 for ; Sat, 1 Aug 2020 18:45:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED4F62FD for ; Sat, 1 Aug 2020 18:44:58 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1596306178.9997de4d0f1d79abc4339f8c5ab233606b7486d3.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kscreenlocker/files/, kde-plasma/kscreenlocker/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kscreenlocker/files/kscreenlocker-5.19.5-ck-unlock.patch kde-plasma/kscreenlocker/kscreenlocker-5.19.49.9999.ebuild kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild X-VCS-Directories: kde-plasma/kscreenlocker/ kde-plasma/kscreenlocker/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9997de4d0f1d79abc4339f8c5ab233606b7486d3 X-VCS-Branch: master Date: Sat, 1 Aug 2020 18:44:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2928a396-6295-4e39-8767-a37b06104ca2 X-Archives-Hash: 9f280befeccd8554626affff70866ac5 commit: 9997de4d0f1d79abc4339f8c5ab233606b7486d3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 1 18:22:58 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 1 18:22:58 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9997de4d kde-plasma/kscreenlocker: Make ConsoleKit switch always accessible Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/kscreenlocker-5.19.5-ck-unlock.patch | 32 ++++++++++++++++++++++ .../kscreenlocker-5.19.49.9999.ebuild | 4 ++- kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild | 4 ++- 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 +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) )