Plasma 5.19 Beta. Did I forget to submit the fixes? Untested - please publish disable before accepting.

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcm_sddm?expand=0&rev=238
This commit is contained in:
Christophe Giboudeaux 2020-05-19 13:35:06 +00:00 committed by Git OBS Bridge
parent 5d4f03cb79
commit af89237371
7 changed files with 38 additions and 25 deletions

View File

@ -1,4 +1,4 @@
From f605191a7833e9791711d2272e05b52d92bcfb18 Mon Sep 17 00:00:00 2001 From 0e638de390c1629feba3ebd165e4c2a9d872b4f9 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de> From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Wed, 27 Dec 2017 18:54:36 +0100 Date: Wed, 27 Dec 2017 18:54:36 +0100
Subject: [PATCH 2/3] Replace autologin configuration with a note to use YaST Subject: [PATCH 2/3] Replace autologin configuration with a note to use YaST
@ -13,10 +13,10 @@ which is what sddm uses as well.
2 files changed, 19 insertions(+), 6 deletions(-) 2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/advancedconfig.cpp b/src/advancedconfig.cpp diff --git a/src/advancedconfig.cpp b/src/advancedconfig.cpp
index 3ac31dd..3bc01cd 100644 index ac1acfd..e5ff047 100644
--- a/src/advancedconfig.cpp --- a/src/advancedconfig.cpp
+++ b/src/advancedconfig.cpp +++ b/src/advancedconfig.cpp
@@ -84,7 +84,7 @@ void AdvanceConfig::load() @@ -84,7 +84,7 @@ void AdvancedConfig::load()
const QString currentUser = mConfig->group("Autologin").readEntry("User", ""); const QString currentUser = mConfig->group("Autologin").readEntry("User", "");
configUi->userList->setCurrentIndex(userModel->indexOf(currentUser)); configUi->userList->setCurrentIndex(userModel->indexOf(currentUser));
@ -25,9 +25,9 @@ index 3ac31dd..3bc01cd 100644
configUi->sessionList->setCurrentIndex(sessionModel->indexOf(autologinSession)); configUi->sessionList->setCurrentIndex(sessionModel->indexOf(autologinSession));
configUi->autoLogin->setChecked(!currentUser.isEmpty()); configUi->autoLogin->setChecked(!currentUser.isEmpty());
@@ -108,7 +108,7 @@ QVariantMap AdvanceConfig::save() @@ -106,7 +106,7 @@ void AdvancedConfig::load()
QVariantMap args; void AdvancedConfig::save(QVariantMap &args)
{
args[QStringLiteral("kde_settings.conf/Autologin/User")] = ( configUi->autoLogin->isChecked() ) ? configUi->userList->currentText() : QString(); 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->autoLogin->isChecked() ) ? configUi->sessionList->currentData() : QString();
+ args[QStringLiteral("kde_settings.conf/Autologin/Session")] = configUi->sessionList->currentData(); + args[QStringLiteral("kde_settings.conf/Autologin/Session")] = configUi->sessionList->currentData();
@ -35,7 +35,7 @@ index 3ac31dd..3bc01cd 100644
args[QStringLiteral("kde_settings.conf/Autologin/Relogin")] = configUi->reloginAfterQuit->isChecked(); args[QStringLiteral("kde_settings.conf/Autologin/Relogin")] = configUi->reloginAfterQuit->isChecked();
//TODO session //TODO session
diff --git a/src/ui/advancedconfig.ui b/src/ui/advancedconfig.ui diff --git a/src/ui/advancedconfig.ui b/src/ui/advancedconfig.ui
index 537d932..85a73f9 100644 index b4824e5..6941024 100644
--- a/src/ui/advancedconfig.ui --- a/src/ui/advancedconfig.ui
+++ b/src/ui/advancedconfig.ui +++ b/src/ui/advancedconfig.ui
@@ -19,7 +19,14 @@ @@ -19,7 +19,14 @@
@ -100,5 +100,5 @@ index 537d932..85a73f9 100644
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-- --
2.22.0 2.25.1

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu May 14 14:33:02 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.18.90
* New feature release
* For more details please see:
* https://www.kde.org/announcements/plasma-5.18.90.php
- Changes since 5.18.5:
* bump to require Qt 5.14
* Make it compile against qt5.15. ::unite is deprecated.
- Refresh patches:
* 0002-Replace-autologin-configuration-with-a-note-to-use-Y.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 5 13:01:51 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de> Tue May 5 13:01:51 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -18,15 +18,15 @@
%bcond_without lang %bcond_without lang
Name: kcm_sddm Name: kcm_sddm
Version: 5.18.5 Version: 5.18.90
Release: 0 Release: 0
Summary: A sddm control module for KDE Summary: A sddm control module for KDE
License: GPL-2.0-only License: GPL-2.0-only
Group: System/GUI/KDE Group: System/GUI/KDE
URL: https://projects.kde.org/projects/kdereview/sddm-kcm/repository URL: https://projects.kde.org/projects/kdereview/sddm-kcm/repository
Source: https://download.kde.org/stable/plasma/%{version}/sddm-kcm-%{version}.tar.xz Source: https://download.kde.org/unstable/plasma/%{version}/sddm-kcm-%{version}.tar.xz
%if %{with lang} %if %{with lang}
Source1: https://download.kde.org/stable/plasma/%{version}/sddm-kcm-%{version}.tar.xz.sig Source1: https://download.kde.org/unstable/plasma/%{version}/sddm-kcm-%{version}.tar.xz.sig
Source2: plasma.keyring Source2: plasma.keyring
%endif %endif
# PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cc99c185d701acc7442f33ef17b2396894dcf164f3f583c25105ac3f2528c33b
size 62184

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl6xgJYACgkQ7JTRj38F
mX7aewf6AvN3MUSMpk9npXnDmVhBzIEIA4UTjYSLTMAg1ykC8XqbuajP/XzekRkl
n2xA1KG6DnXd9+XN2xcgtHyMk/mrkpbu87SgdemuZYnoRtED203fwQ0glhbBct9d
Y5c0UO+eLpjJ+CYKTANXu1G1HNR8yaxdZ2pYWDClsRAwjqL/38PVq8x+MC07sM9p
sUeBt9L5saal6iqoS6q30JDFI20g5S7oAZLY1eu1+ZVy0C5Jn0qaImaEsgS/H7rX
+dz2IpEVrAhGRqFS8xzryiviZc1nCDcCAxp8A2zgrTAkxHfQwFVLxD2MehtbU+sk
7nOcCNr9MLpHYEq9XT8Zrzif0164ag==
=Gxj5
-----END PGP SIGNATURE-----

3
sddm-kcm-5.18.90.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8b09176b873720e7dfcf5c16ae7b3d1a6af4c9d06449e76eb21d9ebffaad9e01
size 62584

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl69JDwACgkQ7JTRj38F
mX5D+gf8DwETsfO+7GJMLnPab4Hum6jcE4T/fLTStjShn+AlfQtAjKo5VIPn/qfM
o2X3KUnm+07rwN2pTYLaMyOrQWcTQowyUruJh8cJX74QdXzlOZPQFVzOWWdZl5K5
4pM/+FUfYB201sogVThENJ4sYAwojUrG0N7pOOIjx2DKaeZZnPa6tkePp+PGag3F
4Fzq4Yx4JY6cVcCxbjHw3+RIqon9gkFSEaQWV25PUX3pbumwpycGuqRfP6fcGpub
Bh0hvQeONsdXZqYns8G7/k99Ua4o2+8+8/NPURatfZpB+eRU0Nz5hhLNMcFi9JrG
zB9SBaR91OEU4uirOevkxHl5ZEGghw==
=/Lwk
-----END PGP SIGNATURE-----