diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-27 17:06:57 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-27 17:06:57 +0000 |
| commit | 373507e28edeacd168b5c240840db2dac854882a (patch) | |
| tree | c73c8912afbd1a533dbc0d27da25dcd7f0d13d58 /nixpkgs/pkgs/development/libraries/kde-frameworks/kservice | |
| parent | b2ac96a35da6f6b95c7197811e421270319e8d50 (diff) | |
| parent | dfd8f84aef129f1978e446b5d45ef05cd4421821 (diff) | |
| download | nixlib-373507e28edeacd168b5c240840db2dac854882a.tar nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.gz nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.bz2 nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.lz nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.xz nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.zst nixlib-373507e28edeacd168b5c240840db2dac854882a.zip | |
Merge commit 'dfd8f84aef129f1978e446b5d45ef05cd4421821'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/kde-frameworks/kservice')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch b/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch index cbe13b709508..fdd8b4d81a18 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch @@ -1,11 +1,11 @@ -Index: kservice-5.21.0/src/sycoca/kbuildsycoca.cpp -=================================================================== ---- kservice-5.21.0.orig/src/sycoca/kbuildsycoca.cpp -+++ kservice-5.21.0/src/sycoca/kbuildsycoca.cpp -@@ -203,7 +203,7 @@ bool KBuildSycoca::build() - QSet<QString> relFiles; +diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp +index b125299..0682b90 100644 +--- a/src/sycoca/kbuildsycoca.cpp ++++ b/src/sycoca/kbuildsycoca.cpp +@@ -207,7 +207,7 @@ bool KBuildSycoca::build() const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { + qCDebug(SYCOCA) << "Looking for subdir" << m_resourceSubdir << "=>" << dirs; + for (const QString &dir : dirs) { - QDirIterator it(dir, QDirIterator::Subdirectories); + QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); while (it.hasNext()) { |