Hello community, here is the log from the commit of package milou5 for openSUSE:Factory checked in at 2016-08-29 15:28:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/milou5 (Old) and /work/SRC/openSUSE:Factory/.milou5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "milou5" Changes: -------- --- /work/SRC/openSUSE:Factory/milou5/milou5.changes 2016-08-12 15:40:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.milou5.new/milou5.changes 2016-08-29 15:29:04.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Aug 26 20:36:41 UTC 2016 - [email protected] + +- Update to 5.7.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.4.php + +------------------------------------------------------------------- +Thu Aug 25 20:15:03 UTC 2016 - [email protected] + +- Add use-iconName.patch to use iconName instead of icon if set, + that's preferred since KDE Frameworks 5.24 because having each + runner set (and lookup) an icon for the results can lead to + threading issues (boo#994983) + +------------------------------------------------------------------- +Fri Aug 12 23:36:20 UTC 2016 - [email protected] + +- Adjust filelist for the plasmoid appdata, installed with KF > 5.25.0 + +------------------------------------------------------------------- Old: ---- milou-5.7.3.tar.xz New: ---- milou-5.7.4.tar.xz use-iconName.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ milou5.spec ++++++ --- /var/tmp/diff_new_pack.qxRjK9/_old 2016-08-29 15:29:10.000000000 +0200 +++ /var/tmp/diff_new_pack.qxRjK9/_new 2016-08-29 15:29:10.000000000 +0200 @@ -18,22 +18,24 @@ %bcond_without lang Name: milou5 -Version: 5.7.3 +Version: 5.7.4 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 -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5Declarative) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5Plasma) -BuildRequires: cmake(KF5Runner) -BuildRequires: cmake(KF5Service) +BuildRequires: cmake(KF5CoreAddons) >= 5.25.0 +BuildRequires: cmake(KF5Declarative) >= 5.25.0 +BuildRequires: cmake(KF5I18n) >= 5.25.0 +BuildRequires: cmake(KF5Plasma) >= 5.25.0 +BuildRequires: cmake(KF5Runner) >= 5.25.0 +BuildRequires: cmake(KF5Service) >= 5.25.0 BuildRequires: cmake(Qt5Qml) >= 5.4.0 BuildRequires: cmake(Qt5Quick) >= 5.4.0 BuildRequires: cmake(Qt5Script) >= 5.4.0 @@ -50,6 +52,7 @@ %lang_package %prep %setup -q -n milou-%{version} +%patch -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} @@ -78,6 +81,7 @@ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ %{_kf5_plugindir}/ +%{_kf5_appstreamdir}/ %if %{with lang} %files lang -f %{name}.lang ++++++ milou-5.7.3.tar.xz -> milou-5.7.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.7.3/CMakeLists.txt new/milou-5.7.4/CMakeLists.txt --- old/milou-5.7.3/CMakeLists.txt 2016-08-02 11:42:42.000000000 +0200 +++ new/milou-5.7.4/CMakeLists.txt 2016-08-23 14:52:06.000000000 +0200 @@ -1,5 +1,5 @@ project(Milou) -set(PROJECT_VERSION "5.7.3") +set(PROJECT_VERSION "5.7.4") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12) ++++++ use-iconName.patch ++++++ From: Kai Uwe Broulik <[email protected]> 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:
