Merge pull request #302271 from K900/kglobalaccel-shortcuts-hack

kdePackages.kglobalacceld: hack around ksycoca breakage
This commit is contained in:
Pol Dellaiera 2024-04-07 22:30:36 +02:00 committed by GitHub
commit abe66e20fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 0 deletions

View File

@ -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];
}

View 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());