pool/plasma5-workspace
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Add back patch for fix which didn't make it into 5.21.1:

Browse Source 
* 0001-locations-runner-Fix-empty-list-on-invalid-shell-quo.patch

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=576
This commit is contained in:
Fabian Vogt 2021-02-26 19:07:46 +00:00 committed by Git OBS Bridge
parent 341c46a798
commit a09c67612a
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0001-locations-runner-Fix-empty-list-on-invalid-shell-quo.patch Normal file
View File

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

6
plasma5-workspace.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Feb 26 19:06:56 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Add back patch for fix which didn't make it into 5.21.1:
* 0001-locations-runner-Fix-empty-list-on-invalid-shell-quo.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 23 14:52:11 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de> Tue Feb 23 14:52:11 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>

1
plasma5-workspace.spec
View File

@ -43,6 +43,7 @@ Source2: plasma.keyring
%endif %endif
Source3: baselibs.conf Source3: baselibs.conf
# PATCH-FIX-UPSTREAM # PATCH-FIX-UPSTREAM
Patch3: 0001-locations-runner-Fix-empty-list-on-invalid-shell-quo.patch
# PATCHES 501-??? are PATCH-FIX-OPENSUSE # PATCHES 501-??? are PATCH-FIX-OPENSUSE
Patch501: 0001-Use-qdbus-qt5.patch Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch Patch502: 0001-Ignore-default-sddm-face-icons.patch