public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kde5.frameworks: 5.29 -> 5.30

Browse Source
This commit is contained in:
Thomas Tuegel
2017-01-14 08:44:40 -06:00
parent eedd562f76
commit b0faf21bb4
5 changed files with 316 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch
View File

@@ -1,8 +1,8 @@
Index: kpackage-5.18.0/src/kpackage/package.cpp
Index: kpackage-5.30.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()
--- kpackage-5.30.0.orig/src/kpackage/package.cpp
+++ kpackage-5.30.0/src/kpackage/package.cpp
@@ -820,7 +820,7 @@ PackagePrivate::PackagePrivate()
: QSharedData(),
fallbackPackage(0),
metadata(0),

18
pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch
View File

@@ -1,21 +1,21 @@
Index: kpackage-5.18.0/src/kpackage/packageloader.cpp
Index: kpackage-5.30.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
--- kpackage-5.30.0.orig/src/kpackage/packageloader.cpp
+++ kpackage-5.30.0/src/kpackage/packageloader.cpp
@@ -238,7 +238,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");
const QStringList nameFilters = { QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop") };
QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
Index: kpackage-5.30.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,
--- kpackage-5.30.0.orig/src/kpackage/private/packagejobthread.cpp
+++ kpackage-5.30.0/src/kpackage/private/packagejobthread.cpp
@@ -121,7 +121,7 @@ bool indexDirectory(const QString& dir,
QJsonArray plugins;