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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 354EE158649 for ; Fri, 12 May 2023 13:04:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6315DE085B; Fri, 12 May 2023 13:04:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4726CE085B for ; Fri, 12 May 2023 13:04:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16FE9340D21 for ; Fri, 12 May 2023 13:04:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 45E478E4 for ; Fri, 12 May 2023 13:04:17 +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: <1683896597.280ea0002174c05d0e9250fa674d76ebb43bead7.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kde-cli-tools/files/, kde-plasma/kde-cli-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/kde-cli-tools/files/kde-cli-tools-5.27.5-kcmshell5.patch kde-plasma/kde-cli-tools/kde-cli-tools-5.27.5-r1.ebuild X-VCS-Directories: kde-plasma/kde-cli-tools/ kde-plasma/kde-cli-tools/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 280ea0002174c05d0e9250fa674d76ebb43bead7 X-VCS-Branch: master Date: Fri, 12 May 2023 13:04:17 +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: bb77edfd-a6e3-4d98-9aa3-b0f44abab7c9 X-Archives-Hash: 0d0feab91d7e67319b06031082c12bc6 commit: 280ea0002174c05d0e9250fa674d76ebb43bead7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 12 13:00:43 2023 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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 + + 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 +}