git.iko.soy/typeable/nixpkgs
on master help sign in
kcmutils: remove obsolete patch
commit2855e9b77f5c974ba7726fed108235765c62d0fe authorThomas Tuegel <ttuegel@mailbox.org> dateMon 13 Jul 2020, 11:26 (6 years ago) parent92e8575
4 files changed+17−18
pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch → pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patch+14−2 pkgs/development/libraries/kde-frameworks/kcmutils/default.nix+3−1 pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch−13 pkgs/development/libraries/kde-frameworks/kcmutils/series−2
pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch → pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patchrenamed+14−2
@@ -1,8 +1,17 @@
1+From 4d5dcc309fba688aa1db8dd915a0abdf07f61e81 Mon Sep 17 00:00:00 2001
2+From: Thomas Tuegel <ttuegel@mailbox.org>
3+Date: Mon, 13 Jul 2020 11:23:36 -0500
4+Subject: [PATCH] kcmutils follow symlinks
5+
6+---
7+ src/kpluginselector.cpp | 2 +-
8+ 1 file changed, 1 insertion(+), 1 deletion(-)
9+
110diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
2−index 137c865..097ab75 100644
11+index 46deef5..2eacb9f 100644
312--- a/src/kpluginselector.cpp
413+++ b/src/kpluginselector.cpp
5−@@ -303,7 +303,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
14+@@ -309,7 +309,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
615 QStringList desktopFileNames;
716 const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
817 for (const QString &dir : dirs) {
@@ -11,3 +20,6 @@ index 137c865..097ab75 100644
1120 while (it.hasNext()) {
1221 desktopFileNames.append(it.next());
1322 }
23+--
24+2.25.4
25+
pkgs/development/libraries/kde-frameworks/kcmutils/default.nix+3−1
@@ -14,5 +14,7 @@ mkDerivation {
1414 qtdeclarative
1515 ];
1616 propagatedBuildInputs = [ kconfigwidgets kservice ];
17− patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series));
17+ patches = [
18+ ./0001-kcmutils-follow-symlinks.patch
19+ ];
1820}
pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patchdeleted−13
@@ -1,13 +0,0 @@
1−Index: kcmutils-5.33.0/src/kcmoduleloader.cpp
2−===================================================================
3−--- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp
4−+++ kcmutils-5.33.0/src/kcmoduleloader.cpp
5−@@ -95,7 +95,7 @@ KCModule *KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep
6− KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library()));
7− KPluginFactory* factory = loader.factory();
8− if (!factory) {
9−- qWarning() << "Couldn't load plugin:" << loader.errorString();
10−+ qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString();
11− } else {
12− std::unique_ptr<KQuickAddons::ConfigModule> cm(factory->create<KQuickAddons::ConfigModule>(nullptr, args2));
13− if (!cm) {
pkgs/development/libraries/kde-frameworks/kcmutils/seriesdeleted−2
@@ -1,2 +0,0 @@
1−kcmutils-follow-symlinks.patch
2−kcmutils-debug-module-loader.patch