Hello community, here is the log from the commit of package kcm_sddm for openSUSE:Factory checked in at 2019-12-02 11:26:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcm_sddm (Old) and /work/SRC/openSUSE:Factory/.kcm_sddm.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcm_sddm" Mon Dec 2 11:26:58 2019 rev:79 rq:747832 version:5.17.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kcm_sddm/kcm_sddm.changes 2019-09-07 11:36:25.546411723 +0200 +++ /work/SRC/openSUSE:Factory/.kcm_sddm.new.4691/kcm_sddm.changes 2019-12-02 11:27:12.698674607 +0100 @@ -1,0 +2,76 @@ +Tue Nov 12 11:01:06 UTC 2019 - Fabian Vogt <[email protected]> + +- Update to 5.17.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.17.3.php +- No code changes since 5.17.2 + +------------------------------------------------------------------- +Tue Oct 29 20:45:50 UTC 2019 - Fabian Vogt <[email protected]> + +- Update to 5.17.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.17.2.php +- No code changes since 5.17.1 + +------------------------------------------------------------------- +Tue Oct 22 16:44:43 UTC 2019 - Fabian Vogt <[email protected]> + +- Update to 5.17.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.17.1.php +- Changes since 5.17.0: + * Set preview to correct device size (kde#407689) + +------------------------------------------------------------------- +Thu Oct 10 14:25:46 UTC 2019 - Fabian Vogt <[email protected]> + +- Update to 5.17.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.17.0.php +- Changes since 5.16.90: + * Check if sddm user exists + +------------------------------------------------------------------- +Thu Sep 19 12:32:34 UTC 2019 - Fabian Vogt <[email protected]> + +- Update to 5.16.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.16.90.php +- Changes since 5.16.5: + * update to latest kf5 dependency + * Also remove the dependency on libxcb + * Remove unneeded dependencies on X11 and QtX11Extras + * It compile file without deprecated method + * Add a warning message about needing globally installed theme files + * Remove leftover mentions of "AdvanceConfig" + * Rename "AdvanceConfig" to "AdvancedConfig" + * Remove persistence from the kauth helper + * Minor code improvements + * Fix build failure + * Make sure "-dpi" doesn't get passed without an argument + * Sync scaling DPI from Plasma to SDDM + * Sync NumLock preference + * Remove cursor theme option + * Implement syncing of theme preferences between SDDM and Plasma + * Make includes more orderly + * [sddm-kcm] Write settings to /etc/sddm.conf.d instead of etc/sddm.conf (kde#386241) + * Redesign Advanced tab + * Fix forward declaration + * Clean up trailing whitespace + * Minor grammar fix exists -> exists +- Patch rework: + * Rename 0002-Support-default.session-symlink.patch to + 0001-Support-default.session-symlink.patch + * Merge 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch + with dont-set-empty-autologin.patch into + 0002-Replace-autologin-configuration-with-a-note-to-use-Y.patch + * Rename remove-wayland-suffix.patch to + 0003-Don-t-add-a-Wayland-suffix-to-Wayland-sessions.patch + +------------------------------------------------------------------- Old: ---- 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch 0002-Support-default.session-symlink.patch dont-set-empty-autologin.patch remove-wayland-suffix.patch sddm-kcm-5.16.5.tar.xz sddm-kcm-5.16.5.tar.xz.sig New: ---- 0001-Support-default.session-symlink.patch 0002-Replace-autologin-configuration-with-a-note-to-use-Y.patch 0003-Don-t-add-a-Wayland-suffix-to-Wayland-sessions.patch sddm-kcm-5.17.3.tar.xz sddm-kcm-5.17.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcm_sddm.spec ++++++ --- /var/tmp/diff_new_pack.uvVVNo/_old 2019-12-02 11:27:18.730672001 +0100 +++ /var/tmp/diff_new_pack.uvVVNo/_new 2019-12-02 11:27:18.730672001 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: kcm_sddm -Version: 5.16.5 +Version: 5.17.3 Release: 0 Summary: A sddm control module for KDE License: GPL-2.0-only @@ -30,14 +30,10 @@ Source2: plasma.keyring %endif # PATCH-FIX-OPENSUSE -Patch1: dont-set-empty-autologin.patch -# PATCH-FIX-OPENSUSE -Patch2: 0002-Support-default.session-symlink.patch -# PATCH-FIX-OPENSUSE -Patch3: 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch -# PATCH-FIX-UPSTREAM -Patch4: remove-wayland-suffix.patch -BuildRequires: extra-cmake-modules >= 1.0.0 +Patch1: 0001-Support-default.session-symlink.patch +Patch2: 0002-Replace-autologin-configuration-with-a-note-to-use-Y.patch +Patch3: 0003-Don-t-add-a-Wayland-suffix-to-Wayland-sessions.patch +BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: pkgconfig BuildRequires: cmake(KF5Archive) @@ -48,18 +44,11 @@ BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5NewStuff) BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(Qt5Core) >= 5.4.0 -BuildRequires: cmake(Qt5Designer) >= 5.4.0 -BuildRequires: cmake(Qt5Gui) >= 5.4.0 -BuildRequires: cmake(Qt5Quick) >= 5.4.0 -BuildRequires: cmake(Qt5QuickWidgets) >= 5.4.0 -BuildRequires: cmake(Qt5Widgets) >= 5.4.0 -BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xcb) -BuildRequires: pkgconfig(xcb-image) -BuildRequires: pkgconfig(xcb-shm) -BuildRequires: pkgconfig(xcursor) +BuildRequires: cmake(Qt5Core) >= 5.12.0 +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Quick) +BuildRequires: cmake(Qt5QuickWidgets) +BuildRequires: cmake(Qt5Widgets) Supplements: packageand(sddm:plasma5-workspace) Recommends: %{name}-lang @@ -70,8 +59,7 @@ %lang_package %prep -%setup -q -n sddm-kcm-%{version} -%autopatch -p1 +%autosetup -p1 -n sddm-kcm-%{version} %build %cmake_kf5 -d build ++++++ 0002-Support-default.session-symlink.patch -> 0001-Support-default.session-symlink.patch ++++++ --- /work/SRC/openSUSE:Factory/kcm_sddm/0002-Support-default.session-symlink.patch 2018-02-28 19:57:13.763909852 +0100 +++ /work/SRC/openSUSE:Factory/.kcm_sddm.new.4691/0001-Support-default.session-symlink.patch 2019-12-02 11:27:10.806675323 +0100 @@ -1,7 +1,7 @@ -From dd3be6bbca6069ba04ae6f7557c0f959fc10d49c Mon Sep 17 00:00:00 2001 +From 63f7e6b7b0ce899f9dcc8e4b7fc8aba071175ffb Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Tue, 11 Jul 2017 13:13:13 +0200 -Subject: [PATCH 2/2] Support default.session symlink +Subject: [PATCH 1/3] Support default.session symlink Display it under a different name, otherwise it is indistinguishable from a normal session. @@ -9,11 +9,11 @@ src/sessionmodel.cpp | 6 ++++++ 1 file changed, 6 insertions(+) -Index: sddm-kcm-5.12.2/src/sessionmodel.cpp -=================================================================== ---- sddm-kcm-5.12.2.orig/src/sessionmodel.cpp -+++ sddm-kcm-5.12.2/src/sessionmodel.cpp -@@ -95,6 +95,12 @@ void SessionModel::loadDir(const QString +diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp +index 0bbe217..429d664 100644 +--- a/src/sessionmodel.cpp ++++ b/src/sessionmodel.cpp +@@ -96,6 +96,12 @@ void SessionModel::loadDir(const QString &path, SessionType type) if (line.startsWith(QLatin1String("Hidden="))) isHidden = line.mid(7).toLower() == QLatin1String("true"); } @@ -26,3 +26,6 @@ if (!isHidden) { // add to sessions list d->sessions.push_back(si); +-- +2.21.0 + ++++++ 0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch -> 0002-Replace-autologin-configuration-with-a-note-to-use-Y.patch ++++++ --- /work/SRC/openSUSE:Factory/kcm_sddm/0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch 2018-05-16 11:23:07.564586112 +0200 +++ /work/SRC/openSUSE:Factory/.kcm_sddm.new.4691/0002-Replace-autologin-configuration-with-a-note-to-use-Y.patch 2019-12-02 11:27:11.454675078 +0100 @@ -1,38 +1,104 @@ -From 54594141b22474cfc1a0dc3f57258a60706e54c0 Mon Sep 17 00:00:00 2001 +From f605191a7833e9791711d2272e05b52d92bcfb18 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Wed, 27 Dec 2017 18:54:36 +0100 -Subject: [PATCH] Replace autologin configuration with a note to use YaST +Subject: [PATCH 2/3] Replace autologin configuration with a note to use YaST instead sddm looks at sysconfig for autologin and ignores other configuration files. +Also change the default value for the autologin session to "default.desktop", +which is what sddm uses as well. --- - src/ui/advanceconfig.ui | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) + src/advancedconfig.cpp | 4 ++-- + src/ui/advancedconfig.ui | 21 +++++++++++++++++---- + 2 files changed, 19 insertions(+), 6 deletions(-) + +diff --git a/src/advancedconfig.cpp b/src/advancedconfig.cpp +index 3ac31dd..3bc01cd 100644 +--- a/src/advancedconfig.cpp ++++ b/src/advancedconfig.cpp +@@ -84,7 +84,7 @@ void AdvanceConfig::load() + const QString currentUser = mConfig->group("Autologin").readEntry("User", ""); + configUi->userList->setCurrentIndex(userModel->indexOf(currentUser)); + +- const QString autologinSession = mConfig->group("Autologin").readEntry("Session", ""); ++ const QString autologinSession = mConfig->group("Autologin").readEntry("Session", "default.desktop"); + configUi->sessionList->setCurrentIndex(sessionModel->indexOf(autologinSession)); + + configUi->autoLogin->setChecked(!currentUser.isEmpty()); +@@ -108,7 +108,7 @@ QVariantMap AdvanceConfig::save() + QVariantMap args; + + args[QStringLiteral("kde_settings.conf/Autologin/User")] = ( configUi->autoLogin->isChecked() ) ? configUi->userList->currentText() : QString(); +- args[QStringLiteral("kde_settings.conf/Autologin/Session")] = ( configUi->autoLogin->isChecked() ) ? configUi->sessionList->currentData() : QString(); ++ args[QStringLiteral("kde_settings.conf/Autologin/Session")] = configUi->sessionList->currentData(); + + args[QStringLiteral("kde_settings.conf/Autologin/Relogin")] = configUi->reloginAfterQuit->isChecked(); + //TODO session +diff --git a/src/ui/advancedconfig.ui b/src/ui/advancedconfig.ui +index 537d932..85a73f9 100644 +--- a/src/ui/advancedconfig.ui ++++ b/src/ui/advancedconfig.ui +@@ -19,7 +19,14 @@ + <property name="formAlignment"> + <set>Qt::AlignHCenter|Qt::AlignTop</set> + </property> +- <item row="1" column="0"> ++ <item row="0" column="1"> ++ <widget class="QLabel" name="yastlabel"> ++ <property name="text"> ++ <string>The user for autologin needs to be configured using YaST or by setting DISPLAYMANAGER_AUTOLOGIN in /etc/sysconfig/displaymanager.</string> ++ </property> ++ </widget> ++ </item> ++ <item row="0" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Automatically log in:</string> +@@ -33,6 +40,9 @@ + <property name="text"> + <string>as user:</string> + </property> ++ <property name="visible"> ++ <bool>false</bool> ++ </property> + </widget> + </item> + <item> +@@ -40,12 +50,15 @@ + <property name="enabled"> + <bool>false</bool> + </property> ++ <property name="visible"> ++ <bool>false</bool> ++ </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_4"> + <property name="enabled"> +- <bool>false</bool> ++ <bool>true</bool> + </property> + <property name="text"> + <string>with session:</string> +@@ -55,7 +68,7 @@ + <item> + <widget class="QComboBox" name="sessionList"> + <property name="enabled"> +- <bool>false</bool> ++ <bool>true</bool> + </property> + </widget> + </item> +@@ -64,7 +77,7 @@ + <item row="2" column="1"> + <widget class="QCheckBox" name="reloginAfterQuit"> + <property name="enabled"> +- <bool>false</bool> ++ <bool>true</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> +-- +2.22.0 -Index: sddm-kcm-5.12.5/src/ui/advanceconfig.ui -=================================================================== ---- sddm-kcm-5.12.5.orig/src/ui/advanceconfig.ui -+++ sddm-kcm-5.12.5/src/ui/advanceconfig.ui -@@ -45,15 +45,19 @@ - <property name="fieldGrowthPolicy"> - <enum>QFormLayout::ExpandingFieldsGrow</enum> - </property> -- <item row="0" column="0"> -+ <item row="0" column="0" colspan="2"> - <widget class="QLabel" name="label_7"> - <property name="text"> -- <string>User:</string> -+ <string>The user for autologin needs to be configured using YaST or by setting DISPLAYMANAGER_AUTOLOGIN in /etc/sysconfig/displaymanager.</string> - </property> - </widget> - </item> - <item row="0" column="1"> -- <widget class="QComboBox" name="userList"/> -+ <widget class="QComboBox" name="userList"> -+ <property name="visible"> -+ <bool>false</bool> -+ </property> -+ </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_3"> ++++++ 0003-Don-t-add-a-Wayland-suffix-to-Wayland-sessions.patch ++++++ >From 9e7e7bb056a91ec62c40e2cd94454ea006d452c9 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Sat, 7 Jul 2018 20:34:44 +0200 Subject: [PATCH 3/3] Don't add a (Wayland) suffix to Wayland sessions It got removed from sddm as well. --- src/sessionmodel.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp index 429d664..99c5d51 100644 --- a/src/sessionmodel.cpp +++ b/src/sessionmodel.cpp @@ -57,6 +57,7 @@ SessionModel::~SessionModel() { void SessionModel::loadDir(const QString &path, SessionType type) { + Q_UNUSED(type); QDir dir(path); dir.setNameFilters(QStringList() << QStringLiteral("*.desktop")); dir.setFilter(QDir::Files); @@ -82,13 +83,8 @@ void SessionModel::loadDir(const QString &path, SessionType type) if (current_section != QLatin1String("Desktop Entry")) continue; // We are only interested in the "Desktop Entry" section - if (line.startsWith(QLatin1String("Name="))) { + if (line.startsWith(QLatin1String("Name="))) si->name = line.mid(5); - if (type == SessionTypeWayland) { - //we want to exactly match the SDDM prompt which is formatted in this way - si->name = i18nc("%1 is the name of a session", "%1 (Wayland)", si->name); - } - } if (line.startsWith(QLatin1String("Exec="))) si->exec = line.mid(5); if (line.startsWith(QLatin1String("Comment="))) -- 2.21.0 ++++++ sddm-kcm-5.16.5.tar.xz -> sddm-kcm-5.17.3.tar.xz ++++++ ++++ 16868 lines of diff (skipped)
