pyrox.dev / nixpkgs
lol
fork atom

kpackage: update patches

Thomas Tuegel acb2d5d9 8bc1acd9

+66 -41
+25
pkgs/development/libraries/kde-frameworks/kpackage/0001-Allow-external-paths-default.patch
··· 1 + From c134a83d226fc6b92412ee714bb6c7ab7e3a800f Mon Sep 17 00:00:00 2001 2 + From: Thomas Tuegel <ttuegel@mailbox.org> 3 + Date: Sun, 28 Mar 2021 10:25:18 -0500 4 + Subject: [PATCH 1/2] Allow external paths default 5 + 6 + --- 7 + src/kpackage/package.cpp | 2 +- 8 + 1 file changed, 1 insertion(+), 1 deletion(-) 9 + 10 + diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp 11 + index 36f5600..881f176 100644 12 + --- a/src/kpackage/package.cpp 13 + +++ b/src/kpackage/package.cpp 14 + @@ -858,7 +858,7 @@ PackagePrivate::PackagePrivate() 15 + : QSharedData() 16 + , fallbackPackage(nullptr) 17 + , metadata(nullptr) 18 + - , externalPaths(false) 19 + + , externalPaths(true) 20 + , valid(false) 21 + , checkedValid(false) 22 + { 23 + -- 24 + 2.30.1 25 +
+39
pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch
··· 1 + From b1c0d2542234247a5051df015d70347597dfe8d8 Mon Sep 17 00:00:00 2001 2 + From: Thomas Tuegel <ttuegel@mailbox.org> 3 + Date: Sun, 28 Mar 2021 10:26:40 -0500 4 + Subject: [PATCH 2/2] QDirIterator follow symlinks 5 + 6 + --- 7 + src/kpackage/packageloader.cpp | 2 +- 8 + src/kpackage/private/packagejobthread.cpp | 2 +- 9 + 2 files changed, 2 insertions(+), 2 deletions(-) 10 + 11 + diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp 12 + index f03d882..d5aee56 100644 13 + --- a/src/kpackage/packageloader.cpp 14 + +++ b/src/kpackage/packageloader.cpp 15 + @@ -234,7 +234,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat, 16 + } else { 17 + qCDebug(KPACKAGE_LOG) << "kpluginindex: Not cached" << plugindir; 18 + // If there's no cache file, fall back to listing the directory 19 + - const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; 20 + + const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; 21 + const QStringList nameFilters = {QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop")}; 22 + 23 + QDirIterator it(plugindir, nameFilters, QDir::Files, flags); 24 + diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp 25 + index 3eed307..dd6ca6e 100644 26 + --- a/src/kpackage/private/packagejobthread.cpp 27 + +++ b/src/kpackage/private/packagejobthread.cpp 28 + @@ -108,7 +108,7 @@ bool indexDirectory(const QString &dir, const QString &dest) 29 + 30 + QJsonArray plugins; 31 + 32 + - QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories); 33 + + QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); 34 + while (it.hasNext()) { 35 + it.next(); 36 + const QString path = it.fileInfo().absoluteFilePath(); 37 + -- 38 + 2.30.1 39 +
-13
pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch
··· 1 - diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp 2 - index 5aec9fd..b15c933 100644 3 - --- a/src/kpackage/package.cpp 4 - +++ b/src/kpackage/package.cpp 5 - @@ -820,7 +820,7 @@ PackagePrivate::PackagePrivate() 6 - : QSharedData(), 7 - fallbackPackage(nullptr), 8 - metadata(nullptr), 9 - - externalPaths(false), 10 - + externalPaths(true), 11 - valid(false), 12 - checkedValid(false) 13 - {
+2 -2
pkgs/development/libraries/kde-frameworks/kpackage/default.nix
··· 10 10 nativeBuildInputs = [ extra-cmake-modules kdoctools ]; 11 11 buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ]; 12 12 patches = [ 13 - ./allow-external-paths.patch 14 - ./qdiriterator-follow-symlinks.patch 13 + ./0001-Allow-external-paths-default.patch 14 + ./0002-QDirIterator-follow-symlinks.patch 15 15 ]; 16 16 }
-26
pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch
··· 1 - Index: kpackage-5.30.0/src/kpackage/packageloader.cpp 2 - =================================================================== 3 - --- kpackage-5.30.0.orig/src/kpackage/packageloader.cpp 4 - +++ kpackage-5.30.0/src/kpackage/packageloader.cpp 5 - @@ -238,7 +238,7 @@ QList<KPluginMetaData> PackageLoader::li 6 - } else { 7 - //qDebug() << "Not cached"; 8 - // If there's no cache file, fall back to listing the directory 9 - - const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; 10 - + const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; 11 - const QStringList nameFilters = { QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop") }; 12 - 13 - QDirIterator it(plugindir, nameFilters, QDir::Files, flags); 14 - Index: kpackage-5.30.0/src/kpackage/private/packagejobthread.cpp 15 - =================================================================== 16 - --- kpackage-5.30.0.orig/src/kpackage/private/packagejobthread.cpp 17 - +++ kpackage-5.30.0/src/kpackage/private/packagejobthread.cpp 18 - @@ -121,7 +121,7 @@ bool indexDirectory(const QString& dir, 19 - 20 - QJsonArray plugins; 21 - 22 - - QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories); 23 - + QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); 24 - while (it.hasNext()) { 25 - it.next(); 26 - const QString path = it.fileInfo().absoluteFilePath();