aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorPetr Hodina <phodina@protonmail.com>2022-10-04 20:55:37 +0200
committerMarius Bakke <marius@gnu.org>2022-11-21 22:01:16 +0100
commit82804298ad5587721628bbd1030248d0733a4359 (patch)
treea10deb6d3dce6420328ae7d42a96168f7fd52be2 /gnu
parent7d9cd434777bc341ae098e057a209d9ae90677a2 (diff)
downloadguix-82804298ad5587721628bbd1030248d0733a4359.tar.gz
guix-82804298ad5587721628bbd1030248d0733a4359.zip
gnu: libksysguard: Apply patch.
* gnu/packages/kde-plasma.scm (libksysguard)[source]: Apply patch. * gnu/local.mk: Add patch. * gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch: New file. Signed-off-by: Marius Bakke <marius@gnu.org>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/kde-plasma.scm1
-rw-r--r--gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch24
3 files changed, 26 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index a8674cd6bd..c524666a12 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1442,6 +1442,7 @@ 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 ebed48234d..5af37e8de0 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -963,6 +963,7 @@ basic needs and easy to configure for those who want special setups.")
(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 "1gqsjsdkp25abqqp4f6cv6ih199q9ad7q1a4lkhjgsh4h8jq1856"))))
(native-inputs
diff --git a/gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch b/gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch
new file mode 100644
index 0000000000..ec4a34037d
--- /dev/null
+++ b/gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch
@@ -0,0 +1,24 @@
+From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@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