diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-10 09:43:23 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-10 09:43:23 -0600 |
commit | d03a25c5ea5bc33d6c7f7619986201d0a202ed8b (patch) | |
tree | 50bf9449b2f722d80756886f6ffdcc2ec432f608 /pkgs/development | |
parent | aaaf23f1e813656f68af6565fc3d38c5c318b8eb (diff) |
kde5_latest.kpackage: update patches for 5.18.0
Diffstat (limited to 'pkgs/development')
6 files changed, 43 insertions, 69 deletions
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0001-allow-external-paths.patch deleted file mode 100644 index beede4d7ccb5f..0000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0001-allow-external-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 28 Jan 2015 07:15:30 -0600 -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 539b21a..977a026 100644 ---- a/src/kpackage/package.cpp -+++ b/src/kpackage/package.cpp -@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate() - : QSharedData(), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0002-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0002-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 6e93fca9b21db..0000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0002-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -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<KPluginMetaData> 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()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - it.next(); - const QString path = it.fileInfo().absoluteFilePath(); --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch new file mode 100644 index 0000000000000..e9d7444481480 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch @@ -0,0 +1,13 @@ +Index: kpackage-5.18.0/src/kpackage/package.cpp +=================================================================== +--- kpackage-5.18.0.orig/src/kpackage/package.cpp ++++ kpackage-5.18.0/src/kpackage/package.cpp +@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate() + : QSharedData(), + fallbackPackage(0), + metadata(0), +- externalPaths(false), ++ externalPaths(true), + valid(false), + checkedValid(false) + { diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix index d2dc262bf1ac6..aea1b0d31a0d9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib +{ kdeFramework, lib, copyPathsToStore , extra-cmake-modules , karchive , kconfig @@ -13,10 +13,7 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ karchive kconfig ]; propagatedBuildInputs = [ kcoreaddons ki18n ]; - patches = [ - ./0001-allow-external-paths.patch - ./0002-qdiriterator-follow-symlinks.patch - ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); postInstall = '' wrapQtProgram "$out/bin/kpackagetool5" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch new file mode 100644 index 0000000000000..ddbf17d00064c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch @@ -0,0 +1,26 @@ +Index: kpackage-5.18.0/src/kpackage/packageloader.cpp +=================================================================== +--- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp ++++ kpackage-5.18.0/src/kpackage/packageloader.cpp +@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::li + } 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")) << QStringLiteral("metadata.json"); + + QDirIterator it(plugindir, nameFilters, QDir::Files, flags); +Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp +=================================================================== +--- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp ++++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp +@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir, + + QJsonArray plugins; + +- QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories); ++ QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + it.next(); + const QString path = it.fileInfo().absoluteFilePath(); diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series new file mode 100644 index 0000000000000..9b7f076efc70e --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series @@ -0,0 +1,2 @@ +allow-external-paths.patch +qdiriterator-follow-symlinks.patch |