kcmutils: remove obsolete patch
This commit is contained in:
parent
92e8575e5d
commit
2855e9b77f
|
@ -1,8 +1,17 @@
|
|||
From 4d5dcc309fba688aa1db8dd915a0abdf07f61e81 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||
Date: Mon, 13 Jul 2020 11:23:36 -0500
|
||||
Subject: [PATCH] kcmutils follow symlinks
|
||||
|
||||
---
|
||||
src/kpluginselector.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
|
||||
index 137c865..097ab75 100644
|
||||
index 46deef5..2eacb9f 100644
|
||||
--- a/src/kpluginselector.cpp
|
||||
+++ b/src/kpluginselector.cpp
|
||||
@@ -303,7 +303,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
|
||||
@@ -309,7 +309,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
|
||||
QStringList desktopFileNames;
|
||||
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
|
||||
for (const QString &dir : dirs) {
|
||||
|
@ -11,3 +20,6 @@ index 137c865..097ab75 100644
|
|||
while (it.hasNext()) {
|
||||
desktopFileNames.append(it.next());
|
||||
}
|
||||
--
|
||||
2.25.4
|
||||
|
|
@ -14,5 +14,7 @@ mkDerivation {
|
|||
qtdeclarative
|
||||
];
|
||||
propagatedBuildInputs = [ kconfigwidgets kservice ];
|
||||
patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series));
|
||||
patches = [
|
||||
./0001-kcmutils-follow-symlinks.patch
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
Index: kcmutils-5.33.0/src/kcmoduleloader.cpp
|
||||
===================================================================
|
||||
--- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp
|
||||
+++ kcmutils-5.33.0/src/kcmoduleloader.cpp
|
||||
@@ -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) {
|
|
@ -1,2 +0,0 @@
|
|||
kcmutils-follow-symlinks.patch
|
||||
kcmutils-debug-module-loader.patch
|
Loading…
Reference in New Issue