[gentoo-commits] repo/gentoo:master commit in: kde-plasma/kscreenlocker/files/, kde-plasma/kscreenlocker/

[gentoo-commits] repo/gentoo:master commit in: kde-plasma/kscreenlocker/files/, kde-plasma/kscreenlocker/

[Michael Palimaka]

commit:     d2ced4da6a47084e23ed66581e056c2755f38f9c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 03:44:34 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 03:45:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ced4da

kde-plasma/kscreenlocker: backport patch from upstream removing bogus dependency

Gentoo-bug: 608300

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/kscreenlocker-5.9.1-deps.patch           | 31 ++++++++++++++++++++++
 .../kscreenlocker/kscreenlocker-5.9.1.ebuild       |  2 ++
 2 files changed, 33 insertions(+)

diff --git a/kde-plasma/kscreenlocker/files/kscreenlocker-5.9.1-deps.patch b/kde-plasma/kscreenlocker/files/kscreenlocker-5.9.1-deps.patch
new file mode 100644
index 0000000000..fca598d91c
--- /dev/null
+++ b/kde-plasma/kscreenlocker/files/kscreenlocker-5.9.1-deps.patch
@@ -0,0 +1,31 @@
+Gentoo-bug: 608300
+
+From dd9a089cfaefb24f012a137618e00005a48b6009 Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Wed, 8 Feb 2017 18:11:31 +0100
+Subject: [PATCH] Stop linking X11_Xcursor_LIB in KScreenLocker
+
+It's not used.
+
+BUG: 376068
+
+Differential Revision: https://phabricator.kde.org/D4505
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ef4bc6b..ec04a4d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -144,7 +144,6 @@ PRIVATE
+    KF5::ConfigGui
+    KF5::WindowSystem
+    ${X11_LIBRARIES}
+-   ${X11_Xcursor_LIB}
+    XCB::XCB
+    XCB::KEYSYMS
+    KF5::WaylandServer
+-- 
+2.10.2
+

diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.9.1.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.9.1.ebuild
index 9c1a67e6f7..3f8a150c2e 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.9.1.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.9.1.ebuild
@@ -53,6 +53,8 @@ RDEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${PN}-5.9.1-deps.patch" )
+
 src_prepare() {
 	kde5_src_prepare
 

[gentoo-commits] repo/gentoo:master commit in: kde-plasma/kscreenlocker/files/, kde-plasma/kscreenlocker/

[Andreas Sturmlechner]

commit:     7be87d03197beed0aed5eb18d03f2665f7617bca
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 18:22:58 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 22:57:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be87d03

kde-plasma/kscreenlocker: Make ConsoleKit switch always accessible

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kscreenlocker-5.19.5-ck-unlock.patch     | 32 ++++++++++++++++++++++
 .../kscreenlocker/kscreenlocker-5.19.4-r1.ebuild   |  4 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)

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 00000000000..bb15eba72b8
--- /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.4-r1.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.19.4-r1.ebuild
index 06317c83154..8848223ae78 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.19.4-r1.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.19.4-r1.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)
 	)