z572 pushed a commit to branch kde-team
in repository guix.
commit bdfcc745b60d8cd77dadaab29b8ca5c795c58732
Author: Zheng Junjie <zhengjun...@iscas.ac.cn>
AuthorDate: Thu May 2 23:12:19 2024 +0800
gnu: libksysguard: Update to 6.0.4.
* gnu/packages/kde-plasma.scm (libksysguard): Update to 6.0.4.
[source]: Remvoe patches.
[native-inputs]: Use qttools replace qttools-5.
[inputs]: Remove qtbase-5, qtscript, qtx11extras. Use kauth-6,
kcompletion-6,
kconfig-6, kconfigwidgets-6, kcoreaddons-6, kdeclarative-6, kglobalaccel-6,
ki18n-6, kiconthemes-6, kio-6, knewstuff-6, kservice-6, kwidgetsaddons-6,
kwindowsystem-6, libplasma, qtdeclarative, qtwebchannel and qtwebengine
replace kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
kdeclarative, kglobalaccel, ki18n, kiconthemes, kio, knewstuff, kservice,
kwidgetsaddons, kwindowsystem, libplasma, qtdeclarative-5, qtwebchannel-5
and
qtwebengine-5.
[arguments]: Set #:qtbase to qtbase.
* gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch:
Remove it.
* gnu/local.mk (dist_patch_DATA): Unregister it.
Change-Id: Ic5b88315da7682dcd47ec19894b8ed88b87d6688
---
gnu/local.mk | 1 -
gnu/packages/kde-plasma.scm | 60 +++++++++++-----------
...libksysguard-qdiriterator-follow-symlinks.patch | 24 ---------
3 files changed, 29 insertions(+), 56 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 6aa28b8cac..336a385ed9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1629,7 +1629,6 @@ dist_patch_DATA =
\
%D%/packages/patches/libofa-ftbfs-2.diff \
%D%/packages/patches/libotr-test-auth-fix.patch \
%D%/packages/patches/libksieve-Fix-missing-link-libraries.patch \
- %D%/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch \
%D%/packages/patches/libmad-armv7-thumb-pt1.patch \
%D%/packages/patches/libmad-armv7-thumb-pt2.patch \
%D%/packages/patches/libmad-length-check.patch \
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index e636436189..59912b67b1 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -1101,52 +1101,50 @@ basic needs and easy to configure for those who want
special setups.")
(define-public libksysguard
(package
(name "libksysguard")
- (version "5.27.7")
+ (version "6.0.4")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kde/stable/plasma/" version
"/libksysguard-" version ".tar.xz"))
- (patches (search-patches
"libksysguard-qdiriterator-follow-symlinks.patch"))
(sha256
- (base32 "066bjar4105bfyry6ni7nnikz66bqzy5nvssz6vm4np3aa996ak8"))))
+ (base32 "1sldz8xm0clylmjnydnvqdaacvmhcd36vali48mqj4ihc3qc4sjn"))))
(native-inputs
- (list bash-minimal extra-cmake-modules pkg-config qttools-5))
+ (list bash-minimal extra-cmake-modules pkg-config qttools))
(inputs
- (list kauth
- kcompletion
- kconfig
- kconfigwidgets
- kcoreaddons
- kdeclarative
- kglobalaccel
- ki18n
- kiconthemes
- kio
- knewstuff
- kservice
- kwidgetsaddons
- kwindowsystem
+ (list kauth-6
+ kcompletion-6
+ kconfig-6
+ kconfigwidgets-6
+ kcoreaddons-6
+ kdeclarative-6
+ kglobalaccel-6
+ ki18n-6
+ kiconthemes-6
+ kio-6
+ knewstuff-6
+ kservice-6
+ kwidgetsaddons-6
+ kwindowsystem-6
libnl
libcap
libpcap
`(,lm-sensors "lib")
- plasma-framework
- qtbase-5
- qtdeclarative-5
- qtscript
- qtwebchannel-5
- qtwebengine-5
- qtx11extras
+ libplasma
+ qtdeclarative
+ qtwebchannel
+ qtwebengine
zlib))
(build-system qt-build-system)
(arguments
- (list #:phases #~(modify-phases %standard-phases
- (add-after 'unpack 'fix-test
- (lambda* _
- (substitute* "autotests/processtest.cpp"
- (("/bin/sh")
- (which "bash"))))))))
+ (list
+ #:qtbase qtbase
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-test
+ (lambda* _
+ (substitute* "autotests/processtest.cpp"
+ (("/bin/sh")
+ (which "bash"))))))))
(home-page "https://userbase.kde.org/KSysGuard";)
(synopsis "Network enabled task and system monitoring")
(description "KSysGuard can obtain information on system load and
diff --git
a/gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch
b/gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index ec4a34037d..0000000000
--- a/gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttue...@gmail.com>
-Date: Wed, 14 Oct 2015 07:07:22 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- processui/scripting.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/processui/scripting.cpp b/processui/scripting.cpp
-index efed8ff..841761a 100644
---- a/processui/scripting.cpp
-+++ b/processui/scripting.cpp
-@@ -293,7 +293,7 @@ void Scripting::loadContextMenu()
- const QStringList dirs =
- QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
QStringLiteral("ksysguard/scripts/"), QStandardPaths::LocateDirectory);
- for (const QString &dir : dirs) {
-- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"),
QDir::NoFilter, QDirIterator::Subdirectories);
-+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"),
QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
- while (it.hasNext()) {
- scripts.append(it.next());
- }
---
-2.5.2
