From 8a71147d5463d96e8a8759571e2a5d44ecc3e600 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 9 Apr 2024 08:28:52 +0300
Subject: Revert "kdePackages.kglobalacceld: hack around ksycoca breakage"

---
 pkgs/kde/plasma/kglobalacceld/default.nix                 |  5 -----
 pkgs/kde/plasma/kglobalacceld/dont-delete-shortcuts.patch | 14 --------------
 2 files changed, 19 deletions(-)
 delete mode 100644 pkgs/kde/plasma/kglobalacceld/dont-delete-shortcuts.patch

(limited to 'pkgs/kde')

diff --git a/pkgs/kde/plasma/kglobalacceld/default.nix b/pkgs/kde/plasma/kglobalacceld/default.nix
index 495392430e17d..caafb6c91347e 100644
--- a/pkgs/kde/plasma/kglobalacceld/default.nix
+++ b/pkgs/kde/plasma/kglobalacceld/default.nix
@@ -1,9 +1,4 @@
 {mkKdeDerivation}:
 mkKdeDerivation {
   pname = "kglobalacceld";
-
-  # Don't delete shortcuts when applications disappear from sycoca,
-  # because for us they sometimes do.
-  # FIXME: make them actually not do that instead.
-  patches = [./dont-delete-shortcuts.patch];
 }
diff --git a/pkgs/kde/plasma/kglobalacceld/dont-delete-shortcuts.patch b/pkgs/kde/plasma/kglobalacceld/dont-delete-shortcuts.patch
deleted file mode 100644
index 497217616ef99..0000000000000
--- a/pkgs/kde/plasma/kglobalacceld/dont-delete-shortcuts.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/globalshortcutsregistry.cpp b/src/globalshortcutsregistry.cpp
-index 3cbaded..9adcf38 100644
---- a/src/globalshortcutsregistry.cpp
-+++ b/src/globalshortcutsregistry.cpp
-@@ -909,7 +909,8 @@ void GlobalShortcutsRegistry::refreshServices()
-             return false;
-         }
- 
--        return true;
-+        qCDebug(KGLOBALACCELD) << "NIXPKGS: component" << component->uniqueName() << "disappeared, keeping shortcuts anyway";
-+        return false;
-     });
- 
-     m_components.erase(it, m_components.end());
-- 
cgit 1.4.1