12
0
Wolfgang Bauer
2021-02-25 08:24:59 +00:00
committed by Git OBS Bridge
parent ae9ce836c0
commit 341c46a798
10 changed files with 40 additions and 177 deletions

View File

@@ -1,28 +0,0 @@
From 056f5379830970dc2a7e12e3f16c898b384d5997 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 12 Feb 2021 18:00:45 +0100
Subject: [PATCH] ksmserver: Enable debug output by default
Sometimes logout just doesn't do anything (kde#432460). Debugging so far
didn't help as it made the issue disappear, so enable log output in general
so that either the issue disappears or there's useful output when it breaks.
---
ksmserver/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt
index 34f943f5d..69dc58ac8 100644
--- a/ksmserver/CMakeLists.txt
+++ b/ksmserver/CMakeLists.txt
@@ -18,7 +18,7 @@ set(ksmserver_SRCS
logout.cpp
client.cpp
)
-ecm_qt_declare_logging_category(ksmserver_SRCS HEADER ksmserver_debug.h IDENTIFIER KSMSERVER CATEGORY_NAME org.kde.kf5.ksmserver)
+ecm_qt_declare_logging_category(ksmserver_SRCS HEADER ksmserver_debug.h IDENTIFIER KSMSERVER CATEGORY_NAME org.kde.kf5.ksmserver DEFAULT_SEVERITY Debug)
qt5_add_dbus_adaptor( ksmserver_SRCS org.kde.KSMServerInterface.xml server.h KSMServer )
qt5_add_dbus_interface( ksmserver_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface )
--
2.25.1

View File

@@ -1,67 +0,0 @@
From 74fef0a9973e62df16ff8fc97a795bce1fa2a273 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Tue, 16 Feb 2021 11:27:53 +0000
Subject: [PATCH] [libkworkspace] Interim fix for the logout issue
Calls to a DBus activated service can fail if the sender quits whilst
the service is spawning
(https://gitlab.freedesktop.org/dbus/dbus/-/issues/72) and using
dbus-daemon.
This is a lazy interim fix that just makes these calls block as proper
fixes will require more work.
BUG: 432460
(cherry picked from commit 81d61861608012e4d7a19e6f85b8d136c298f31f)
---
libkworkspace/sessionmanagement.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libkworkspace/sessionmanagement.cpp b/libkworkspace/sessionmanagement.cpp
index 4b80485cb..3dbe40f0d 100644
--- a/libkworkspace/sessionmanagement.cpp
+++ b/libkworkspace/sessionmanagement.cpp
@@ -130,10 +130,10 @@ void SessionManagement::requestShutdown(ConfirmationMode confirmationMode)
}
if (confirm) {
LogoutPromptIface iface;
- iface.promptShutDown();
+ iface.promptShutDown().waitForFinished();
} else {
ShutdownIface iface;
- iface.logoutAndShutdown();
+ iface.logoutAndShutdown().waitForFinished();
}
}
@@ -148,10 +148,10 @@ void SessionManagement::requestReboot(ConfirmationMode confirmationMode)
}
if (confirm) {
LogoutPromptIface iface;
- iface.promptReboot();
+ iface.promptReboot().waitForFinished();
} else {
ShutdownIface iface;
- iface.logoutAndReboot();
+ iface.logoutAndReboot().waitForFinished();
}
}
@@ -166,10 +166,10 @@ void SessionManagement::requestLogout(ConfirmationMode confirmationMode)
}
if (confirm) {
LogoutPromptIface iface;
- iface.promptLogout();
+ iface.promptLogout().waitForFinished();
} else {
ShutdownIface iface;
- iface.logout();
+ iface.logout().waitForFinished();
}
}
--
2.25.1

View File

@@ -1,31 +0,0 @@
From 7070394fb3779032f20b8165de5b5d6b9f104b3a Mon Sep 17 00:00:00 2001
From: Alexander Lohnau <alexander.lohnau@gmx.de>
Date: Wed, 17 Feb 2021 16:23:56 +0100
Subject: [PATCH] locations runner: Fix absolute filepath + arguments
The KUriFilter would interpret this as a path and consequently
produce a result.
BUG: 433053
FIXED-IN: 5.21
---
runners/locations/locationrunner.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/runners/locations/locationrunner.cpp b/runners/locations/locationrunner.cpp
index be1be7e6a..175c07023 100644
--- a/runners/locations/locationrunner.cpp
+++ b/runners/locations/locationrunner.cpp
@@ -52,7 +52,8 @@ LocationsRunner::~LocationsRunner()
void LocationsRunner::match(Plasma::RunnerContext &context)
{
QString term = context.query();
- QFileInfo tmpInfo(KShell::tildeExpand(term));
+ // If we have a query with an executable and optionally arguments, BUG: 433053
+ QFileInfo tmpInfo(KShell::tildeExpand(KShell::splitArgs(term).constFirst()));
if (tmpInfo.isFile() && tmpInfo.isExecutable()) {
return;
}
--
2.25.1

View File

@@ -1,32 +0,0 @@
From 3a672ee43f48655ddcb544cc947680ba0aab7d2a Mon Sep 17 00:00:00 2001
From: Alexander Lohnau <alexander.lohnau@gmx.de>
Date: Mon, 22 Feb 2021 18:10:08 +0100
Subject: [PATCH] locations runner: Fix empty list on invalid shell quotes
---
runners/locations/locationrunner.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/runners/locations/locationrunner.cpp b/runners/locations/locationrunner.cpp
index 175c07023..d1edeef02 100644
--- a/runners/locations/locationrunner.cpp
+++ b/runners/locations/locationrunner.cpp
@@ -53,9 +53,12 @@ void LocationsRunner::match(Plasma::RunnerContext &context)
{
QString term = context.query();
// If we have a query with an executable and optionally arguments, BUG: 433053
- QFileInfo tmpInfo(KShell::tildeExpand(KShell::splitArgs(term).constFirst()));
- if (tmpInfo.isFile() && tmpInfo.isExecutable()) {
- return;
+ const QStringList split = KShell::splitArgs(term);
+ if (!split.isEmpty()) {
+ QFileInfo tmpInfo(KShell::tildeExpand(split.first()));
+ if (tmpInfo.isFile() && tmpInfo.isExecutable()) {
+ return;
+ }
}
// We want to expand ENV variables like $HOME to get the actual path, BUG: 358221
KUriFilter::self()->filterUri(term, {QStringLiteral("kshorturifilter")});
--
2.25.1

View File

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

View File

@@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmAlIVAACgkQ7JTRj38F
mX6m1Af/cOYUE2GqI/ms7hFNivYYUn5snmh/QTTrhYwe2rvAmFGA/2f67EsHyz8Q
XLTdGgEc3qPl3htmMNkf2IqNubf3XCs/Sq/XPf+sL09kUSSoivp75A9nXe0HJWCL
gZtn7mjxGEXbY9BWc07XbkCnw2BgM7jSGR/wVUXPFcQMRUc+IPcFxv4JcmrCfYIJ
eE9g3wxiGEluBP31f6+XzodtKlZ2qxdbSUfBOjDFzstS8It+Iwtmf63JCm91L70F
fxjTDAeISClDhrLjTLB0UpN4Nva8RdGBZant6wqbsaAfAlRPWikai7wQq0C0Al0p
KRbjFRe79Hq2h3FyEc36botmSPJk3w==
=ArB5
-----END PGP SIGNATURE-----

View File

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

View File

@@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmA0/tIACgkQ7JTRj38F
mX4X0wf/TohBnkvJF4Owete96e6Vzam4N9QXaoaP/N1qn1V9B5GOJwScMa1QE824
QujVd8Ag9+e+l9/E7uYLR+G6hMOcvcNBXdlGNGwgnPASCldDiymvPvptTrkEdNnR
jxycDfBXvoubiULT7DFDAUyZvLuj2oobVXWiF2rLkP3c8t+9yPXGRTGisgMg9Ds6
lxC5dxMqOCVnHX//7lC8tNjRwF/rkWK79H+ATPF56U8DNpSomTCfG75N+SnyXBPd
EH+Bv2HvG73P/VfgQV5bblbFsTLm+qBw8EeENzRJ9oG4idpod37ucUWKmt8knkXo
oelME4Ljmj8ZageSVBhTt5I9bWYf4w==
=vhmJ
-----END PGP SIGNATURE-----

View File

@@ -1,3 +1,28 @@
-------------------------------------------------------------------
Tue Feb 23 14:52:11 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.21.1
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.21.1
- Changes since 5.21.0:
* Fix case in logout applet config key (kde#433320)
* calculatorrunner: Fix mixed hex+decimal calculations (kde#431362)
* Fix font installation
* locations runner: Fix absolute filepath + arguments (kde#433053)
* Enforce SESSION_MANAGER is exported before plasmashell is started
* libtaskmanager: Allow to launch executables (kde#433148)
* Move ksmserver's ksplash notifying to ksmserver (kde#432364)
* Handle closeSession being called concurrently
* [libkworkspace] Interim fix for the logout issue (kde#432460)
* fixup! [keyboard applet] fix TypeError garbage in log
- Drop patches, now upstream:
* 0001-locations-runner-Fix-absolute-filepath-arguments.patch
* 0001-locations-runner-Fix-empty-list-on-invalid-shell-quo.patch
* 0001-libkworkspace-Interim-fix-for-the-logout-issue.patch
- Drop workaround, no longer needed:
* 0001-ksmserver-Enable-debug-output-by-default.patch
-------------------------------------------------------------------
Mon Feb 22 17:53:47 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@@ -30,7 +30,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.21.0
Version: 5.21.1
Release: 0
Summary: The KDE Plasma Workspace Components
License: GPL-2.0-or-later
@@ -43,14 +43,10 @@ Source2: plasma.keyring
%endif
Source3: baselibs.conf
# PATCH-FIX-UPSTREAM
Patch1: 0001-libkworkspace-Interim-fix-for-the-logout-issue.patch
Patch2: 0001-locations-runner-Fix-absolute-filepath-arguments.patch
Patch3: 0001-locations-runner-Fix-empty-list-on-invalid-shell-quo.patch
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch
Patch503: 0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch
Patch504: 0001-ksmserver-Enable-debug-output-by-default.patch
# PATCH-FEATURE-OPENSUSE
Patch506: 0001-Revert-No-icons-on-the-desktop-by-default.patch
BuildRequires: breeze5-icons