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

kio: update patches

Browse Source
This commit is contained in:
Thomas Tuegel 2021-03-28 10:33:37 -05:00
parent acb2d5d9db
commit ec490b9d2c
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
5 changed files with 52 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/development/libraries/kde-frameworks/kio/0001-Remove-impure-smbd-search-path.patch Normal file
View File

@ -0,0 +1,25 @@
From af54a2a37655df26a33bc6783cb472c38f65322f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 28 Mar 2021 10:31:12 -0500
Subject: [PATCH 1/2] Remove impure smbd search path
---
src/core/ksambashare.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp
index e810ce4..7cfb4e6 100644
--- a/src/core/ksambashare.cpp
+++ b/src/core/ksambashare.cpp
@@ -61,7 +61,7 @@ KSambaSharePrivate::~KSambaSharePrivate()
bool KSambaSharePrivate::isSambaInstalled()
{
const bool daemonExists =
- !QStandardPaths::findExecutable(QStringLiteral("smbd"), {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty();
+ !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty();
if (!daemonExists) {
qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd";
}
--
2.30.1

25
pkgs/development/libraries/kde-frameworks/kio/0002-Debug-module-loader.patch Normal file
View File

@ -0,0 +1,25 @@
From 59d26b68704373d405b70806f890ddd545cc976a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 28 Mar 2021 10:31:48 -0500
Subject: [PATCH 2/2] Debug module loader
---
src/kiod/kiod_main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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>();
}
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
pkgs/development/libraries/kde-frameworks/kio/default.nix
View File

@ -22,7 +22,7 @@ mkDerivation {
];
outputs = [ "out" "dev" ];
patches = [
./samba-search-path.patch
./kio-debug-module-loader.patch
./0001-Remove-impure-smbd-search-path.patch
./0002-Debug-module-loader.patch
];
}

13
pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch
View File

@ -1,13 +0,0 @@
Index: kio-5.33.0/src/kiod/kiod_main.cpp
===================================================================
--- kio-5.33.0.orig/src/kiod/kiod_main.cpp
+++ kio-5.33.0/src/kiod/kiod_main.cpp
@@ -60,7 +60,7 @@ void KIOD::loadModule(const QString &nam
module = factory->create<KDEDModule>();
}
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

14
pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch
View File

@ -1,14 +0,0 @@
diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp
index 1895783..9fe7286 100644
--- a/src/core/ksambashare.cpp
+++ b/src/core/ksambashare.cpp
@@ -73,8 +73,7 @@ KSambaSharePrivate::~KSambaSharePrivate()
bool KSambaSharePrivate::isSambaInstalled()
{
const bool daemonExists =
- !QStandardPaths::findExecutable(QStringLiteral("smbd"),
- {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty();
+ !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty();
if (!daemonExists) {
qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd";
}