Wolfgang Bauer 2021-03-03 10:27:39 +00:00 committed by Git OBS Bridge
parent a09c67612a
commit 8b3b726aa7
7 changed files with 32 additions and 49 deletions

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:4a30f9b5cb8f24be75f818a01c3fa8a3b70aff3c4552add6f88fcaa85109022b
size 9711648

View File

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

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

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmA+OkgACgkQ7JTRj38F
mX5IeQf+MmYPe0OppA2G9XN28UGu6eUYXiMJfyYIW6AmTUItolkZVU+XeOml8Zlv
Q3+ekp/UXBSJNiCNiYdjL/M6jUecyQtZnFrysBeUq/VrVoPLIpcgh4xM9MXIbBYD
iOT9qIEMI8Kbon9dElnX9bCsEokSuOzx7e3U8YIsaJQvZu2nv02WMeNdFB8vZd7v
89IzA5IZcToXxz6L+8H+WG39bo4nFJjvNBfJaXsmcEt5wC5u2b4WakjtM7fA1QNs
sBRDsn6L+Lcwrgjse2vDmReiI74komyP91ww7BTX25TiYXLW8oActf5z6PHpjcIm
m89Ba6YSL/v5H5obe3MXOjHtT+KD/A==
=mNHR
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Tue Mar 2 15:14:05 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.21.2
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.21.2
- Changes since 5.21.1:
* KRunner: Handle escape key in history view more gracefully (kde#433723)
* [Notifications] Don't change tooltip when paused
* locations runner: Fix empty list on invalid shell quotes
* [applets/devicenotifier] Add placeholder icon when no device icon exists (kde#433534)
* [kcms/icons] Collapse buttons if the row is too wide for the display
* Do not start faulty coronas
- Drop patches, now actually upstream:
* 0001-locations-runner-Fix-empty-list-on-invalid-shell-quo.patch
-------------------------------------------------------------------
Fri Feb 26 19:06:56 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.1
Version: 5.21.2
Release: 0
Summary: The KDE Plasma Workspace Components
License: GPL-2.0-or-later
@ -42,8 +42,6 @@ Source1: plasma-workspace-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
Source3: baselibs.conf
# PATCH-FIX-UPSTREAM
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