kcmutils: drop merged patch

This commit is contained in:
K900 2022-08-14 13:32:26 +03:00
parent 8716fe21bd
commit f3a8a894a6
3 changed files with 1 additions and 29 deletions

View file

@ -152,7 +152,7 @@ let
# TIER 3
baloo = callPackage ./baloo.nix {};
kbookmarks = callPackage ./kbookmarks.nix {};
kcmutils = callPackage ./kcmutils {};
kcmutils = callPackage ./kcmutils.nix {};
kconfigwidgets = callPackage ./kconfigwidgets.nix {};
kdav = callPackage ./kdav.nix {};
kdeclarative = callPackage ./kdeclarative.nix {};

View file

@ -13,7 +13,4 @@ mkDerivation {
qtdeclarative
];
propagatedBuildInputs = [ kconfigwidgets kservice ];
patches = [
./0001-kcmutils-follow-symlinks.patch
];
}

View file

@ -1,25 +0,0 @@
From 4d5dcc309fba688aa1db8dd915a0abdf07f61e81 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 13 Jul 2020 11:23:36 -0500
Subject: [PATCH] kcmutils follow symlinks
---
src/kpluginselector.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
index 46deef5..2eacb9f 100644
--- a/src/kpluginselector.cpp
+++ b/src/kpluginselector.cpp
@@ -309,7 +309,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
QStringList desktopFileNames;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), 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()) {
desktopFileNames.append(it.next());
}
--
2.25.4