Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sddm-kcm6 for openSUSE:Factory checked in at 2024-10-24 15:41:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sddm-kcm6 (Old) and /work/SRC/openSUSE:Factory/.sddm-kcm6.new.2020 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sddm-kcm6" Thu Oct 24 15:41:53 2024 rev:14 rq:1217220 version:6.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/sddm-kcm6/sddm-kcm6.changes 2024-10-16 23:44:21.739000721 +0200 +++ /work/SRC/openSUSE:Factory/.sddm-kcm6.new.2020/sddm-kcm6.changes 2024-10-24 15:42:30.543505726 +0200 @@ -1,0 +2,12 @@ +Tue Oct 22 14:09:01 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de> + +- Update to 6.2.2: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.2.2 +- Changes since 6.2.1: + * Fix autologin session value + * Resolve and de-duplicate theme paths (kde#482484) + * update version for new release +- Refresh 0001-Support-default.session-symlink.patch + +------------------------------------------------------------------- Old: ---- sddm-kcm-6.2.1.tar.xz sddm-kcm-6.2.1.tar.xz.sig New: ---- sddm-kcm-6.2.2.tar.xz sddm-kcm-6.2.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sddm-kcm6.spec ++++++ --- /var/tmp/diff_new_pack.0gERot/_old 2024-10-24 15:42:31.107529194 +0200 +++ /var/tmp/diff_new_pack.0gERot/_new 2024-10-24 15:42:31.107529194 +0200 @@ -23,7 +23,7 @@ %bcond_without released Name: sddm-kcm6 -Version: 6.2.1 +Version: 6.2.2 Release: 0 Summary: A sddm control module for KDE License: GPL-2.0-only ++++++ 0001-Support-default.session-symlink.patch ++++++ --- /var/tmp/diff_new_pack.0gERot/_old 2024-10-24 15:42:31.135530359 +0200 +++ /var/tmp/diff_new_pack.0gERot/_new 2024-10-24 15:42:31.139530526 +0200 @@ -1,4 +1,4 @@ -From 015348caa1e8dd7f9c3b1490c6457017ec1b134e Mon Sep 17 00:00:00 2001 +From 2c4bf2d4c0be461fb9125de867543a1d89468fdd Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fabian@ritter-vogt.de> Date: Tue, 11 Jul 2017 13:13:13 +0200 Subject: [PATCH] Support default.session symlink @@ -10,11 +10,11 @@ src/ui/Advanced.qml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) -Index: sddm-kcm-6.1.5/src/sessionmodel.cpp -=================================================================== ---- sddm-kcm-6.1.5.orig/src/sessionmodel.cpp -+++ sddm-kcm-6.1.5/src/sessionmodel.cpp -@@ -95,6 +95,12 @@ void SessionModel::loadDir(const QString +diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp +index 249340b..586002d 100644 +--- a/src/sessionmodel.cpp ++++ b/src/sessionmodel.cpp +@@ -96,6 +96,12 @@ void SessionModel::loadDir(const QString &path, SessionType type) isHidden = line.mid(7).toLower() == QLatin1String("true"); } } @@ -27,12 +27,12 @@ if (!isHidden) { // add to sessions list d->sessions.push_back(si); -Index: sddm-kcm-6.1.5/src/ui/Advanced.qml -=================================================================== ---- sddm-kcm-6.1.5.orig/src/ui/Advanced.qml -+++ sddm-kcm-6.1.5/src/ui/Advanced.qml +diff --git a/src/ui/Advanced.qml b/src/ui/Advanced.qml +index 5f78ca6..635a099 100644 +--- a/src/ui/Advanced.qml ++++ b/src/ui/Advanced.qml @@ -38,7 +38,7 @@ Kirigami.Page { - kcm.sddmSettings.session = autologinSession.currentText + kcm.sddmSettings.session = autologinSession.currentValue } else { kcm.sddmSettings.user = "" - kcm.sddmSettings.session = "" @@ -40,4 +40,7 @@ } // Deliberately imperative because we only want the message +-- +2.47.0 + ++++++ sddm-kcm-6.2.1.tar.xz -> sddm-kcm-6.2.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sddm-kcm-6.2.1/CMakeLists.txt new/sddm-kcm-6.2.2/CMakeLists.txt --- old/sddm-kcm-6.2.1/CMakeLists.txt 2024-10-15 15:17:09.000000000 +0200 +++ new/sddm-kcm-6.2.2/CMakeLists.txt 2024-10-22 14:59:11.000000000 +0200 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) project(sddm-kcm) -set(PROJECT_VERSION "6.2.1") +set(PROJECT_VERSION "6.2.2") set(QT_MIN_VERSION "6.7.0") set(KF6_MIN_VERSION "6.5.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sddm-kcm-6.2.1/src/themesmodel.cpp new/sddm-kcm-6.2.2/src/themesmodel.cpp --- old/sddm-kcm-6.2.1/src/themesmodel.cpp 2024-10-15 15:17:09.000000000 +0200 +++ new/sddm-kcm-6.2.2/src/themesmodel.cpp 2024-10-22 14:59:11.000000000 +0200 @@ -139,12 +139,24 @@ return data.themeid() == theme; }); }; + for (const auto &folder : themesBaseDirs) { QDir dir(folder); if (!dir.exists()) { return; } - for (const QString &theme : dir.entryList(QDir::AllDirs | QDir::Readable | QDir::NoDotAndDotDot)) { + + QStringList unresolvedDirEntries = dir.entryList(QDir::AllDirs | QDir::Readable | QDir::NoDotAndDotDot); + QStringList dirEntries; + for (const QString &unresolvedDirEntry : unresolvedDirEntries) { + QString canonicalPath = QFileInfo(dir.filePath(unresolvedDirEntry)).canonicalFilePath(); + if (!canonicalPath.isEmpty()) { + dirEntries << QFileInfo(canonicalPath).fileName(); + } + } + dirEntries.removeDuplicates(); + + for (const QString &theme : dirEntries) { QString path = folder + QLatin1Char('/') + theme; if (!alreadyHave(theme) && QFile::exists(path + QStringLiteral("/metadata.desktop"))) { add(theme, path); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sddm-kcm-6.2.1/src/ui/Advanced.qml new/sddm-kcm-6.2.2/src/ui/Advanced.qml --- old/sddm-kcm-6.2.1/src/ui/Advanced.qml 2024-10-15 15:17:09.000000000 +0200 +++ new/sddm-kcm-6.2.2/src/ui/Advanced.qml 2024-10-22 14:59:11.000000000 +0200 @@ -35,7 +35,7 @@ if (checked) { kcm.sddmSettings.user = autologinUser.currentText - kcm.sddmSettings.session = autologinSession.currentText + kcm.sddmSettings.session = autologinSession.currentValue } else { kcm.sddmSettings.user = "" kcm.sddmSettings.session = ""