Christophe Giboudeaux 2022-08-03 08:18:22 +00:00 committed by Git OBS Bridge
parent e89a25c752
commit 13a15bcf52
7 changed files with 45 additions and 58 deletions

View File

@ -1,36 +0,0 @@
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:0708bf77b0cf63f085dcc7002a1630ba6930c61cdfe43769ff4baa1fd545b3a0
size 18614692

View File

@ -1,16 +0,0 @@
-----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

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmLpB6IACgkQ11dEg7tX
sY3S+g/8C6SVgksP5kwcvvUlCcm1awun5cqi7cCQfTgNApuh2lh+Ol1LG8Ghaz4C
NAYlTugSmFNeD7K7B8bfad6PHVHk+s8hLnDz0JHsEVWFyyCTCE9V7DHHF1qQcdBY
tAUzl7P1vmx5T6+dTzfzD4JBqTOmrGvRsu4Yy0f3uRSbpv5AO4MYwq3Dfd+DVDeM
BzM2TeHGZw/ztvrWT9eXlmw+RI+SQt4I9p45Q/PVUi/5YrMMrU0zkrRZ/CWSb6Ts
Cha1CKyCIL2E0dieNFr0ia8o6DiBEFY7t3ViI6qiV0JgjzH+UM0DD8wGtgxlSJ5G
elzKrx+kafkHh3lrx0KSacp7yvDK3ChylQNnifJBeWgncmG9+kT8QyRMzNEgb53V
DQqgrDsJPjJOct5HBcROgg0bKaRj9p/IAzDjhpwSJzA9EWil/EXZPTX52oPMT9dw
zgtQ+ddgP4E5rlQJfkMmxYbDwUUx68KXp5nEoJIBWgNdDqkIeTzb/Es1kNcZrzuY
es2fBkjJUNTMw98EowcwOOhm66U4D1fdEX22moZ5HRCmsC6wJw8E4FF3cXoHO/mK
MDb0EAMScsE+t3XMfqKgy0gQdDd1Kfr8sBYJP5vXrSZGhVT9cksOFA+NjCVOG4fm
lTQImgmu76miuBHkZM2FvC69rCTlolaOu3dS7r6BRB3yEamZzhA=
=j9sq
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Tue Aug 2 14:07:15 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.25.4
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.25.4
- Changes since 5.25.3:
* wallpaper/slideshow: shouldn't display "current" item in image list (kde#457327)
* Disable toplevel fixed positions on Wayland
* runners/helprunner: Fix launching of plasmasearch kcm with args
* [kicker/kickoff] Fix urls for search results (kde#456984)
* applets/icon: fix invalid `Accessible.description`
* applets/devicenotifier: improve accessible properties
* applets/batterymonitor: add accessible properties to slider
* [FIX] Unable to remove manually added wallpaper (kde#457019)
* kcms/colors: make sure the preview uses the right colours (kde#456648)
* Don't break configuration when saving layouts
* [Notifications] When there is no thumbnail available, use file icon as drag pixmap
* [Notifications] Ignore stopped job in job aggregator
* [applet/{analog,digital}-clock] Use `onPressed: wasExpanded = ...` idiom
* Fix non-functional lockscreen due to bad cherry-pick (kde#456639)
- Drop patches, now upstream:
* 0001-Fix-non-functional-lockscreen-due-to-bad-cherry-pick.patch
-------------------------------------------------------------------
Tue Jul 12 18:17:00 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.3
Version: 5.25.4
Release: 0
Summary: The KDE Plasma Workspace Components
License: GPL-2.0-or-later
@ -41,8 +41,6 @@ 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