commit: 280ea0002174c05d0e9250fa674d76ebb43bead7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri May 12 13:00:43 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri May 12 13:03:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=280ea000
kde-plasma/kde-cli-tools: Fix use kcmshell5 instead of kcmshell6 Closes: https://bugs.gentoo.org/906198 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/kde-cli-tools-5.27.5-kcmshell5.patch | 22 +++++++ .../kde-cli-tools/kde-cli-tools-5.27.5-r1.ebuild | 73 ++++++++++++++++++++++ 2 files changed, 95 insertions(+) diff --git a/kde-plasma/kde-cli-tools/files/kde-cli-tools-5.27.5-kcmshell5.patch b/kde-plasma/kde-cli-tools/files/kde-cli-tools-5.27.5-kcmshell5.patch new file mode 100644 index 000000000000..4fa2309c6b37 --- /dev/null +++ b/kde-plasma/kde-cli-tools/files/kde-cli-tools-5.27.5-kcmshell5.patch @@ -0,0 +1,22 @@ +From 726690b34c1b75307fb8c830ba05dd00b98aa85a Mon Sep 17 00:00:00 2001 +From: Heiko Becker <[email protected]> +Date: Tue, 9 May 2023 21:29:52 +0200 +Subject: [PATCH] kinfo: Use kcmshell5 with Plasma *5* + +--- + kinfo/kinfo | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kinfo/kinfo b/kinfo/kinfo +index ddb5de31..6f911965 100644 +--- a/kinfo/kinfo ++++ b/kinfo/kinfo +@@ -3,4 +3,4 @@ + # SPDX-FileCopyrightText: 2023 Harald Sitter <[email protected]> + + export QT_LOGGING_RULES="*=false" +-exec kcmshell6 kcm_about-distro --args dump --platform offscreen ++exec kcmshell5 kcm_about-distro --args dump --platform offscreen +-- +GitLab + diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.27.5-r1.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.27.5-r1.ebuild new file mode 100644 index 000000000000..ddfd91e6dc29 --- /dev/null +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.27.5-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="optional" +KFMIN=5.102.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.7 +VIRTUALX_REQUIRED="test" +inherit ecm plasma.kde.org + +DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system" +HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"; + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="kdesu X" + +REQUIRED_USE="kdesu? ( X )" +# requires running kde environment +RESTRICT="test" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kactivities-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-plasma/libkworkspace-${PVCUT}:5 + kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 ) + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libX11 + ) +" +RDEPEND="${DEPEND} + kdesu? ( sys-apps/dbus[X] ) +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" + +PATCHES=( + "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" + "${FILESDIR}/${P}-kcmshell5.patch" # bug 906198 +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package kdesu KF5Su) + $(cmake_use_find_package X Qt5X11Extras) + ) + + ecm_src_configure +} + +src_install() { + ecm_src_install + use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu +}
