From e7f20878d11ece6696d7ae461fef621bbb1f223cf56ce3e33c665c95f791ec56 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 6 Jun 2019 21:10:55 +0000 Subject: [PATCH] Plasma 5.16 tentative final. Please disable KF5 publishing before accepting. OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/milou5?expand=0&rev=208 --- ...-up-if-no-results-arrive-after-500ms.patch | 75 +++++++++++++++++++ milou-5.15.90.tar.xz | 3 - milou-5.15.90.tar.xz.sig | 11 --- milou-5.16.0.tar.xz | 3 + milou-5.16.0.tar.xz.sig | 11 +++ milou5.changes | 15 ++++ milou5.spec | 11 ++- 7 files changed, 111 insertions(+), 18 deletions(-) create mode 100644 0001-Don-t-give-up-if-no-results-arrive-after-500ms.patch delete mode 100644 milou-5.15.90.tar.xz delete mode 100644 milou-5.15.90.tar.xz.sig create mode 100644 milou-5.16.0.tar.xz create mode 100644 milou-5.16.0.tar.xz.sig diff --git a/0001-Don-t-give-up-if-no-results-arrive-after-500ms.patch b/0001-Don-t-give-up-if-no-results-arrive-after-500ms.patch new file mode 100644 index 0000000..d01f873 --- /dev/null +++ b/0001-Don-t-give-up-if-no-results-arrive-after-500ms.patch @@ -0,0 +1,75 @@ +From fb13d539581ac69d84548097c2d6c6e7669fe57a Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +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 + diff --git a/milou-5.15.90.tar.xz b/milou-5.15.90.tar.xz deleted file mode 100644 index f3b0968..0000000 --- a/milou-5.15.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef55e10a44da428384449c08e13f7a6777e0cce918b46c131acd583a77d886eb -size 57332 diff --git a/milou-5.15.90.tar.xz.sig b/milou-5.15.90.tar.xz.sig deleted file mode 100644 index ffe6e50..0000000 --- a/milou-5.15.90.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlzdPUwACgkQ7JTRj38F -mX5btAf/QfuqzRkRVkObbZigzF+qQP9JMr+17hN7WkDYKoE2RSOdjOmDzGG18ivu -YH1hAVZ58gAJj5o6Gtxh21Uxd90hibVttzzxnSa+h75Yy3sQtZfDMy3wdkqyM2FB -PGxs1HrtzmjVn3TpjEUjrnb1/limeQ7udw+JBfqHTTXgqkG1xehqbF/CzW3jND0i -GC30OA2IixUxtm10/q+PhqRVvR/klVw/sMwqT5+/bLVgi65d/DQHmAFSpr9WYPl+ -Jefs5N/5NjmMjK0HkLFoDrEZkLIvJs4yQ97TznROBmn3O07l3ON7HGlqdsxRde0D -dh33uf0zgBgSI9ATgZCmWCHQAVJIcA== -=ZDe8 ------END PGP SIGNATURE----- diff --git a/milou-5.16.0.tar.xz b/milou-5.16.0.tar.xz new file mode 100644 index 0000000..1aa8fec --- /dev/null +++ b/milou-5.16.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:047658479fdddb6b3290ca4b6c4263827d80d70bc9de7c88bdc6b5707ba47e3e +size 57304 diff --git a/milou-5.16.0.tar.xz.sig b/milou-5.16.0.tar.xz.sig new file mode 100644 index 0000000..a401661 --- /dev/null +++ b/milou-5.16.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlz5D2gACgkQ7JTRj38F +mX5vjgf+L3bim40JE5sMpmKcfdlTk+d2jPVzX6mLjMGjkc/AmkatTTkBqcLFnY7T +XjIU4McKj7LhRyo3Jqbhri1xgF69uacFLwprqqtnzScjhPkbx0KDbrKxJoLxbxZL +WOJRYNxaFq8gg/+J6sp94YvuT0RI7bus23JL/OnyaWC7O1sfdOYaTvR0jqrEqjHb +yVlT1FdlIldzY3UjR7oTTnYKCZX3XHWpRST7glaKlv/Q3GzLKyHqfGqQjMdzfZBc +O0vJ7WNJCc0EAzGN4PSO0B4FYi9WvzXR4CDRJkc5/ATiHbsAQMrSl3ZPRdGqyx2l +CTwpKpBSwOOkllhtZPS74N4bPBAqRQ== +=2veO +-----END PGP SIGNATURE----- diff --git a/milou5.changes b/milou5.changes index 573ade2..c17e097 100644 --- a/milou5.changes +++ b/milou5.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Jun 6 15:10:43 UTC 2019 - Fabian Vogt + +- Add patch to fix krunner not showing results in some cases (kde#389611): + * 0001-Don-t-give-up-if-no-results-arrive-after-500ms.patch + +------------------------------------------------------------------- +Thu Jun 6 14:07:09 UTC 2019 - fabian@ritter-vogt.de + +- Update to 5.16.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.16.0.php +- No code changes since 5.15.90 + ------------------------------------------------------------------- Thu May 16 16:56:38 UTC 2019 - fabian@ritter-vogt.de diff --git a/milou5.spec b/milou5.spec index e3f95b2..f27563f 100644 --- a/milou5.spec +++ b/milou5.spec @@ -18,17 +18,19 @@ %bcond_without lang Name: milou5 -Version: 5.15.90 +Version: 5.16.0 Release: 0 Summary: Dedicated search application built on top of Baloo License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/KDE Url: https://projects.kde.org/milou -Source: https://download.kde.org/unstable/plasma/%{version}/milou-%{version}.tar.xz +Source: milou-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/unstable/plasma/%{version}/milou-%{version}.tar.xz.sig +Source1: 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 @@ -49,8 +51,9 @@ Recommends: %{name}-lang A dedicated search application built on top of Baloo %lang_package + %prep -%setup -q -n milou-%{version} +%autosetup -p1 -n milou-%{version} %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}