Accepting request 1200049 from KDE:Frameworks

Plasma 6.1.5. sddm-kcm6 needed a patch change. (forwarded request 1199935 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/1200049
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sddm-kcm6?expand=0&rev=11
This commit is contained in:
Ana Guerrero 2024-09-11 14:55:30 +00:00 committed by Git OBS Bridge
commit ae2209c29d
7 changed files with 49 additions and 41 deletions

View File

@ -10,11 +10,11 @@ a normal session. Use it as default when the combobox is disabled.
src/ui/Advanced.qml | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp
index ebcdb7e..9b00fa6 100644
--- a/src/sessionmodel.cpp
+++ b/src/sessionmodel.cpp
@@ -95,6 +95,12 @@ void SessionModel::loadDir(const QString &path, SessionType type)
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
isHidden = line.mid(7).toLower() == QLatin1String("true");
}
}
@ -27,19 +27,16 @@ index ebcdb7e..9b00fa6 100644
if (!isHidden) {
// add to sessions list
d->sessions.push_back(si);
diff --git a/src/ui/Advanced.qml b/src/ui/Advanced.qml
index 12bf59f..67ea310 100644
--- a/src/ui/Advanced.qml
+++ b/src/ui/Advanced.qml
@@ -79,7 +79,7 @@ Kirigami.Page {
textRole: "name"
valueRole: "file"
onActivated: kcm.sddmSettings.session = currentValue
- onEnabledChanged: enabled ? kcm.sddmSettings.session = currentValue : kcm.sddmSettings.session = ""
+ onEnabledChanged: enabled ? kcm.sddmSettings.session = currentValue : kcm.sddmSettings.session = "default.desktop"
KCM.SettingStateBinding {
visible: autologinBox.checked
configObject: kcm.sddmSettings
--
2.41.0
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
@@ -38,7 +38,7 @@ Kirigami.Page {
kcm.sddmSettings.session = autologinSession.currentText
} else {
kcm.sddmSettings.user = ""
- kcm.sddmSettings.session = ""
+ kcm.sddmSettings.session = "default.desktop"
}
// Deliberately imperative because we only want the message

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmayGN8ACgkQ11dEg7tX
sY2i+RAAtz5CylpVWyTq16N8EEWcc79Y8W4tSTbpyHZ0NE/NDoahG5ZMbhQrnqSy
ezUzqKdIhMfBYh5lBUZ7cOJwxiqgyfCIJiXP3IXGlehewZUqBZIqIy77kszCsbYy
yavjXmNPDJRTzi7NffkbUmLdXFJUqIzKmw1BKC7Obepn2szhJczdGn6Bwi7vDFD1
1DTDRGTuSjYmnIxXfyzCjsQ156sM6cwXfeSCZ9Efl09R6f2JpyNTOEhZ7yBPEz0p
MAtEPSNpeQBnXsKwuPRauHPYuIcEC6+HtKg1HhqlWe12A7m23ncZFV457kZBE3Xh
ovTgDkcB/ySKN5mJ8DoclcAPfF+Mm8qWfcRXmxIjldCNV2SXh1RnVpPNUahilV6h
i2MXtFYB1c4b1oh6AVuN53Pwdjb0+97vgB3KHdOxs0qe9lkV40j+4YN89z2eiAzj
3BqHlu79ctmbXlV0kpxweE3Kfmw5kgNtlRG4DL6CnTgXveQPb2IB7B3CEisChuce
BGDX/j7/fjCUxT+IerVpFTATZFXADoSMQV1SgTl72FVB09mD1M+JLsyuk6kN6tSx
CRJJJq3djdCcwerR5Lw9CqEltiIoQ6PG1KkOCBWW0nbMFzT2yEeF+APUKJDr6jDL
iDr2vdjUNF3Fp4FhX30YgrZbL8JmW3f8CGemRbW1THJLZVE2qYw=
=R0Hk
-----END PGP SIGNATURE-----

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

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

16
sddm-kcm-6.1.5.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmbgCSMACgkQ11dEg7tX
sY3g8BAAkQ0PPxo/mh/vgtgy4r4RfgFPhsPagUXbh0SKuLmlNNlwBlxwXqxoYfbh
ORqTpZyjX0dw+kLXMsjkAGcQy6yZlJXQXaOkGZDAJxN5B2rXm4yMlYho9CI0Xnjd
YF8TS3TQeSAOZ1iwjK3oxpw99Dc+7aUuXprCbYqwwNDrgNpIrpU4Gyj40UTAK39M
vPy6x8VcDLNuROKlHy31niKWGf8saLbeNJf74RPOJDbotGiFYj9T7pSCkX3+/txY
2/C/kcbI1XP4VPFFOafvSZd18yAEKqSHD8N9fwQ0dQxQLD/z3714OZPZ5TSn4+mc
AnMn9fSTBIrkHAe9bs/niAYnH48i3Pgurdxnu9kbXWaNOKY1T4l8xPR/kEvqQRX4
m7CjpH9Z2CZkoNdasIOhP9tfrAUWo2hBIbMTv2PfhbwGZvfisRxZWbnIDYMPm16k
Q/ktQ4YiHC3zfSAFs2JgBnUZMbkso6d4Wv9IQtrzi9JwciEnL5aWNT4Y2Qg6hZYO
778vGhgifxDtx+4qRdskHHTRND1CnMY05jdCOkYLKUBvnoAiPTywmxuvUTko0fUe
DPkU568eksz8aIFUyMKkGKLkxrcaIu5hL3HPMcGlrMtH+JS2UE++it14A6c1zfft
HwIWn/3Hb09vxMY+EQqwgbrxGem6Ld5SYD7zEAjtNyYvZBdtrzU=
=Ktp0
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Sep 10 14:55:32 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 6.1.5:
* New bugfix release
* For more details see https://kde.org/announcements/plasma/6/6.1.5
- Changes since 6.1.4:
* Fix needssave state management (kde#490937)
* update version for new release
- Rebase 0001-Support-default.session-symlink.patch
-------------------------------------------------------------------
Tue Aug 6 13:29:11 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -23,7 +23,7 @@
%bcond_without released
Name: sddm-kcm6
Version: 6.1.4
Version: 6.1.5
Release: 0
Summary: A sddm control module for KDE
License: GPL-2.0-only