From ed4170f4f56d67052fbeba7824171dc2bbde68d7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 14 Oct 2015 06:45:24 -0500 Subject: [PATCH] kcmutils: update patches --- ...=> 0001-qdiriterator-follow-symlinks.patch} | 18 +++++++++++++++--- .../kde-frameworks-5.15/kcmutils/default.nix | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) rename pkgs/development/libraries/kde-frameworks-5.15/kcmutils/{kcmutils-pluginselector-follow-symlinks.patch => 0001-qdiriterator-follow-symlinks.patch} (53%) diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/0001-qdiriterator-follow-symlinks.patch similarity index 53% rename from pkgs/development/libraries/kde-frameworks-5.15/kcmutils/kcmutils-pluginselector-follow-symlinks.patch rename to pkgs/development/libraries/kde-frameworks-5.15/kcmutils/0001-qdiriterator-follow-symlinks.patch index 47b8dfad1800..0d861fa95012 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/kcmutils-pluginselector-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/0001-qdiriterator-follow-symlinks.patch @@ -1,13 +1,25 @@ +From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +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 + diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix index a0eb805e62b5..dbbb783ac615 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kcmutils/default.nix @@ -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 ]; };