swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-30 00:50:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

kcmutils: update patches

Browse source
This commit is contained in:
Thomas Tuegel 2015-10-14 06:45:24 -05:00
parent e76d31616c
commit ed4170f4f5
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/libraries/kde-frameworks-5.15/kcmutils/kcmutils-pluginselector-follow-symlinks.patch → pkgs/development/libraries/kde-frameworks-5.15/kcmutils/0001-qdiriterator-follow-symlinks.patch
View file

@ -1,13 +1,25 @@
From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 14 Oct 2015 06:43:53 -0500
Subject: [PATCH] qdiriterator follow symlinks
---
src/kpluginselector.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
index c63241b..2243f94 100644
index 9c3431d..d6b1ee2 100644
--- a/src/kpluginselector.cpp
+++ b/src/kpluginselector.cpp
@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
QStringList desktopFileNames;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
Q_FOREACH (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);
+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while (it.hasNext()) {
desktopFileNames.append(it.next());
}
--
2.5.2

2
pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix
View file

@ -10,7 +10,7 @@ kdeFramework {
kcoreaddons kiconthemes kitemviews kpackage kxmlgui
];
propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
patches = [ ./kcmutils-pluginselector-follow-symlinks.patch ];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};