mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
Merge pull request #302271 from K900/kglobalaccel-shortcuts-hack
kdePackages.kglobalacceld: hack around ksycoca breakage
This commit is contained in:
commit
abe66e20fb
@ -1,4 +1,9 @@
|
||||
{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];
|
||||
}
|
||||
|
14
pkgs/kde/plasma/kglobalacceld/dont-delete-shortcuts.patch
Normal file
14
pkgs/kde/plasma/kglobalacceld/dont-delete-shortcuts.patch
Normal file
@ -0,0 +1,14 @@
|
||||
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());
|
Loading…
Reference in New Issue
Block a user