Bug#1109593: unblock: sddm-kcm/4:6.3.4-3

[Aurélien COUDERC <coucouf@debian.org>]

Package: release.debian.org
Severity: normal
X-Debbugs-Cc: sddm-kcm@packages.debian.org, Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Control: affects -1 + src:sddm-kcm
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear Release Team,

please unblock package sddm-kcm.

[ Reason ]
It contains the following changes:
* Fix kde-config-sddm: Writes to /usr/share upon applying theme.
  (Closes: #1108512)
* Fix one more way by which the UI could write to
  /usr/share/sddm/themes/ thus breaking the FHS policy.

[ Tests ]
Tested that for known use cases, changing the login theme from the
system settings configuration change doesn’t create any .user file in
/usr/share anymore.

[ Risks ]
Simple patch disabling some configuration write code, the risk is 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 sddm-kcm/4:6.3.4-3

diff -Nru sddm-kcm-6.3.4/debian/changelog sddm-kcm-6.3.4/debian/changelog
--- sddm-kcm-6.3.4/debian/changelog	2025-04-09 23:53:10.000000000 +0200
+++ sddm-kcm-6.3.4/debian/changelog	2025-07-20 08:26:29.000000000 +0200
@@ -1,3 +1,19 @@
+sddm-kcm (4:6.3.4-4) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * Fix kde-config-sddm: Writes to /usr/share upon applying theme.
+    (Closes: #1108512)
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Sun, 20 Jul 2025 08:26:29 +0200
+
+sddm-kcm (4:6.3.4-3) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * Fix one more way by which the UI could write to
+    /usr/share/sddm/themes/ thus breaking the FHS policy.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Thu, 08 May 2025 00:13:29 +0200
+
 sddm-kcm (4:6.3.4-2) unstable; urgency=medium
 
   [ Aurélien COUDERC ]
diff -Nru sddm-kcm-6.3.4/debian/patches/disable-theme-userconfig.patch sddm-kcm-6.3.4/debian/patches/disable-theme-userconfig.patch
--- sddm-kcm-6.3.4/debian/patches/disable-theme-userconfig.patch	1970-01-01 01:00:00.000000000 +0100
+++ sddm-kcm-6.3.4/debian/patches/disable-theme-userconfig.patch	2025-07-20 08:24:23.000000000 +0200
@@ -0,0 +1,20 @@
+--- sddm-kcm-6.3.4.orig/src/sddmkcm.cpp
++++ sddm-kcm-6.3.4/src/sddmkcm.cpp
+@@ -118,17 +118,6 @@ void SddmKcm::save()
+     const QModelIndex currentThemeIndex = m_themesModel->index(m_themesModel->currentIndex());
+     const QString themeConfigPath = m_themesModel->data(currentThemeIndex, ThemesModel::PathRole).toString()
+         + m_themesModel->data(currentThemeIndex, ThemesModel::ConfigFileRole).toString();
+-    if (!themeConfigPath.isEmpty()) {
+-        args[QStringLiteral("theme.conf.user")] = QVariant(themeConfigPath + QStringLiteral(".user"));
+-        const QString backgroundPath = m_themesModel->data(currentThemeIndex, ThemesModel::CurrentBackgroundRole).toString();
+-        if (!backgroundPath.isEmpty()) {
+-            args[QStringLiteral("theme.conf.user/General/background")] = backgroundPath;
+-            args[QStringLiteral("theme.conf.user/General/type")] = QStringLiteral("image");
+-        } else {
+-            args[QStringLiteral("theme.conf.user/General/type")] = QStringLiteral("color");
+-        }
+-        args[QStringLiteral("theme.conf.user/General/showClock")] = m_themesModel->data(currentThemeIndex, ThemesModel::ShowClockRole).toBool();
+-    }
+     args[QStringLiteral("kde_settings.conf/Theme/Current")] = currentThemeIndex.data(ThemesModel::IdRole);
+     args[QStringLiteral("kde_settings.conf/Autologin/User")] = m_data->sddmSettings()->user();
+     args[QStringLiteral("kde_settings.conf/Autologin/Session")] = m_data->sddmSettings()->session();
diff -Nru sddm-kcm-6.3.4/debian/patches/disable-wallpaper-configuration.patch sddm-kcm-6.3.4/debian/patches/disable-wallpaper-configuration.patch
--- sddm-kcm-6.3.4/debian/patches/disable-wallpaper-configuration.patch	2025-04-09 23:52:45.000000000 +0200
+++ sddm-kcm-6.3.4/debian/patches/disable-wallpaper-configuration.patch	2025-05-08 00:13:07.000000000 +0200
@@ -30,3 +30,29 @@
                  icon.name: "edit-delete"
                  tooltip: i18nc("@info:tooltip", "Delete")
                  onTriggered: kcm.removeTheme(view.model.index(index, 0))
+@@ -116,10 +105,6 @@
+             }
+         ]
+         onClicked: kcm.sddmSettings.current = model.id
+-
+-        onDoubleClicked: {
+-            kcm.save();
+-        }
+     }
+     FileDialog {
+         id: themeDialog
+--- a/src/sddmkcm.cpp
++++ b/src/sddmkcm.cpp
+@@ -46,9 +46,9 @@
+     });
+     m_themesModel->setCurrentTheme(m_data->sddmSettings()->current());
+     // Currently only emmited when background changes
+-    connect(m_themesModel, &QAbstractItemModel::dataChanged, this, [this] {
+-        this->setNeedsSave(true);
+-    });
++    //connect(m_themesModel, &QAbstractItemModel::dataChanged, this, [this] {
++    //    this->setNeedsSave(true);
++    //});
+ }
+ 
+ SddmKcm::~SddmKcm()
diff -Nru sddm-kcm-6.3.4/debian/patches/series sddm-kcm-6.3.4/debian/patches/series
--- sddm-kcm-6.3.4/debian/patches/series	2025-04-09 23:52:45.000000000 +0200
+++ sddm-kcm-6.3.4/debian/patches/series	2025-07-20 08:24:58.000000000 +0200
@@ -1 +1,2 @@
 disable-wallpaper-configuration.patch
+disable-theme-userconfig.patch