mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-09 18:47:16 -08:00
kde-plasma/ksystemstats: Re-add IUSE networkmanager
See also: https://invent.kde.org/plasma/ksystemstats/-/merge_requests/133 https://invent.kde.org/plasma/ksystemstats/-/merge_requests/140 Bug: https://bugs.gentoo.org/978009 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
@@ -0,0 +1,41 @@
|
||||
From e78ea0a56cbfa0045ec28dd5753cdc885f3ca411 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
Date: Thu, 25 Jun 2026 20:58:48 +0200
|
||||
Subject: [PATCH] CMake: Provide explicit WITH_NM option for
|
||||
KF6NetworkManagerQt dep
|
||||
|
||||
Done as CMakeDependentOption based on "LINUX" to slot in for the
|
||||
existing conditional.
|
||||
|
||||
Amends c2414374c8280317e9d2268a3b67f2625a128d60
|
||||
|
||||
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
---
|
||||
CMakeLists.txt | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f3e032c..38d0b72 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -14,6 +14,7 @@ set(KDE_COMPILERSETTINGS_LEVEL "5.82")
|
||||
find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE)
|
||||
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
|
||||
|
||||
+include(CMakeDependentOption)
|
||||
include(CheckIncludeFiles)
|
||||
include(KDEInstallDirs)
|
||||
include(KDECMakeSettings)
|
||||
@@ -33,7 +34,8 @@ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Solid KIO Cra
|
||||
find_package(KSysGuard ${PROJECT_DEP_VERSION} REQUIRED)
|
||||
|
||||
# there's no NetworkManager on FreeBSD'
|
||||
-if (LINUX)
|
||||
+cmake_dependent_option(WITH_NM "Provide improved backend for network statistics" TRUE "LINUX" FALSE)
|
||||
+if (WITH_NM)
|
||||
find_package(KF6NetworkManagerQt ${KF6_MIN_VERSION} CONFIG REQUIRED)
|
||||
endif()
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
ECM_HANDBOOK="forceoptional"
|
||||
ECM_TEST="forceoptional"
|
||||
KFMIN=6.26.0
|
||||
QTMIN=6.10.1
|
||||
inherit ecm fcaps plasma.kde.org
|
||||
|
||||
DESCRIPTION="Plugin-based system monitoring daemon"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="6"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
|
||||
IUSE="networkmanager"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/libnl:3
|
||||
>=dev-qt/qtbase-${QTMIN}:6[dbus,network]
|
||||
>=kde-frameworks/kcoreaddons-${KFMIN}:6
|
||||
>=kde-frameworks/kcrash-${KFMIN}:6
|
||||
>=kde-frameworks/kdbusaddons-${KFMIN}:6
|
||||
>=kde-frameworks/ki18n-${KFMIN}:6
|
||||
>=kde-frameworks/kio-${KFMIN}:6
|
||||
>=kde-frameworks/solid-${KFMIN}:6
|
||||
>=kde-plasma/libksysguard-${KDE_CATV}:6
|
||||
net-libs/libpcap
|
||||
sys-apps/lm-sensors:=
|
||||
sys-libs/libcap
|
||||
virtual/libudev:=
|
||||
networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
# -m 0755 to avoid suid with USE="-filecaps"
|
||||
FILECAPS=( -m 0755 cap_perfmon=ep usr/libexec/ksystemstats_intel_helper )
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-6.7.3-optional-nm.patch" ) # in git master
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Libcap=ON
|
||||
-DWITH_NM=$(usex networkmanager)
|
||||
)
|
||||
ecm_src_configure
|
||||
}
|
||||
|
||||
CMAKE_SKIP_TESTS=(
|
||||
# bug 909312, needs virtualx but we don't care
|
||||
ksystemstatstest
|
||||
)
|
||||
Reference in New Issue
Block a user