Accepting request 988852 from KDE:Frameworks5

Plasma 5.25.3, with fixed lockscreen (forwarded request 988718 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/988852
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=193
This commit is contained in:
Dominique Leuenberger 2022-07-14 14:33:49 +00:00 committed by Git OBS Bridge
commit 1f337e8275
7 changed files with 81 additions and 20 deletions

View File

@ -0,0 +1,36 @@
From bfb47cb202784733618e53e1088e8676c2815456 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Tue, 12 Jul 2022 20:11:15 +0200
Subject: [PATCH] Fix non-functional lockscreen due to bad cherry-pick
The cherry-pick of 923ce7e5887d
("Fix password field in lock screen not clearing after failed login attempt")
introduced two assignments to properties which don't exist in 5.25 yet. This
causes execution of those blocks to abort early, resulting in a bad state,
like hadPrompt never getting set to true.
BUG: 456639
---
lookandfeel/contents/lockscreen/LockScreenUi.qml | 2 --
1 file changed, 2 deletions(-)
diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml
index 50f4ccd85..2b638f8fa 100644
--- a/lookandfeel/contents/lockscreen/LockScreenUi.qml
+++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml
@@ -67,12 +67,10 @@ PlasmaCore.ColorScope {
function onPrompt(msg) {
root.notification = msg;
- mainBlock.showPassword = true;
mainBlock.mainPasswordBox.forceActiveFocus();
lockScreenUi.hadPrompt = true;
}
function onPromptForSecret(msg) {
- mainBlock.showPassword = false;
mainBlock.mainPasswordBox.forceActiveFocus();
lockScreenUi.hadPrompt = true;
}
--
2.36.1

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmK68QgACgkQ11dEg7tX
sY1duA/+LkD5TTV69MjIYEfUC/lrqrCN6MiDnz6U5fnasfKkiVocxxB7/QGq1q3m
z0Wf2aLEmLrkql3XzgzWCJP8ZPm7dnDD9jxkIITV9+eApRC8BrhEWKxEMNB3Jq0C
UdYoTIBHTYwr0E3rc4jZqWgbEPZFUG24amHOtowPSTKl41J4OjNVxIXl08m2z/zW
FzqEjgH1g2lnL48HHbxwyfW82Ive6YacgzOR+bcDYBnKLlKqjg6UbHTgQ1Xy3rl2
qEhnwOgbtiYzPBJilQ+8uqgFciGWXq9I8y7Y/OCKRwIQEcFz4t7HvFP/gkRiDlk5
E17CY4RdJuh6ulDnK7skPXLD2iSqux/uZSKnz+n1rLSo+DeUt4eoxktP/1UxDiDz
mOiaA+KVrwp3S40RuXg3W7an/6jgWCupRtOvjyUseF/SpNMgUAoc19w3rRfv1CVo
lnQEFwB+IRvP7gzqRZ57uILNssqCV3s5n9hJLXQmkBLZOR1i1O7O0QCf68NlfYOO
7PtaFKgwjFr7SaZbolfTjnPAlOcI1cnGYSRZ2wLWvzluTpbFoTbC2pQ23YxEbqva
JF2cIuBFgQ5aM/jQlakTrs+IzV6sBaP11+9R9+yKSKck6cGDpv5qK3k7PY4RS6eW
fdkTw7sqiuYfVTUvdnCpdx1cLuzQ3gE6coAcT1ENAGfHSpJNHBc=
=QJLF
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmLNTwoACgkQ11dEg7tX
sY1VGBAApzlyfCWOg095CYJFBmyOsSG2CTJCL7i0KgKpK4EtszdZWXYAGukd883x
N8D+fQGk2ORfEwjT3WgP7pt+kdSI6GJIv4ScpHogFfSEQBeHguHj0DdxJL/6iiy+
06EfHC9kIzlUPV6pojjkXrZZiIq77Cz/RDwmfl+7kmziYTwmrrA3bblMncgPY3Pv
slVKze1IafqL0XVac6OTMLqy9x3lulma4s7gCMhU9GmNuUCazFM+UleTalra+Yu9
9eXEiNypcppHaovw8jU54HGjGaLKlwAiuY9vsns8xHj1bk1N/lNsnlwFgVJGhJb/
TmsWxKL4XJR2cnVcJfmdQABPu9H3Z+TUPK89yjFUIXgqI528hwBuYr5cUyC9hfsJ
NWweOcmxTaDsL6u4Ay8xophWqItJG0uqAzB6dAqTyfiyjwwEF/6fL9AQ0LgqoZCV
qC/haelR8fl1cxnFhxZ4aghjzG46VVb9JzoERDGnfnsfwP8zUQ+yjJBajYLoCaWP
QVE20P4NJgegVV37mF1+oUvs1vjYdO3fxv5BEjQ2g9ZQvfPb43DG7Z73CCylGsjI
PkGLkM7V1zTjvOZxtgYD+yIntwN++mCK+Tf0XVJs/oMeQ3sby1LyTuQ0GcUQvF/t
7dgKj5nvZ7geQIMBd0beg9Rs5AfBfNG7Z3w/yz4Kpmai6SGZqZA=
=6zPa
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Tue Jul 12 18:17:00 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to fix the lock screen (kde#456639):
* 0001-Fix-non-functional-lockscreen-due-to-bad-cherry-pick.patch
-------------------------------------------------------------------
Tue Jul 12 11:29:05 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.25.3
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.25.3
- Changes since 5.25.2:
* Guard against cursor theme changing in animation timer (kde#456526)
* Fix "PanelSpacer::containmentGraphicObject()" plasmashell segfault (kde#450663)
* Fix StatusNotifierItem MidClick (kde#456466)
* kcms/lookandfeel: Set all defaults when saving the default package (kde#456275)
* kcms/colors: Properly apply tinting to the window titlebar (kde#455395,kde#454047)
* [kcms/icons] Pass parent window to ksycoca progress dialog
* applets/kicker: Get rid of a separator just above title menu item (kde#449132)
* Fix password field in lock screen not clearing after failed login attempt (kde#455227)
-------------------------------------------------------------------
Tue Jun 28 13:03:35 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -29,7 +29,7 @@ Name: plasma5-workspace
%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
# Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
%{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
Version: 5.25.2
Version: 5.25.3
Release: 0
Summary: The KDE Plasma Workspace Components
License: GPL-2.0-or-later
@ -41,6 +41,8 @@ Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspa
Source2: plasma.keyring
%endif
Source3: xprop-kde-full-session.desktop
# PATCH-FIX-UPSTREAM
Patch1: 0001-Fix-non-functional-lockscreen-due-to-bad-cherry-pick.patch
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch