From a09c67612af241da667b246401fee435bd970ce46c467952dde3d60654d42eb4 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 26 Feb 2021 19:07:46 +0000 Subject: [PATCH] - 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 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=576 --- ...-Fix-empty-list-on-invalid-shell-quo.patch | 32 +++++++++++++++++++ plasma5-workspace.changes | 6 ++++ plasma5-workspace.spec | 1 + 3 files changed, 39 insertions(+) create mode 100644 0001-locations-runner-Fix-empty-list-on-invalid-shell-quo.patch diff --git a/0001-locations-runner-Fix-empty-list-on-invalid-shell-quo.patch b/0001-locations-runner-Fix-empty-list-on-invalid-shell-quo.patch new file mode 100644 index 0000000..f6c3703 --- /dev/null +++ b/0001-locations-runner-Fix-empty-list-on-invalid-shell-quo.patch @@ -0,0 +1,32 @@ +From 3a672ee43f48655ddcb544cc947680ba0aab7d2a Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau +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 + diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index 8976f7d..6805909 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 26 19:06:56 UTC 2021 - Fabian Vogt + +- 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 diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 425e1e0..142589b 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -43,6 +43,7 @@ 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