[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1109589: marked as done (unblock: kglobalacceld/6.3.6-1)

Your message dated Mon, 21 Jul 2025 22:11:35 +0000
with message-id <E1udyjP-00APBO-0c@respighi.debian.org>
and subject line unblock kglobalacceld
has caused the Debian Bug report #1109589,
regarding unblock: kglobalacceld/6.3.6-1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1109589: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1109589
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: kglobalacceld@packages.debian.org, Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Control: affects -1 + src:kglobalacceld
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear Release Team,

please unblock package kglobalacceld.

[ Reason ]
It contains the following changes:
* New upstream release (6.3.6).
  - Fix losing shortcuts when updating the system.

[ Tests ]
- Upstream build-time test suite passes.

[ Risks ]
New upstream point release with a single fix, the risk is really low.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing


Thanks !


unblock kglobalacceld/6.3.6-1

diff -Nru kglobalacceld-6.3.4/CMakeLists.txt kglobalacceld-6.3.6/CMakeLists.txt
--- kglobalacceld-6.3.4/CMakeLists.txt	2025-04-02 05:36:08.000000000 +0200
+++ kglobalacceld-6.3.6/CMakeLists.txt	2025-07-08 13:44:01.000000000 +0200
@@ -2,7 +2,7 @@
 
 project(kglobalacceld)
 
-set(PROJECT_VERSION "6.3.4")
+set(PROJECT_VERSION "6.3.6")
 set(PROJECT_VERSION_MAJOR 6)
 
 set(QT_MIN_VERSION "6.7.0")
diff -Nru kglobalacceld-6.3.4/debian/changelog kglobalacceld-6.3.6/debian/changelog
--- kglobalacceld-6.3.4/debian/changelog	2025-04-03 01:00:22.000000000 +0200
+++ kglobalacceld-6.3.6/debian/changelog	2025-07-14 23:55:31.000000000 +0200
@@ -1,3 +1,11 @@
+kglobalacceld (6.3.6-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (6.3.6).
+    - Fix losing shortcuts when updating the system.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Mon, 14 Jul 2025 23:55:31 +0200
+
 kglobalacceld (6.3.4-1) unstable; urgency=medium
 
   [ Patrick Franz ]
diff -Nru kglobalacceld-6.3.4/src/globalshortcutsregistry.cpp kglobalacceld-6.3.6/src/globalshortcutsregistry.cpp
--- kglobalacceld-6.3.4/src/globalshortcutsregistry.cpp	2025-04-02 05:36:08.000000000 +0200
+++ kglobalacceld-6.3.6/src/globalshortcutsregistry.cpp	2025-07-08 13:44:01.000000000 +0200
@@ -787,9 +787,30 @@
             continue;
         }
 
-        auto *actionComp = createServiceActionComponent(service);
-        actionComp->activateGlobalShortcutContext(QStringLiteral("default"));
-        actionComp->loadFromService();
+        auto *component = createServiceActionComponent(service);
+        if (KConfigGroup configGroup = _config.group(QStringLiteral("services")).group(component->uniqueName()); configGroup.exists()) {
+            // Now load the contexts
+            const auto groupList = configGroup.groupList();
+            for (const QString &context : groupList) {
+                // Skip the friendly name group, this was previously used instead of _k_friendly_name
+                if (context == QLatin1String("Friendly Name")) {
+                    continue;
+                }
+
+                KConfigGroup contextGroup(&configGroup, context);
+                QString contextFriendlyName = contextGroup.readEntry("_k_friendly_name");
+                component->createGlobalShortcutContext(context, contextFriendlyName);
+                component->activateGlobalShortcutContext(context);
+                component->loadSettings(contextGroup);
+            }
+
+            // Load the default context
+            component->activateGlobalShortcutContext(QStringLiteral("default"));
+            component->loadSettings(configGroup);
+        } else {
+            component->activateGlobalShortcutContext(QStringLiteral("default"));
+            component->loadFromService();
+        }
     }
 }

--- End Message ---
--- Begin Message --- 
Unblocked kglobalacceld.

--- End Message ---
Reply to: