Accepting request 711978 from KDE:Frameworks5
Plasma 5.16.2 OBS-URL: https://build.opensuse.org/request/show/711978 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/milou5?expand=0&rev=83
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
c7c3cbb0a4
@ -1,75 +0,0 @@
|
||||
From fb13d539581ac69d84548097c2d6c6e7669fe57a Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
||||
Date: Wed, 5 Jun 2019 16:49:54 +0200
|
||||
Subject: [PATCH] Don't give up if no results arrive after 500ms
|
||||
|
||||
Summary:
|
||||
Currently it resets the entire context if no results appear after 500ms,
|
||||
which means no new results can appear. This makes no sense.
|
||||
|
||||
RunnerManager does not emit any matchChanged signal while the runners update
|
||||
the matches too quickly. The way this delay is implemented can result in never
|
||||
actually emitting the signal until all runners are done though.
|
||||
Thus it's actually likely to hit this situation.
|
||||
|
||||
BUG: 389611
|
||||
|
||||
Test Plan:
|
||||
Test results appear now, even if the first batch of runners is slow.
|
||||
List of matches still clears if nothing was found.
|
||||
|
||||
Reviewers: #plasma
|
||||
|
||||
Subscribers: plasma-devel
|
||||
|
||||
Tags: #plasma
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D21605
|
||||
---
|
||||
lib/sourcesmodel.cpp | 8 ++++++--
|
||||
lib/sourcesmodel.h | 3 +++
|
||||
2 files changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/sourcesmodel.cpp b/lib/sourcesmodel.cpp
|
||||
index d8b068f..cf4e893 100644
|
||||
--- a/lib/sourcesmodel.cpp
|
||||
+++ b/lib/sourcesmodel.cpp
|
||||
@@ -237,7 +237,12 @@ void SourcesModel::setQueryString(const QString& str)
|
||||
void SourcesModel::slotResetTimeout()
|
||||
{
|
||||
if (!m_modelPopulated) {
|
||||
- clear();
|
||||
+ // The old items are still shown, get rid of them
|
||||
+ beginResetModel();
|
||||
+ m_matches.clear();
|
||||
+ m_size = 0;
|
||||
+ m_duplicates.clear();
|
||||
+ endResetModel();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -313,7 +318,6 @@ void SourcesModel::slotMatchAdded(const Plasma::QueryMatch& m)
|
||||
return;
|
||||
|
||||
QString matchType = m.matchCategory();
|
||||
-
|
||||
if (!m_types.contains(matchType)) {
|
||||
m_types << matchType;
|
||||
}
|
||||
diff --git a/lib/sourcesmodel.h b/lib/sourcesmodel.h
|
||||
index 652f713..5c8e4da 100644
|
||||
--- a/lib/sourcesmodel.h
|
||||
+++ b/lib/sourcesmodel.h
|
||||
@@ -88,6 +88,9 @@ public slots:
|
||||
void reloadConfiguration();
|
||||
void setQueryString(const QString& str);
|
||||
void setQueryLimit(int limit);
|
||||
+ /**
|
||||
+ * Clears the model content and resets the runner context, i.e. no new items will appear.
|
||||
+ */
|
||||
void clear();
|
||||
|
||||
bool run(int index);
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e99556b7253ee3719b980adfe7481c9111741fb79e1b60f7b99679bb2bdbf788
|
||||
size 57372
|
||||
@ -1,11 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl0ItkoACgkQ7JTRj38F
|
||||
mX56uQf/Wc/w/NvrQzzwa/ZkgyYIrIRa5WoY0HoTxbv5NkPqQ49dVE7BR77y2yiI
|
||||
Dw+QyMAMdPp/61hYwjrV0ls99zSUVlihFvJlTkGNPzvgc1GKCAXf8BzGgqUwoMF8
|
||||
In8knNY6VcZV2pNsZtIOScEu3zG75c850xcfHmG9yTtj5EyYe/9OHT7MA9L10sDm
|
||||
sQFzBA0Txzt5tXExpIvCocG0vqIVR7E3La28P9OjMsD+SCyc1YxQkVsMrAHb700y
|
||||
O6MpjCa/OMbpffgLqrVjXhJ4zaYkH5hJx6jnS9Uu1vzZq024Wtt+PjhrKfUsHhV9
|
||||
aY2DbndwD8PTBBeUfZEna5+hG5PP4w==
|
||||
=moxp
|
||||
-----END PGP SIGNATURE-----
|
||||
3
milou-5.16.2.tar.xz
Normal file
3
milou-5.16.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5b284574b43ac76e3c3d84693adb9acf19371d68ee04fae4d95d56ed47f9e8bc
|
||||
size 57476
|
||||
11
milou-5.16.2.tar.xz.sig
Normal file
11
milou-5.16.2.tar.xz.sig
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl0SCdMACgkQ7JTRj38F
|
||||
mX4F7Af9Ej13XUVRd6qRmp5UsPMuV8LxDYXqhIkyiNpeTf7xzBmNJcQiVxsgBrpC
|
||||
SFNH+dFtwKA4BrRwuE5oNK3xar6zNrUk7sngMdaJou0VFwb3wB46arztgKRRdJ3+
|
||||
TL9cx4vY/5zH//1k+oDuJiwLuVqcyFB8OApGLCD9qm00JqEno8IfYNoUXWWfjYyS
|
||||
YuldlGneYE2bqUkGtPdEP58bGZgsnm9ykrr0hiwJFvthkAjkH4mbX8YYB4KY8+90
|
||||
4pobjmqPheGQg5qqUAuYtd2ZLIIdVzYazaj2WBVkw6tEVKqMasLuT+9xRJ1246AW
|
||||
JxlneOBBX7I+0ZgTDPDaqUl0+VRueQ==
|
||||
=AXZG
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 25 12:41:17 UTC 2019 - fabian@ritter-vogt.de
|
||||
|
||||
- Update to 5.16.2
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
* https://www.kde.org/announcements/plasma-5.16.2.php
|
||||
- Changes since 5.16.1:
|
||||
* Don't give up if no results arrive after 500ms (kde#389611)
|
||||
- Remove patches, now upstream:
|
||||
* 0001-Don-t-give-up-if-no-results-arrive-after-500ms.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 18 16:38:15 UTC 2019 - fabian@ritter-vogt.de
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
%bcond_without lang
|
||||
Name: milou5
|
||||
Version: 5.16.1
|
||||
Version: 5.16.2
|
||||
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: https://download.kde.org/stable/plasma/%{version}/milou-%{versio
|
||||
Source1: https://download.kde.org/stable/plasma/%{version}/milou-%{version}.tar.xz.sig
|
||||
Source2: plasma.keyring
|
||||
%endif
|
||||
# PATCH-FIX-UPSTREAM (https://phabricator.kde.org/D21605)
|
||||
Patch1: 0001-Don-t-give-up-if-no-results-arrive-after-500ms.patch
|
||||
BuildRequires: extra-cmake-modules >= 1.2.0
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: kf5-filesystem
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user