Accepting request 875029 from KDE:Frameworks5

KDE Plasma 5.21.1

OBS-URL: https://build.opensuse.org/request/show/875029
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/milou5?expand=0&rev=114
This commit is contained in:
Richard Brown 2021-03-02 11:29:18 +00:00 committed by Git OBS Bridge
commit fedbf2630a
7 changed files with 27 additions and 44 deletions

View File

@ -1,27 +0,0 @@
From df4a62c3d79129be7ae716455f9afb07eeace3c8 Mon Sep 17 00:00:00 2001
From: Alexander Lohnau <alexander.lohnau@gmx.de>
Date: Mon, 22 Feb 2021 14:36:46 +0100
Subject: [PATCH] Fix launching empty query
If the query is prefixed with a space the launched entry should not be
added to the history, in case there is nothing after the query the trimmed string would be empty.
---
lib/runnerresultsmodel.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/runnerresultsmodel.cpp b/lib/runnerresultsmodel.cpp
index df7ebc9..eb4b9ee 100644
--- a/lib/runnerresultsmodel.cpp
+++ b/lib/runnerresultsmodel.cpp
@@ -191,7 +191,7 @@ void RunnerResultsModel::setQueryString(const QString &queryString)
m_hasMatches = false;
if (queryString.isEmpty()) {
clear();
- } else {
+ } else if (!queryString.trimmed().isEmpty()) {
m_resetTimer.start();
m_manager->launchQuery(queryString, m_runner);
setQuerying(true);
--
2.25.1

View File

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

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmAlHvgACgkQ7JTRj38F
mX7LQwgAtsMUvx8z9TGdLD9z2a6otq+PK2xk36JnDhQtvLSUeoX2/O0b6VJ0w0U7
QXftkr/yrz0hDNjJqIY8yNJ/KqL5PHmRSoY+yDBCuOJ8WHHUkKe8vy7cvF5PG9dZ
/U4c25gJs+vNMtXLlN6h28tTEtKiIZItcFaqTDIdqi76IRAO8FiTLWqdyVZiLXoL
EhUNISuoACemDf0vULCr7AxE/mijSCH1RTvFv29wDmWf4CWcWWbNpJNcKvkfgR+6
j4v+tx3rHawbYn1bDJXyrIvGSSm2JYnmYNlxpr9Qkr1MZ3saXVV5RZws5eiRqi0/
lVQGnMzycSROB1KuzLO46sKnmhK+/g==
=z5xT
-----END PGP SIGNATURE-----

3
milou-5.21.1.tar.xz Normal file
View File

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

11
milou-5.21.1.tar.xz.sig Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmA0/HcACgkQ7JTRj38F
mX4pJggAg0ndoRSsFyLTUMAjXzI7h5m6i0toI2Y++h/vGg3GfIoYnC50i+ZzQdCk
NGME+a1DI4B7DJ3HFYGI5CGkg8g0fZIE3KV0Bfn6qV9z5Jp0ligqSFbn9kcS60ao
q81mjTnWI4th4o5axCsIambjk2uLrfhJ3X213e2Ey73OPT2cxiqsw/gAi+X+VoPb
mbI72NyL9ZXKEyXXiOtkd2uCYcz9ub/zy3HRpdKbQlfQYuPetYXLAft9HKH2HvEL
FQj3cFL/9P+C+N3hDPZI8Ha6oBLzFrfcjtJm7ya4bBuRcVo+rxNgkpHSK38QJVuQ
TShknagTcShSm43VatyCw0tbzIVEzA==
=0Kjc
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Feb 23 14:52:09 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 launching empty query
- Drop patches, now upstream:
* 0001-Fix-launching-empty-query.patch
-------------------------------------------------------------------
Mon Feb 22 13:42:25 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -18,7 +18,7 @@
%bcond_without lang
Name: milou5
Version: 5.21.0
Version: 5.21.1
Release: 0
Summary: Dedicated search application built on top of Baloo
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@ -29,8 +29,6 @@ Source: milou-%{version}.tar.xz
Source1: milou-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch1: 0001-Fix-launching-empty-query.patch
BuildRequires: extra-cmake-modules >= 1.2.0
BuildRequires: fdupes
BuildRequires: kf5-filesystem