Skip to content

KDE-frameworks: 5.85 -> 5.86 #137669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 4 commits into from
Sep 30, 2021
Merged

KDE-frameworks: 5.85 -> 5.86 #137669

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5dbd04
kde-frameworks: 5.85 -> 5.86
andrevmatos Sep 13, 2021
4748008
kde-frameworks: add zstd to karchive and isocodes do kcontacts
andrevmatos Sep 23, 2021
fd7ca42
kde-frameworks: add some more optional dependencies
andrevmatos Sep 24, 2021
e560eed
Remove optional null on util-linux dependency for kio
andrevmatos Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/development/libraries/kde-frameworks/fetch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.85/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.86/ -A '*.tar.xz' )
16 changes: 8 additions & 8 deletions pkgs/development/libraries/kde-frameworks/kio/0002-Debug-module-loader.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ diff --git a/src/kiod/kiod_main.cpp b/src/kiod/kiod_main.cpp
index 1976ee1..eb402bf 100644
--- a/src/kiod/kiod_main.cpp
+++ b/src/kiod/kiod_main.cpp
@@ -50,7 +50,7 @@ void KIOD::loadModule(const QString &name)
module = factory->create<KDEDModule>();
@@ -49,7 +49,7 @@ void KIOD::loadModule(const QString &name)
module->setModuleName(name); // makes it register to DBus
m_modules.insert(name, module);
} else {
- qCWarning(KIOD_CATEGORY) << "Error loading plugin:" << result.errorText;
+ qCWarning(KIOD_CATEGORY) << "Error loading plugin:" << name << result.errorText;
}
if (!module) {
- qCWarning(KIOD_CATEGORY) << "Error loading plugin:" << loader.errorString();
+ qCWarning(KIOD_CATEGORY) << "Error loading plugin" << name << loader.errorString();
return;
}
module->setModuleName(name); // makes it register to DBus
}

--
2.30.1

4 changes: 2 additions & 2 deletions pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp
index f03d882..d5aee56 100644
--- a/src/kpackage/packageloader.cpp
+++ b/src/kpackage/packageloader.cpp
@@ -210,7 +210,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,
@@ -196,7 +196,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,
}

for (auto const &plugindir : qAsConst(paths)) {
for (auto const &plugindir : std::as_const(paths)) {
- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
const QStringList nameFilters = {QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop")};
Expand Down
Loading