5.1.95

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/milou5?expand=0&rev=24

0001-ResultsView-Handle-both-Enter-and-Return.patch

@@ -1,30 +0,0 @@
-From 5112aff7efb7c2bc74fbe1eb41bc286c37fd706c Mon Sep 17 00:00:00 2001
-From: Vishesh Handa <me@vhanda.in>
-Date: Mon, 20 Oct 2014 13:09:43 +0200
-Subject: [PATCH 1/3] ResultsView: Handle both Enter and Return
-
-BUG: 339628
----
- lib/qml/ResultsView.qml | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/lib/qml/ResultsView.qml b/lib/qml/ResultsView.qml
-index d962703..bbb452a 100644
---- a/lib/qml/ResultsView.qml
-+++ b/lib/qml/ResultsView.qml
-@@ -77,6 +77,12 @@ ListView {
-         }
-         runCurrentIndex();
-     }
-+    Keys.onEnterPressed: {
-+        if (!currentIndex) {
-+            runAutomatically = true
-+        }
-+        runCurrentIndex();
-+    }
- 
-     function runCurrentIndex() {
-         listView.model.run(currentIndex);
--- 
-2.1.2
-

0002-Revert-SourcesModel-Only-consider-each-types-first-r.patch

@@ -1,35 +0,0 @@
-From 366dc912823a0b138c92c9690df3272256b76d01 Mon Sep 17 00:00:00 2001
-From: Vishesh Handa <me@vhanda.in>
-Date: Mon, 20 Oct 2014 14:32:47 +0200
-Subject: [PATCH 2/3] Revert "SourcesModel: Only consider each types first
- result for priority"
-
-This reverts commit 3e4bb6b1a7cd3df47b460cd0a7222605eeddd104.
-
-Only considering the top most item is not ideal as the top most item
-changes a lot based on which result you pick because krunner tries to
-remember it.
-
-Fortunately, the bug is not re-introduced as we did add the extra
-sorting based on if the visible text contains the query.
----
- lib/sourcesmodel.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/lib/sourcesmodel.cpp b/lib/sourcesmodel.cpp
-index cae6f06..06a3715 100644
---- a/lib/sourcesmodel.cpp
-+++ b/lib/sourcesmodel.cpp
-@@ -221,8 +221,7 @@ void SourcesModel::slotMatchesChanged(const QList<Plasma::QueryMatch>& l)
-     QSet<QString> higherTypes;
-     for (QString type: m_types) {
-         const TypeData td = m_matches.value(type);
--        if (!td.shown.isEmpty()) {
--            const auto& match = td.shown.first();
-+        for (const Plasma::QueryMatch& match : td.shown) {
-             if (match.text().contains(m_queryString, Qt::CaseInsensitive)) {
-                 QString matchType = match.matchCategory();
-                 higherTypes << matchType;
--- 
-2.1.2
-

milou-5.1.2.tar.xz

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

milou-5.1.95.tar.xz

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

milou5.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package milou5
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           milou5
-Version:        5.1.2
+Version:        5.1.95
 Release:        0
 Summary:        Dedicated search application built on top of Baloo
 License:        GPL-2.0+ and LGPL-2.1+
@@ -25,10 +25,6 @@ Group:          System/GUI/KDE
 Url:            https://projects.kde.org/milou
 Source:         milou-%{version}.tar.xz
 Source99:       %{name}-rpmlintrc
-# PATCH-FIX-UPSTREAM 0001-ResultsView-Handle-both-Enter-and-Return.patch
-Patch0:         0001-ResultsView-Handle-both-Enter-and-Return.patch
-# PATCH-FIX-UPSTREAM 0002-Revert-SourcesModel-Only-consider-each-types-first-r.patch
-Patch1:         0002-Revert-SourcesModel-Only-consider-each-types-first-r.patch
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
 BuildRequires:  kdeclarative-devel
@@ -50,8 +46,6 @@ A dedicated search application built on top of Baloo
 %lang_package
 %prep
 %setup -q -n milou-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
   %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5