summary refs log tree commit diff
diff options
context:
space:
mode:
authorYaroslav Bolyukin <iam@lach.pw>2021-09-27 22:51:29 +0300
committerYaroslav Bolyukin <iam@lach.pw>2021-10-22 23:21:53 +0300
commit366a6abc6d43e9b7916e7958e4e3d99e6ec79fb8 (patch)
tree23616ff05f4d5653b141727fe962b14bcd46593e
parentc4bd924189b061199c578340d6a3f7ee22c661d6 (diff)
downloadnixpkgs-366a6abc6d43e9b7916e7958e4e3d99e6ec79fb8.tar
nixpkgs-366a6abc6d43e9b7916e7958e4e3d99e6ec79fb8.tar.gz
nixpkgs-366a6abc6d43e9b7916e7958e4e3d99e6ec79fb8.tar.bz2
nixpkgs-366a6abc6d43e9b7916e7958e4e3d99e6ec79fb8.tar.lz
nixpkgs-366a6abc6d43e9b7916e7958e4e3d99e6ec79fb8.tar.xz
nixpkgs-366a6abc6d43e9b7916e7958e4e3d99e6ec79fb8.tar.zst
nixpkgs-366a6abc6d43e9b7916e7958e4e3d99e6ec79fb8.zip
kio: remove outdated patch
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
-rw-r--r--pkgs/development/libraries/kde-frameworks/kio/0002-Debug-module-loader.patch25
-rw-r--r--pkgs/development/libraries/kde-frameworks/kio/default.nix1
2 files changed, 0 insertions, 26 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/kio/0002-Debug-module-loader.patch b/pkgs/development/libraries/kde-frameworks/kio/0002-Debug-module-loader.patch
deleted file mode 100644
index d0bad0caf4a..00000000000
--- a/pkgs/development/libraries/kde-frameworks/kio/0002-Debug-module-loader.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index 84957c183ff..cb2c8c6efbd 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -22,6 +22,5 @@ mkDerivation {
   outputs = [ "out" "dev" ];
   patches = [
     ./0001-Remove-impure-smbd-search-path.patch
-    ./0002-Debug-module-loader.patch
  ];
 }