diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch index 440e979c0086..beede4d7ccb5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch +++ b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0001-allow-external-paths.patch @@ -1,17 +1,17 @@ -From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001 +From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 28 Jan 2015 07:15:30 -0600 -Subject: [PATCH] allow external paths +Subject: [PATCH 1/2] allow external paths --- src/kpackage/package.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp -index eb4a09b..f70f1a1 100644 +index 539b21a..977a026 100644 --- a/src/kpackage/package.cpp +++ b/src/kpackage/package.cpp -@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate() +@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate() : QSharedData(), fallbackPackage(0), metadata(0), @@ -21,5 +21,5 @@ index eb4a09b..f70f1a1 100644 checkedValid(false) { -- -2.1.4 +2.5.2 diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch new file mode 100644 index 000000000000..6e93fca9b21d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/0002-qdiriterator-follow-symlinks.patch @@ -0,0 +1,39 @@ +From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 14 Oct 2015 06:50:28 -0500 +Subject: [PATCH 2/2] qdiriterator follow symlinks + +--- + src/kpackage/packageloader.cpp | 2 +- + src/kpackage/private/packagejobthread.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp +index eb5ed47..94217f6 100644 +--- a/src/kpackage/packageloader.cpp ++++ b/src/kpackage/packageloader.cpp +@@ -241,7 +241,7 @@ QList PackageLoader::listPackages(const QString &packageFormat, + } else { + //qDebug() << "Not cached"; + // If there's no cache file, fall back to listing the directory +- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; ++ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; + const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")); + + QDirIterator it(plugindir, nameFilters, QDir::Files, flags); +diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp +index ca523b3..1cfa792 100644 +--- a/src/kpackage/private/packagejobthread.cpp ++++ b/src/kpackage/private/packagejobthread.cpp +@@ -145,7 +145,7 @@ bool indexDirectory(const QString& dir, const QString& dest) + QJsonArray plugins; + + int i = 0; +- QDirIterator it(dir, QStringList()<