diff options
author | nyanloutre <paul@nyanlout.re> | 2019-11-14 01:26:20 +0100 |
---|---|---|
committer | nyanloutre <paul@nyanlout.re> | 2019-11-14 01:26:20 +0100 |
commit | 75f870680699bf1afebdcc6e0c3ee003a0182a2e (patch) | |
tree | 3e64c27b3c79af1535962e988136c40ed152cb17 /pkgs/development/libraries/kde-frameworks/kwindowsystem | |
parent | e38a29668fbb1c3d1a97897f1df13056d33b31e9 (diff) | |
download | nixpkgs-75f870680699bf1afebdcc6e0c3ee003a0182a2e.tar nixpkgs-75f870680699bf1afebdcc6e0c3ee003a0182a2e.tar.gz nixpkgs-75f870680699bf1afebdcc6e0c3ee003a0182a2e.tar.bz2 nixpkgs-75f870680699bf1afebdcc6e0c3ee003a0182a2e.tar.lz nixpkgs-75f870680699bf1afebdcc6e0c3ee003a0182a2e.tar.xz nixpkgs-75f870680699bf1afebdcc6e0c3ee003a0182a2e.tar.zst nixpkgs-75f870680699bf1afebdcc6e0c3ee003a0182a2e.zip |
kwindowsystem: fix patch
Diffstat (limited to 'pkgs/development/libraries/kde-frameworks/kwindowsystem')
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch index 7c86454c5cf..27501732210 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch @@ -1,17 +1,19 @@ -diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp -index 8e6298a..210989a 100644 ---- a/src/pluginwrapper.cpp -+++ b/src/pluginwrapper.cpp -@@ -37,14 +37,10 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapper, s_pluginWrapper) +Index: kwindowsystem-5.64.0/src/pluginwrapper.cpp +=================================================================== +--- kwindowsystem-5.64.0.orig/src/pluginwrapper.cpp ++++ kwindowsystem-5.64.0/src/pluginwrapper.cpp +@@ -37,16 +37,10 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapp static QStringList pluginCandidates() { QStringList ret; -- foreach (const QString &path, QCoreApplication::libraryPaths()) { +- const auto paths = QCoreApplication::libraryPaths(); +- for (const QString &path : paths) { - QDir pluginDir(path + QLatin1String("/kf5/org.kde.kwindowsystem.platforms")); - if (!pluginDir.exists()) { - continue; - } -- foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) { +- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); +- for (const QString &entry : entries) { - ret << pluginDir.absoluteFilePath(entry); - } + QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms")); |