diff --git a/0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch b/0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch deleted file mode 100644 index 95583fc..0000000 --- a/0001-Replace-autologin-configuration-with-a-note-to-use-Y.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 54594141b22474cfc1a0dc3f57258a60706e54c0 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Wed, 27 Dec 2017 18:54:36 +0100 -Subject: [PATCH] Replace autologin configuration with a note to use YaST - instead - -sddm looks at sysconfig for autologin and ignores other configuration files. ---- - src/ui/advanceconfig.ui | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -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 @@ - - QFormLayout::ExpandingFieldsGrow - -- -+ - - -- User: -+ The user for autologin needs to be configured using YaST or by setting DISPLAYMANAGER_AUTOLOGIN in /etc/sysconfig/displaymanager. - - - - -- -+ -+ -+ false -+ -+ - - - diff --git a/0002-Support-default.session-symlink.patch b/0001-Support-default.session-symlink.patch similarity index 63% rename from 0002-Support-default.session-symlink.patch rename to 0001-Support-default.session-symlink.patch index 8427f32..15d5e8b 100644 --- a/0002-Support-default.session-symlink.patch +++ b/0001-Support-default.session-symlink.patch @@ -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 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 @@ a normal session. 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 @@ Index: sddm-kcm-5.12.2/src/sessionmodel.cpp if (!isHidden) { // add to sessions list d->sessions.push_back(si); +-- +2.21.0 + diff --git a/0002-Replace-autologin-configuration-with-a-note-to-use-Y.patch b/0002-Replace-autologin-configuration-with-a-note-to-use-Y.patch new file mode 100644 index 0000000..05eaf95 --- /dev/null +++ b/0002-Replace-autologin-configuration-with-a-note-to-use-Y.patch @@ -0,0 +1,104 @@ +From f605191a7833e9791711d2272e05b52d92bcfb18 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Wed, 27 Dec 2017 18:54:36 +0100 +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/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 @@ + + Qt::AlignHCenter|Qt::AlignTop + +- ++ ++ ++ ++ The user for autologin needs to be configured using YaST or by setting DISPLAYMANAGER_AUTOLOGIN in /etc/sysconfig/displaymanager. ++ ++ ++ ++ + + + Automatically log in: +@@ -33,6 +40,9 @@ + + as user: + ++ ++ false ++ + + + +@@ -40,12 +50,15 @@ + + false + ++ ++ false ++ + + + + + +- false ++ true + + + with session: +@@ -55,7 +68,7 @@ + + + +- false ++ true + + + +@@ -64,7 +77,7 @@ + + + +- false ++ true + + + +-- +2.22.0 + diff --git a/remove-wayland-suffix.patch b/0003-Don-t-add-a-Wayland-suffix-to-Wayland-sessions.patch similarity index 63% rename from remove-wayland-suffix.patch rename to 0003-Don-t-add-a-Wayland-suffix-to-Wayland-sessions.patch index e3eff0f..1cbd66f 100644 --- a/remove-wayland-suffix.patch +++ b/0003-Don-t-add-a-Wayland-suffix-to-Wayland-sessions.patch @@ -1,18 +1,26 @@ -From c6fda4bb877a71687b37e6a19f9daf7298e32f98 Mon Sep 17 00:00:00 2001 +From 9e7e7bb056a91ec62c40e2cd94454ea006d452c9 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 7 Jul 2018 20:34:44 +0200 -Subject: [PATCH] Don't add a (Wayland) suffix to Wayland sessions +Subject: [PATCH 3/3] Don't add a (Wayland) suffix to Wayland sessions It got removed from sddm as well. --- - src/sessionmodel.cpp | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) + src/sessionmodel.cpp | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp -index ff63dbd..eeb962c 100644 +index 429d664..99c5d51 100644 --- a/src/sessionmodel.cpp +++ b/src/sessionmodel.cpp -@@ -81,13 +81,8 @@ void SessionModel::loadDir(const QString &path, SessionType type) +@@ -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 @@ -28,5 +36,5 @@ index ff63dbd..eeb962c 100644 si->exec = line.mid(5); if (line.startsWith(QLatin1String("Comment="))) -- -2.17.1 +2.21.0 diff --git a/dont-set-empty-autologin.patch b/dont-set-empty-autologin.patch deleted file mode 100644 index 67acc11..0000000 --- a/dont-set-empty-autologin.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: sddm-kcm-5.13.80git.20180704T081749~7a9b287/src/advanceconfig.cpp -=================================================================== ---- sddm-kcm-5.13.80git.20180704T081749~7a9b287.orig/src/advanceconfig.cpp -+++ sddm-kcm-5.13.80git.20180704T081749~7a9b287/src/advanceconfig.cpp -@@ -122,7 +122,10 @@ QVariantMap AdvanceConfig::save() - } - - args[QStringLiteral("sddm.conf/Autologin/User")] = ( configUi->autoLogin->isChecked() ) ? configUi->userList->currentText() : QString(); -- args[QStringLiteral("sddm.conf/Autologin/Session")] = ( configUi->autoLogin->isChecked() ) ? configUi->sessionList->currentData() : QString(); -+ if (configUi->autoLogin->isChecked()) { // only save the Autologin session if Autologin is actually enabled otherwise we would override the default session with "" if disabled -+ args[QStringLiteral("sddm.conf/Autologin/Session")] = configUi->sessionList->currentData(); -+ } -+ - - args[QStringLiteral("sddm.conf/Autologin/Relogin")] = configUi->reloginAfterQuit->isChecked(); - //TODO session diff --git a/kcm_sddm.changes b/kcm_sddm.changes index 059b723..bc9baf3 100644 --- a/kcm_sddm.changes +++ b/kcm_sddm.changes @@ -1,3 +1,79 @@ +------------------------------------------------------------------- +Tue Nov 12 11:01:06 UTC 2019 - Fabian Vogt + +- 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 + +- 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 + +- 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 + +- 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 + +- 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 + ------------------------------------------------------------------- Tue Sep 3 12:44:11 UTC 2019 - Fabian Vogt diff --git a/kcm_sddm.spec b/kcm_sddm.spec index f4e2e8b..2572315 100644 --- a/kcm_sddm.spec +++ b/kcm_sddm.spec @@ -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 @@ Source1: https://download.kde.org/stable/plasma/%{version}/sddm-kcm-%{ver 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(KF5I18n) 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 @@ sddm. %lang_package %prep -%setup -q -n sddm-kcm-%{version} -%autopatch -p1 +%autosetup -p1 -n sddm-kcm-%{version} %build %cmake_kf5 -d build diff --git a/sddm-kcm-5.16.5.tar.xz b/sddm-kcm-5.16.5.tar.xz deleted file mode 100644 index 02222ff..0000000 --- a/sddm-kcm-5.16.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4220d18f1a04c767649bffee1aed6c2b2c12c60cd7d6ca6fabc3dbec1ec3f127 -size 62164 diff --git a/sddm-kcm-5.16.5.tar.xz.sig b/sddm-kcm-5.16.5.tar.xz.sig deleted file mode 100644 index b423c98..0000000 --- a/sddm-kcm-5.16.5.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl1ucpcACgkQ7JTRj38F -mX4BTAgAs2rRTq89kBzUidQOQNfw8+41rcGvh+4vMJCKAHvu4YBm6ZjbgLJJjZ0k -n3f3GkMEl9nWqKAlxR8RfQmC0pYJtFs85Tqrt8tw8/fn6VthhJzA0/IKaH66ZhtS -82qvWct5xlYkVq6TrceihwuImVI1cfZX6cat0HgzCVKUmy5kTpNZKPhdELL9aXTZ -ySfMMBOouuf9jtfgCt721lxs4CdTUSKLkqxA/hHszWMqsNSjR2As8K4URNJKmr1o -o3EjecXiQXGIuBMf6q+q1bEMJgJWM5rz0/yUiJ7c8F4cXDO5A41uUWk2b5K7wnuf -AiSYx8o0xNGWrUZBCkn+fPd3hcDNhA== -=ejsv ------END PGP SIGNATURE----- diff --git a/sddm-kcm-5.17.3.tar.xz b/sddm-kcm-5.17.3.tar.xz new file mode 100644 index 0000000..6a16f62 --- /dev/null +++ b/sddm-kcm-5.17.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:046b24116ced4e11e85523021fc6b3bfbe6c97f03e30cc747cd66d3a717355f5 +size 58680 diff --git a/sddm-kcm-5.17.3.tar.xz.sig b/sddm-kcm-5.17.3.tar.xz.sig new file mode 100644 index 0000000..2d7c601 --- /dev/null +++ b/sddm-kcm-5.17.3.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl3KiuMACgkQ7JTRj38F +mX739wf/c1FhFvk5vPbrWMnbO1RTiYrIS43mPKYNVBz5xIrGMh+cDmlYRMQyDzUs +yyie0koeBNdJ6FQeBeo9YArozCaG733AknW1RoKJezdmvByui4sMIftNizD9BW6X +OFHblmkuIt3pW4BzYO8T2usidbq5Lie4l3WUYi9IxQKtgnre8+ZXa4y1okepEQ1o +cmA5Ixvm+MaH0z1vDyZ1lJhORUooD+ZtOsLJubgDQhbB3jy9r1OYOJVh+z1haiCM +pCvqspD2gSuYbuhpBsVXLHwV0epfuiqMwNtG5m1TP7WE/Pmf0dHCh6TtvAzABqQk +iqsmKew93JREZinlaQWbFGeYieNEVw== +=s/wm +-----END PGP SIGNATURE-----