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

kcmutils: print plugin name when loading fails

Browse Source
This commit is contained in:
Thomas Tuegel 2017-05-25 13:32:15 -05:00
parent fc72335570
commit 7af16e5bd7
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
View File

@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation, lib, copyPathsToStore,
extra-cmake-modules,
kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews,
kpackage, kservice, kxmlgui, qtdeclarative,
@ -14,5 +14,5 @@ mkDerivation {
qtdeclarative
];
propagatedBuildInputs = [ kconfigwidgets kservice ];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series));
}

13
pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch Normal file
View File

@ -0,0 +1,13 @@
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) {

22
pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch → pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch
View File

@ -1,17 +1,8 @@
From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 14 Oct 2015 06:43:53 -0500
Subject: [PATCH] qdiriterator follow symlinks
---
src/kpluginselector.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
index 9c3431d..d6b1ee2 100644
--- a/src/kpluginselector.cpp
+++ b/src/kpluginselector.cpp
@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
Index: kcmutils-5.33.0/src/kpluginselector.cpp
===================================================================
--- kcmutils-5.33.0.orig/src/kpluginselector.cpp
+++ kcmutils-5.33.0/src/kpluginselector.cpp
@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const Q
QStringList desktopFileNames;
const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
Q_FOREACH (const QString &dir, dirs) {
@ -20,6 +11,3 @@ index 9c3431d..d6b1ee2 100644
while (it.hasNext()) {
desktopFileNames.append(it.next());
}
--
2.5.2

2
pkgs/development/libraries/kde-frameworks/kcmutils/series Normal file
View File

@ -0,0 +1,2 @@
kcmutils-follow-symlinks.patch
kcmutils-debug-module-loader.patch