commit milou5 for openSUSE:Factory
Hello community,
here is the log from the commit of package milou5 for openSUSE:Factory checked in at 2016-10-04 15:53:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-29 15:29:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.milou5.new/milou5.changes 2016-10-04 15:53:12.000000000 +0200
@@ -1,0 +2,25 @@
+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
+
+-------------------------------------------------------------------
Old:
----
milou-5.7.4.tar.xz
use-iconName.patch
New:
----
milou-5.8.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ milou5.spec ++++++
--- /var/tmp/diff_new_pack.dmpn7R/_old 2016-10-04 15:53:13.000000000 +0200
+++ /var/tmp/diff_new_pack.dmpn7R/_new 2016-10-04 15:53:13.000000000 +0200
@@ -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 @@
%lang_package
%prep
%setup -q -n milou-%{version}
-%patch -p1
%build
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
@@ -63,7 +60,6 @@
%if %{with lang}
%kf5_find_lang
%endif
-
%fdupes -s %{buildroot}%{_kf5_localedir}/
%post
++++++ milou-5.7.4.tar.xz -> milou-5.8.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.7.4/CMakeLists.txt new/milou-5.8.0/CMakeLists.txt
--- old/milou-5.7.4/CMakeLists.txt 2016-08-23 14:52:06.000000000 +0200
+++ new/milou-5.8.0/CMakeLists.txt 2016-09-29 13:30:18.000000000 +0200
@@ -1,13 +1,16 @@
project(Milou)
-set(PROJECT_VERSION "5.7.4")
+set(PROJECT_VERSION "5.8.0")
set(PROJECT_VERSION_MAJOR 5)
cmake_minimum_required(VERSION 2.8.12)
+set(QT_MIN_VERSION "5.6.0")
+set(KF5_MIN_VERSION "5.24.0")
+
find_package(ECM 1.2.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
-find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Script Qml Quick Widgets Test)
-find_package(KF5 REQUIRED COMPONENTS CoreAddons I18n Declarative Service Plasma Runner)
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Script Qml Quick Widgets Test)
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Declarative Service Plasma Runner)
include(FeatureSummary)
include(ECMAddTests)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.7.4/lib/qml/ResultDelegate.qml new/milou-5.8.0/lib/qml/ResultDelegate.qml
--- old/milou-5.7.4/lib/qml/ResultDelegate.qml 2016-08-23 14:50:12.000000000 +0200
+++ new/milou-5.8.0/lib/qml/ResultDelegate.qml 2016-09-29 13:29:47.000000000 +0200
@@ -149,6 +149,7 @@
&& (index === 0 || resultDelegate.ListView.view.currentIndex !== (index - 1))
Item {
+ id: labelWrapper
anchors {
left: parent.left
right: parent.right
@@ -163,13 +164,14 @@
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.preferredHeight: Globals.IconSize
+ Layout.fillHeight: true
+ source: model.decoration
+ usesPlasmaTheme: false
+ animated: false
}
PlasmaComponents.Label {
@@ -182,12 +184,12 @@
wrapMode: Text.NoWrap
verticalAlignment: Text.AlignVCenter
- Layout.maximumWidth: parent.width - displayLabel.x
+ Layout.maximumWidth: labelWrapper.width - typePixmap.width - actionsRow.width
}
PlasmaComponents.Label {
id: subtextLabel
- text: model.isDuplicate > 1 ? String(model.subtext) : ""
+ text: model.isDuplicate > 1 || resultDelegate.isCurrent ? String(model.subtext || "") : ""
color: theme.textColor
opacity: 0.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.7.4/lib/sourcesmodel.cpp new/milou-5.8.0/lib/sourcesmodel.cpp
--- old/milou-5.7.4/lib/sourcesmodel.cpp 2016-08-23 14:50:12.000000000 +0200
+++ new/milou-5.8.0/lib/sourcesmodel.cpp 2016-09-29 13:29:47.000000000 +0200
@@ -103,6 +103,10 @@
return m.text();
case Qt::DecorationRole:
+ if (!m.iconName().isEmpty()) {
+ return m.iconName();
+ }
+
return m.icon();
case TypeRole:
@@ -248,28 +252,27 @@
QListPlasma::QueryMatch list(l);
qSort(list);
- QListIteratorPlasma::QueryMatch iter(list);
- iter.toBack();
-
- while (iter.hasPrevious()) {
- const Plasma::QueryMatch match = iter.previous();
- slotMatchAdded(match);
+ for (auto it = list.crbegin(), end = list.crend(); it != end; ++it) {
+ slotMatchAdded(*it);
}
// Sort the result types. We give the results which contain the query
// text in the user visible string a higher preference than the ones
// that do not
// The rest are given the same preference as given by the runners.
+ const QString simplifiedQuery = m_queryString.simplified();
+ const auto words = simplifiedQuery.splitRef(QLatin1Char(' '), QString::SkipEmptyParts);
+
QSet<QString> higherTypes;
- for (QString type: m_types) {
+ foreach (const QString &type, m_types) {
const TypeData td = m_matches.value(type);
- for (const Plasma::QueryMatch& match : td.shown) {
+
+ for (const Plasma::QueryMatch &match : td.shown) {
const QString text = match.text().simplified();
- const QStringList words = m_queryString.split(' ', QString::SkipEmptyParts);
bool containsAll = true;
- for (const QString& word : words) {
- if (!text.contains(word.simplified(), Qt::CaseInsensitive)) {
+ for (const auto &word : words) {
+ if (!text.contains(word, Qt::CaseInsensitive)) {
containsAll = false;
break;
}
@@ -333,51 +336,15 @@
// Remove the last shown row from maxShownType
// and add it to matchType
- int removeRowPos = fetchRowCount(maxShownType);
- removeRowPos += m_matches[maxShownType].shown.size() - 1;
-
- //beginRemoveRows(QModelIndex(), removeRowPos, removeRowPos);
Plasma::QueryMatch transferMatch = m_matches[maxShownType].shown.takeLast();
m_matches[maxShownType].hidden.append(transferMatch);
m_size--;
m_duplicates[transferMatch.text()]--;
- //endRemoveRows();
-
- int insertPos = fetchRowCount(matchType) + m_matches[matchType].shown.size();
- //beginInsertRows(QModelIndex(), insertPos, insertPos);
- m_matches[matchType].shown.append(m);
- m_size++;
- m_duplicates[m.text()]++;
- //endInsertRows();
- }
- else {
- int pos = 0;
- foreach (const QString& type, m_types) {
- pos += m_matches.value(type).shown.size();
- if (type == matchType) {
- break;
- }
- }
-
- //beginInsertRows(QModelIndex(), pos, pos);
- m_matches[matchType].shown.append(m);
- m_size++;
- m_duplicates[m.text()]++;
- //endInsertRows();
- }
-}
-
-int SourcesModel::fetchRowCount(const QString& type) const
-{
- int c = 0;
- foreach (const QString& t, m_types) {
- if (t == type)
- break;
-
- c += m_matches.value(t).shown.size();
}
- return c;
+ m_matches[matchType].shown.append(m);
+ m_size++;
+ m_duplicates[m.text()]++;
}
void SourcesModel::clear()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.7.4/lib/sourcesmodel.h new/milou-5.8.0/lib/sourcesmodel.h
--- old/milou-5.7.4/lib/sourcesmodel.h 2016-08-23 14:50:12.000000000 +0200
+++ new/milou-5.8.0/lib/sourcesmodel.h 2016-09-29 13:29:47.000000000 +0200
@@ -128,8 +128,6 @@
bool m_modelPopulated;
QTimer m_resetTimer;
- /// Returns the number of visible rows before \p type
- int fetchRowCount(const QString& type) const;
Plasma::QueryMatch fetchMatch(int row) const;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/milou-5.7.4/po/he/milou.po new/milou-5.8.0/po/he/milou.po
--- old/milou-5.7.4/po/he/milou.po 1970-01-01 01:00:00.000000000 +0100
+++ new/milou-5.8.0/po/he/milou.po 2016-09-29 13:30:00.000000000 +0200
@@ -0,0 +1,64 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Elkana Bardugo
participants (1)
-
root@hilbert.suse.de