Bug#1107770: unblock: lomiri-system-settings/1.3.1-4

[Mike Gabriel <sunweaver@debian.org>]

Package: release.debian.org
Severity: normal
X-Debbugs-Cc: lomiri-system-settings@packages.debian.org
Control: affects -1 + src:lomiri-system-settings
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package lomiri-system-settings

[ Reason ]
We observed crashes when testing the keyboard layout selector for
external keyboards in lomiri-system-settings and its interaction with
ayatana-indicator-keyboard via AccountsService. These crashes were
caused by missing D-Bus type definitions in the AccountsService D-Bus
code of libLomiriSystemSettingsPrivate. This version fixes this.

[ Impact ]
Crashes of l-s-s when configuring keyboard layouts.

[ Tests ]
Manual tsts.

[ Risks ]
Minimal, only for Lomiri users.

[ 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

[ Other info ]
Relevant for Lomiri in Debian.

unblock lomiri-system-settings/1.3.1-4

diff -Nru lomiri-system-settings-1.3.1/debian/changelog lomiri-system-settings-1.3.1/debian/changelog
--- lomiri-system-settings-1.3.1/debian/changelog	2025-06-06 23:13:52.000000000 +0200
+++ lomiri-system-settings-1.3.1/debian/changelog	2025-06-14 07:54:49.000000000 +0200
@@ -1,3 +1,14 @@
+lomiri-system-settings (1.3.1-4) unstable; urgency=medium
+
+  * debian/patches:
+    + Add 0001_lib-LomiriSystemSettingsPrivate-accountsservice.cpp-Register-
+      missing-D-Bus-types.patch. lib/LomiriSystemSettingsPrivate/
+      accountsservice.cpp: Register missing D-Bus types. This resolves
+      l-s-s crashes when the external keyboard selector interacts with
+      ayatana-indicator-keyboard via AccountsService.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Sat, 14 Jun 2025 07:54:49 +0200
+
 lomiri-system-settings (1.3.1-3) unstable; urgency=medium
 
   [ Adam Havelka ]
diff -Nru lomiri-system-settings-1.3.1/debian/patches/0001_lib-LomiriSystemSettingsPrivate-accountsservice.cpp-Register-missing-D-Bus-types.patch lomiri-system-settings-1.3.1/debian/patches/0001_lib-LomiriSystemSettingsPrivate-accountsservice.cpp-Register-missing-D-Bus-types.patch
--- lomiri-system-settings-1.3.1/debian/patches/0001_lib-LomiriSystemSettingsPrivate-accountsservice.cpp-Register-missing-D-Bus-types.patch	1970-01-01 01:00:00.000000000 +0100
+++ lomiri-system-settings-1.3.1/debian/patches/0001_lib-LomiriSystemSettingsPrivate-accountsservice.cpp-Register-missing-D-Bus-types.patch	2025-06-14 07:29:15.000000000 +0200
@@ -0,0 +1,47 @@
+From bbb79805a1bf76402774164eece1e69396329c5e Mon Sep 17 00:00:00 2001
+From: Robert Tari <robert@tari.in>
+Date: Fri, 13 Jun 2025 14:56:47 +0200
+Subject: [PATCH] lib/LomiriSystemSettingsPrivate/accountsservice.cpp: Register
+ missing D-Bus types
+
+fixes https://salsa.debian.org/ubports-team/lomiri-system-settings/-/issues/19
+---
+ lib/LomiriSystemSettingsPrivate/accountsservice.cpp | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/lib/LomiriSystemSettingsPrivate/accountsservice.cpp b/lib/LomiriSystemSettingsPrivate/accountsservice.cpp
+index 6450a4790..3d5383e1a 100644
+--- a/lib/LomiriSystemSettingsPrivate/accountsservice.cpp
++++ b/lib/LomiriSystemSettingsPrivate/accountsservice.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include <QDBusReply>
+ #include <QDebug>
+-
++#include <QDBusMetaType>
+ #include <unistd.h>
+ #include <sys/types.h>
+ 
+@@ -30,6 +30,11 @@
+ #define AS_PATH "/org/freedesktop/Accounts"
+ #define AS_IFACE "org.freedesktop.Accounts"
+ 
++using StringMap = QMap<QString,QString>;
++using StringMapList = QList<StringMap>;
++Q_DECLARE_METATYPE(StringMap)
++Q_DECLARE_METATYPE(StringMapList)
++
+ namespace LomiriSystemSettings {
+ 
+ AccountsService::AccountsService(QObject *parent)
+@@ -43,6 +48,8 @@ AccountsService::AccountsService(QObject *parent)
+                              AS_IFACE,
+                              m_systemBusConnection)
+ {
++    qDBusRegisterMetaType<StringMap>();
++    qDBusRegisterMetaType<StringMapList>();
+     connect (&m_serviceWatcher,
+              SIGNAL (serviceOwnerChanged (QString, QString, QString)),
+              this,
+-- 
+GitLab
diff -Nru lomiri-system-settings-1.3.1/debian/patches/series lomiri-system-settings-1.3.1/debian/patches/series
--- lomiri-system-settings-1.3.1/debian/patches/series	2025-06-06 23:08:14.000000000 +0200
+++ lomiri-system-settings-1.3.1/debian/patches/series	2025-06-14 07:29:15.000000000 +0200
@@ -2,3 +2,4 @@
 2011_build-without-trust-store.patch
 2013_show-hotspot-on-desktop.patch
 2014_removing-unnecessary-mobile-only-functionality.patch
+0001_lib-LomiriSystemSettingsPrivate-accountsservice.cpp-Register-missing-D-Bus-types.patch