kdeFrameworks: 5.66 -> 5.68 (#84622)

NixOS · Apr 8, 2020 · 0fc7da1 · 0fc7da1
1 parent 4dee289
commit 0fc7da1
Show file tree

Hide file tree

Showing 3 changed files with 340 additions and 339 deletions.
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.66/ )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.68/ )
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch
@@ -2,12 +2,12 @@ Index: kcmutils-5.33.0/src/kcmoduleloader.cpp
 ===================================================================
 --- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp
 +++ kcmutils-5.33.0/src/kcmoduleloader.cpp
-@@ -96,7 +96,7 @@ KCModule *KCModuleLoader::loadModule(con
-             KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library()));
-             KPluginFactory* factory = loader.factory();
-             if (!factory) {
--                qWarning() << "Error loading plugin:" << loader.errorString();
-+                qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString();
-             } else {
-                 KQuickAddons::ConfigModule *cm = factory->create<KQuickAddons::ConfigModule >();
-                 if (!cm) {
+@@ -95,7 +95,7 @@ KCModule *KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep
+         KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library()));
+         KPluginFactory* factory = loader.factory();
+         if (!factory) {
+-            qWarning() << "Couldn't load plugin:" << loader.errorString();
++            qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString();
+         } else {
+             std::unique_ptr<KQuickAddons::ConfigModule> cm(factory->create<KQuickAddons::ConfigModule>(nullptr, args2));
+             if (!cm) {