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

kde-frameworks: 5.73 -> 5.76

Browse Source
This commit is contained in:
Tom Hall 2020-11-24 19:49:12 +00:00 committed by Thomas Tuegel
parent 889638221c
commit 953461a165
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
3 changed files with 367 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/kde-frameworks/fetch.sh
View File

@ -1 +1 @@
WGET_ARGS=(https://download.kde.org/stable/frameworks/5.73/) WGET_ARGS=(https://download.kde.org/stable/frameworks/5.76/)

46
pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
View File

@ -1,25 +1,45 @@
Index: kwindowsystem-5.64.0/src/pluginwrapper.cpp From 5d73d02656298d0af860c8ed7f6be679e3d69e09 Mon Sep 17 00:00:00 2001
=================================================================== From: Tom Hall <tahall256@protonmail.ch>
--- kwindowsystem-5.64.0.orig/src/pluginwrapper.cpp Date: Tue, 24 Nov 2020 19:31:20 +0000
+++ kwindowsystem-5.64.0/src/pluginwrapper.cpp Subject: [PATCH] Fix platform plugins path
@@ -37,16 +37,10 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapp
---
src/pluginwrapper.cpp | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp
index a255d83..8f4caac 100644
--- a/src/pluginwrapper.cpp
+++ b/src/pluginwrapper.cpp
@@ -24,22 +24,12 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapper, s_pluginWrapper)
static QStringList pluginCandidates() static QStringList pluginCandidates()
{ {
QStringList ret; QStringList ret;
- const auto paths = QCoreApplication::libraryPaths(); - const auto paths = QCoreApplication::libraryPaths();
- for (const QString &path : paths) { - for (const QString &path : paths) {
- QDir pluginDir(path + QLatin1String("/kf5/org.kde.kwindowsystem.platforms")); - static const QStringList searchFolders {
- if (!pluginDir.exists()) { - QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"),
- continue; - QStringLiteral("/kf5/kwindowsystem"),
- };
- for (const QString &searchFolder : searchFolders) {
- QDir pluginDir(path + searchFolder);
- if (!pluginDir.exists()) {
- continue;
- }
- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
- for (const QString &entry : entries) {
- ret << pluginDir.absoluteFilePath(entry);
- }
- } - }
- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); + QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH)
- for (const QString &entry : entries) { + + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms")
- ret << pluginDir.absoluteFilePath(entry); + + QLatin1Literal("/kf5/kwindowsystem"));
- }
+ QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));
+ const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); + const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
+ for (const QString &entry : entries) { + for (const QString &entry : entries) {
+ ret << pluginDir.absoluteFilePath(entry); + ret << pluginDir.absoluteFilePath(entry);
} }
return ret; return ret;
} }
--
2.28.0

666
pkgs/development/libraries/kde-frameworks/srcs.nix
View File

File diff suppressed because it is too large Load Diff