pool/milou5
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 432380 from KDE:Frameworks5:LTS

Browse Source 
Do NOT accept! Plasma 5.8 pre-final for 42.2 only!

OBS-URL: https://build.opensuse.org/request/show/432380
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/milou5?expand=0&rev=33
This commit is contained in:
Dominique Leuenberger 2016-10-04 13:53:34 +00:00 committed by Git OBS Bridge
commit d0256a63df
5 changed files with 29 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
milou-5.7.4.tar.xz
View File

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

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

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

25
milou5.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Thu Sep 29 16:36:28 UTC 2016 - fabian@ritter-vogt.de
- Update to 5.8.0
* New LTS feature release
* For more details please see:
https://www.kde.org/announcements/plasma-5.8.0.php
-------------------------------------------------------------------
Thu Sep 15 15:53:55 UTC 2016 - fabian@ritter-vogt.de
- Update to 5.7.95 (Plasma 5.8 Beta)
* New LTS feature release
* For more details please see:
https://www.kde.org/announcements/plasma-5.7.95.php
- Removed patch use-iconName.patch
-------------------------------------------------------------------
Tue Sep 13 17:42:09 UTC 2016 - fabian@ritter-vogt.de
- Update to 5.7.5
* New bugfix release
* For more details please see:
https://www.kde.org/announcements/plasma-5.7.5.php
-------------------------------------------------------------------
Fri Aug 26 20:36:41 UTC 2016 - fabian@ritter-vogt.de

6
milou5.spec
View File

@ -18,15 +18,13 @@
%bcond_without lang
Name: milou5
Version: 5.7.4
Version: 5.8.0
Release: 0
Summary: Dedicated search application built on top of Baloo
License: GPL-2.0+ and LGPL-2.1+
Group: System/GUI/KDE
Url: https://projects.kde.org/milou
Source: milou-%{version}.tar.xz
# PATCH-FIX-UPSTREAM use-iconName.patch boo#994983 -- use iconName for the results if it is set, that's preferred since having each runner set an icon for the results can lead to threading issues
Patch: use-iconName.patch
BuildRequires: extra-cmake-modules >= 1.2.0
BuildRequires: fdupes
BuildRequires: kf5-filesystem
@ -52,7 +50,6 @@ A dedicated search application built on top of Baloo
%lang_package
%prep
%setup -q -n milou-%{version}
%patch -p1
%build
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
@ -63,7 +60,6 @@ A dedicated search application built on top of Baloo
%if %{with lang}
%kf5_find_lang
%endif
%fdupes -s %{buildroot}%{_kf5_localedir}/
%post

46
use-iconName.patch
View File

@ -1,46 +0,0 @@
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Fri, 17 Jun 2016 11:45:46 +0000
Subject: Make use of new QueryMatch::iconName() and use a PlasmaCore.IconItem instead of QIconItem
X-Git-Url: http://quickgit.kde.org/?p=milou.git&a=commitdiff&h=5e0d799f63796741efff3ff3d780df81f03dd66f
---
Make use of new QueryMatch::iconName() and use a PlasmaCore.IconItem instead of QIconItem
---
--- a/lib/qml/ResultDelegate.qml
+++ b/lib/qml/ResultDelegate.qml
@@ -163,13 +163,13 @@
rightMargin: units.smallSpacing
}
- QtExtra.QIconItem {
+ PlasmaCore.IconItem {
id: typePixmap
- width: Globals.IconSize
- height: Globals.IconSize
-
- icon: model.decoration
- smooth: true
+ Layout.preferredWidth: Globals.IconSize
+ Layout.fillHeight: true
+ source: model.decoration
+ usesPlasmaTheme: false
+ animated: false
}
PlasmaComponents.Label {
--- a/lib/sourcesmodel.cpp
+++ b/lib/sourcesmodel.cpp
@@ -103,6 +103,10 @@
return m.text();
case Qt::DecorationRole:
+ if (!m.iconName().isEmpty()) {
+ return m.iconName();
+ }
+
return m.icon();
case TypeRole: