pyrox.dev / nixpkgs
lol
fork atom

kio: update patches

Thomas Tuegel ec490b9d acb2d5d9

+52 -29
+25
pkgs/development/libraries/kde-frameworks/kio/0001-Remove-impure-smbd-search-path.patch
··· 1 + From af54a2a37655df26a33bc6783cb472c38f65322f Mon Sep 17 00:00:00 2001 2 + From: Thomas Tuegel <ttuegel@mailbox.org> 3 + Date: Sun, 28 Mar 2021 10:31:12 -0500 4 + Subject: [PATCH 1/2] Remove impure smbd search path 5 + 6 + --- 7 + src/core/ksambashare.cpp | 2 +- 8 + 1 file changed, 1 insertion(+), 1 deletion(-) 9 + 10 + diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp 11 + index e810ce4..7cfb4e6 100644 12 + --- a/src/core/ksambashare.cpp 13 + +++ b/src/core/ksambashare.cpp 14 + @@ -61,7 +61,7 @@ KSambaSharePrivate::~KSambaSharePrivate() 15 + bool KSambaSharePrivate::isSambaInstalled() 16 + { 17 + const bool daemonExists = 18 + - !QStandardPaths::findExecutable(QStringLiteral("smbd"), {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty(); 19 + + !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty(); 20 + if (!daemonExists) { 21 + qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd"; 22 + } 23 + -- 24 + 2.30.1 25 +
+25
pkgs/development/libraries/kde-frameworks/kio/0002-Debug-module-loader.patch
··· 1 + From 59d26b68704373d405b70806f890ddd545cc976a Mon Sep 17 00:00:00 2001 2 + From: Thomas Tuegel <ttuegel@mailbox.org> 3 + Date: Sun, 28 Mar 2021 10:31:48 -0500 4 + Subject: [PATCH 2/2] Debug module loader 5 + 6 + --- 7 + src/kiod/kiod_main.cpp | 2 +- 8 + 1 file changed, 1 insertion(+), 1 deletion(-) 9 + 10 + diff --git a/src/kiod/kiod_main.cpp b/src/kiod/kiod_main.cpp 11 + index 1976ee1..eb402bf 100644 12 + --- a/src/kiod/kiod_main.cpp 13 + +++ b/src/kiod/kiod_main.cpp 14 + @@ -50,7 +50,7 @@ void KIOD::loadModule(const QString &name) 15 + module = factory->create<KDEDModule>(); 16 + } 17 + if (!module) { 18 + - qCWarning(KIOD_CATEGORY) << "Error loading plugin:" << loader.errorString(); 19 + + qCWarning(KIOD_CATEGORY) << "Error loading plugin" << name << loader.errorString(); 20 + return; 21 + } 22 + module->setModuleName(name); // makes it register to DBus 23 + -- 24 + 2.30.1 25 +
+2 -2
pkgs/development/libraries/kde-frameworks/kio/default.nix
··· 22 22 ]; 23 23 outputs = [ "out" "dev" ]; 24 24 patches = [ 25 - ./samba-search-path.patch 26 - ./kio-debug-module-loader.patch 25 + ./0001-Remove-impure-smbd-search-path.patch 26 + ./0002-Debug-module-loader.patch 27 27 ]; 28 28 }
-13
pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch
··· 1 - Index: kio-5.33.0/src/kiod/kiod_main.cpp 2 - =================================================================== 3 - --- kio-5.33.0.orig/src/kiod/kiod_main.cpp 4 - +++ kio-5.33.0/src/kiod/kiod_main.cpp 5 - @@ -60,7 +60,7 @@ void KIOD::loadModule(const QString &nam 6 - module = factory->create<KDEDModule>(); 7 - } 8 - if (!module) { 9 - - qCWarning(KIOD_CATEGORY) << "Error loading plugin:" << loader.errorString(); 10 - + qCWarning(KIOD_CATEGORY) << "Error loading plugin" << name << loader.errorString(); 11 - return; 12 - } 13 - module->setModuleName(name); // makes it register to DBus
-14
pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch
··· 1 - diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp 2 - index 1895783..9fe7286 100644 3 - --- a/src/core/ksambashare.cpp 4 - +++ b/src/core/ksambashare.cpp 5 - @@ -73,8 +73,7 @@ KSambaSharePrivate::~KSambaSharePrivate() 6 - bool KSambaSharePrivate::isSambaInstalled() 7 - { 8 - const bool daemonExists = 9 - - !QStandardPaths::findExecutable(QStringLiteral("smbd"), 10 - - {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty(); 11 - + !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty(); 12 - if (!daemonExists) { 13 - qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd"; 14 - }