guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

143/143: gnu: libksysguard: Apply patch.


From: guix-commits
Subject: 143/143: gnu: libksysguard: Apply patch.
Date: Mon, 21 Nov 2022 16:10:56 -0500 (EST)

mbakke pushed a commit to branch master
in repository guix.

commit 82804298ad5587721628bbd1030248d0733a4359
Author: Petr Hodina <phodina@protonmail.com>
AuthorDate: Tue Oct 4 20:55:37 2022 +0200

    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>
---
 gnu/local.mk                                       |  1 +
 gnu/packages/kde-plasma.scm                        |  1 +
 ...libksysguard-qdiriterator-follow-symlinks.patch | 24 ++++++++++++++++++++++
 3 files changed, 26 insertions(+)

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]