Hello community, here is the log from the commit of package akonadi-search for openSUSE:Factory checked in at 2019-12-13 12:01:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-search (Old) and /work/SRC/openSUSE:Factory/.akonadi-search.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-search" Fri Dec 13 12:01:43 2019 rev:54 rq:756142 version:19.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-search/akonadi-search.changes 2019-11-12 11:33:44.033981039 +0100 +++ /work/SRC/openSUSE:Factory/.akonadi-search.new.4691/akonadi-search.changes 2019-12-13 12:01:51.973459036 +0100 @@ -1,0 +2,25 @@ +Tue Dec 10 06:38:03 UTC 2019 - Luca Beltrame <[email protected]> + +- Update to 19.12.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/releases/19.12.0 +- No code change since 19.11.90 + +------------------------------------------------------------------- +Sat Nov 30 09:11:25 UTC 2019 - Luca Beltrame <[email protected]> + +- Update to 19.11.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/19.12-rc +- No code change since 19.11.80 + +------------------------------------------------------------------- +Sun Nov 24 15:53:14 UTC 2019 - Luca Beltrame <[email protected]> + +- Update to 19.11.80 + * New feature release +- Too many changes to list here. + +------------------------------------------------------------------- Old: ---- akonadi-search-19.08.3.tar.xz akonadi-search-19.08.3.tar.xz.sig New: ---- akonadi-search-19.12.0.tar.xz akonadi-search-19.12.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-search.spec ++++++ --- /var/tmp/diff_new_pack.il0C3B/_old 2019-12-13 12:01:52.949458667 +0100 +++ /var/tmp/diff_new_pack.il0C3B/_new 2019-12-13 12:01:52.953458666 +0100 @@ -1,7 +1,7 @@ # # spec file for package akonadi-search # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,40 +16,39 @@ # -%define kf5_version 5.56.0 +%define kf5_version 5.60.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadi-search -Version: 19.08.3 +Version: 19.12.0 Release: 0 Summary: Framework for searching and managing PIM metadata License: GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-only Group: System/GUI/KDE URL: https://www.kde.org -Source: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif -BuildRequires: akonadi-mime-devel >= %{_kapp_version} -BuildRequires: akonadi-server-devel >= %{_kapp_version} BuildRequires: extra-cmake-modules >= %{kf5_version} -BuildRequires: kcalcore-devel -BuildRequires: kcmutils-devel >= %{kf5_version} -BuildRequires: kconfig-devel >= %{kf5_version} -BuildRequires: kcontacts-devel -BuildRequires: kcrash-devel >= %{kf5_version} -BuildRequires: kdbusaddons-devel >= %{kf5_version} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{kf5_version} -BuildRequires: kio-devel >= %{kf5_version} -BuildRequires: kmime-devel -BuildRequires: krunner-devel >= %{kf5_version} BuildRequires: libxapian-devel -BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Test) +BuildRequires: cmake(KF5Akonadi) +BuildRequires: cmake(KF5AkonadiMime) +BuildRequires: cmake(KF5CalendarCore) +BuildRequires: cmake(KF5Config) >= %{kf5_version} +BuildRequires: cmake(KF5Contacts) +BuildRequires: cmake(KF5Crash) >= %{kf5_version} +BuildRequires: cmake(KF5DBusAddons) >= %{kf5_version} +BuildRequires: cmake(KF5I18n) >= %{kf5_version} +BuildRequires: cmake(KF5KCMUtils) >= %{kf5_version} +BuildRequires: cmake(KF5KIO) >= %{kf5_version} +BuildRequires: cmake(KF5Mime) +BuildRequires: cmake(KF5Runner) >= %{kf5_version} +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Test) Obsoletes: baloo-pim < %{version} %if %{with lang} Recommends: %{name}-lang @@ -69,14 +68,14 @@ %package devel Summary: Development package for baloo5 Group: Development/Libraries/KDE -Requires: akonadi-mime-devel -Requires: akonadi-server-devel >= %{_kapp_version} -Requires: kcalcore-devel -Requires: kcontacts-devel -Requires: kcoreaddons-devel -Requires: kmime-devel Requires: libKF5AkonadiSearch = %{version} -Requires: pkgconfig(Qt5Core) +Requires: cmake(KF5Akonadi) +Requires: cmake(KF5AkonadiMime) +Requires: cmake(KF5CalendarCore) +Requires: cmake(KF5Contacts) +Requires: cmake(KF5CoreAddons) +Requires: cmake(KF5Mime) +Requires: cmake(Qt5Core) %description devel Baloo is a framework for searching and managing metadata. This ++++++ akonadi-search-19.08.3.tar.xz -> akonadi-search-19.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/CMakeLists.txt new/akonadi-search-19.12.0/CMakeLists.txt --- old/akonadi-search-19.08.3/CMakeLists.txt 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/CMakeLists.txt 2019-12-06 02:48:13.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.12.3") +set(PIM_VERSION "5.13.0") project(AkonadiSearch VERSION ${PIM_VERSION}) # ECM setup -set(KF5_MIN_VERSION "5.60.0") +set(KF5_MIN_VERSION "5.63.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -31,11 +31,9 @@ set(AKONADISEARCH_VERSION ${PIM_VERSION}) -set(AKONADI_VERSION "5.12.3") -set(AKONADI_MIMELIB_VERSION "5.12.3") -set(KCONTACTS_LIB_VERSION "5.12.3") -set(KCALENDARCORE_LIB_VERSION "5.12.3") -set(KMIME_LIB_VERSION "5.12.3") +set(AKONADI_VERSION "5.13.0") +set(AKONADI_MIMELIB_VERSION "5.13.0") +set(KMIME_LIB_VERSION "5.13.0") set(QT_REQUIRED_VERSION "5.11.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Test) @@ -53,10 +51,10 @@ ) find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) -find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED) +find_package(KF5Contacts ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED) -find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED) +find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG REQUIRED) ecm_setup_version(PROJECT VARIABLE_PREFIX AKONADISEARCH @@ -68,7 +66,11 @@ # Compiler flags add_definitions(-DTRANSLATION_DOMAIN=\"akonadi_search\") -#add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) +if (EXISTS "${CMAKE_SOURCE_DIR}/.git") + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) +endif() + add_definitions(-DQT_NO_FOREACH) # Turn exceptions on kde_enable_exceptions() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/KF5AkonadiSearchConfig.cmake.in new/akonadi-search-19.12.0/KF5AkonadiSearchConfig.cmake.in --- old/akonadi-search-19.08.3/KF5AkonadiSearchConfig.cmake.in 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/KF5AkonadiSearchConfig.cmake.in 2019-12-01 10:15:52.000000000 +0100 @@ -1,11 +1,11 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Core) -find_dependency(KF5CoreAddons) -find_dependency(KF5Akonadi) -find_dependency(KF5Contacts) -find_dependency(KF5Mime) -find_dependency(KF5AkonadiMime) -find_dependency(KF5CalendarCore) +find_dependency(Qt5Core "@QT_REQUIRED_VERSION@") +find_dependency(KF5CoreAddons "@KF5_MIN_VERSION@") +find_dependency(KF5Akonadi "@AKONADI_VERSION@") +find_dependency(KF5Contacts "@KF5_MIN_VERSION@") +find_dependency(KF5Mime "@KMIME_LIB_VERSION@") +find_dependency(KF5AkonadiMime "@AKONADI_MIMELIB_VERSION@") +find_dependency(KF5CalendarCore "@KF5_MIN_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiSearchTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/README.md new/akonadi-search-19.12.0/README.md --- old/akonadi-search-19.08.3/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/akonadi-search-19.12.0/README.md 2019-12-01 10:15:52.000000000 +0100 @@ -0,0 +1,3 @@ +# Akonadi Search + +Xapian-based indexing and query infrastructure for Akonadi. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/agent/collectionindexingjob.h new/akonadi-search-19.12.0/agent/collectionindexingjob.h --- old/akonadi-search-19.08.3/agent/collectionindexingjob.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/agent/collectionindexingjob.h 2019-12-01 10:15:52.000000000 +0100 @@ -24,7 +24,7 @@ #include <KJob> #include <AkonadiCore/Item> #include <AkonadiCore/Collection> -#include <QTime> +#include <QElapsedTimer> #include "index.h" /** @@ -64,7 +64,7 @@ QSet<Akonadi::Item::Id> m_indexedItems; QList<Akonadi::Item::Id> m_needsIndexing; Index &m_index; - QTime m_time; + QElapsedTimer m_time; bool m_reindexingLock; bool m_fullSync; int m_progressCounter; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/agent/emailindexer.cpp new/akonadi-search-19.12.0/agent/emailindexer.cpp --- old/akonadi-search-19.08.3/agent/emailindexer.cpp 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/agent/emailindexer.cpp 2019-12-01 10:15:52.000000000 +0100 @@ -211,7 +211,7 @@ KMime::Headers::Date *date = msg->date(false); if (date) { - const QString str = QString::number(date->dateTime().toTime_t()); + const QString str = QString::number(date->dateTime().toSecsSinceEpoch()); m_doc->add_value(0, str.toStdString()); const QString julianDay = QString::number(date->dateTime().date().toJulianDay()); m_doc->add_value(2, julianDay.toStdString()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/agent/tests/emailtest.cpp new/akonadi-search-19.12.0/agent/tests/emailtest.cpp --- old/akonadi-search-19.08.3/agent/tests/emailtest.cpp 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/agent/tests/emailtest.cpp 2019-12-01 10:15:52.000000000 +0100 @@ -26,6 +26,7 @@ #include <QTimer> #include <QFile> #include <QDebug> +#include <QElapsedTimer> #include <CollectionFetchJob> #include <Collection> @@ -52,7 +53,7 @@ Akonadi::Collection::List m_collections; EmailIndexer m_indexer; - QTime m_totalTime; + QElapsedTimer m_totalTime; int m_indexTime; int m_numEmails; @@ -97,7 +98,7 @@ while (it.hasNext()) { const Akonadi::Collection &c = it.next(); const QStringList mimeTypes = c.contentMimeTypes(); - if (!c.contentMimeTypes().contains(QStringLiteral("message/rfc822"))) { + if (!c.contentMimeTypes().contains(QLatin1String("message/rfc822"))) { it.remove(); } } @@ -124,7 +125,7 @@ void App::itemReceived(const Akonadi::Item::List &itemList) { - QTime timer; + QElapsedTimer timer; timer.start(); for (const Akonadi::Item &item : itemList) { @@ -137,7 +138,7 @@ void App::slotCommitTimerElapsed() { - QTime timer; + QElapsedTimer timer; timer.start(); m_indexer.commit(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/akonadiplugin/autotests/CMakeLists.txt new/akonadi-search-19.12.0/akonadiplugin/autotests/CMakeLists.txt --- old/akonadi-search-19.08.3/akonadiplugin/autotests/CMakeLists.txt 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/akonadiplugin/autotests/CMakeLists.txt 2019-12-01 10:15:52.000000000 +0100 @@ -1,6 +1,5 @@ include(ECMMarkAsTest) -set(QT_REQUIRED_VERSION "5.9.0") find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/akonadiplugin/searchplugin.cpp new/akonadi-search-19.12.0/akonadiplugin/searchplugin.cpp --- old/akonadi-search-19.08.3/akonadiplugin/searchplugin.cpp 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/akonadiplugin/searchplugin.cpp 2019-12-01 10:15:52.000000000 +0100 @@ -104,7 +104,7 @@ case Akonadi::EmailSearchTerm::ByteSize: return getTerm(term, QStringLiteral("size")); case Akonadi::EmailSearchTerm::HeaderDate: { - Term s(QStringLiteral("date"), QString::number(term.value().toDateTime().toTime_t()), mapComparator(term.condition())); + Term s(QStringLiteral("date"), QString::number(term.value().toDateTime().toSecsSinceEpoch()), mapComparator(term.condition())); s.setNegation(term.isNegated()); return s; } @@ -315,20 +315,20 @@ Query query; Term t; - if (mimeTypes.contains(QStringLiteral("message/rfc822"))) { + if (mimeTypes.contains(QLatin1String("message/rfc822"))) { // qCDebug(AKONADIPLUGIN_INDEXER_LOG) << "mail query"; query.setType(QStringLiteral("Email")); t = recursiveEmailTermMapping(term); } else if (mimeTypes.contains(KContacts::Addressee::mimeType()) || mimeTypes.contains(KContacts::ContactGroup::mimeType())) { query.setType(QStringLiteral("Contact")); t = recursiveContactTermMapping(term); - } else if (mimeTypes.contains(QStringLiteral("text/x-vnd.akonadi.note"))) { + } else if (mimeTypes.contains(QLatin1String("text/x-vnd.akonadi.note"))) { query.setType(QStringLiteral("Note")); t = recursiveNoteTermMapping(term); - } else if (mimeTypes.contains(QStringLiteral("application/x-vnd.akonadi.calendar.event")) || - mimeTypes.contains(QStringLiteral("application/x-vnd.akonadi.calendar.todo")) || - mimeTypes.contains(QStringLiteral("application/x-vnd.akonadi.calendar.journal")) || - mimeTypes.contains(QStringLiteral("application/x-vnd.akonadi.calendar.freebusy"))) { + } else if (mimeTypes.contains(QLatin1String("application/x-vnd.akonadi.calendar.event")) || + mimeTypes.contains(QLatin1String("application/x-vnd.akonadi.calendar.todo")) || + mimeTypes.contains(QLatin1String("application/x-vnd.akonadi.calendar.journal")) || + mimeTypes.contains(QLatin1String("application/x-vnd.akonadi.calendar.freebusy"))) { query.setType(QStringLiteral("Calendar")); t = recursiveCalendarTermMapping(term); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/core/query.cpp new/akonadi-search-19.12.0/core/query.cpp --- old/akonadi-search-19.08.3/core/query.cpp 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/core/query.cpp 2019-12-01 10:15:52.000000000 +0100 @@ -311,7 +311,7 @@ Query query; query.d->m_types = map[QStringLiteral("type")].toStringList(); - if (map.contains(QStringLiteral("limit"))) { + if (map.contains(QLatin1String("limit"))) { query.d->m_limit = map[QStringLiteral("limit")].toUInt(); } else { query.d->m_limit = defaultLimit; @@ -321,26 +321,26 @@ query.d->m_searchString = map[QStringLiteral("searchString")].toString(); query.d->m_term = Term::fromVariantMap(map[QStringLiteral("term")].toMap()); - if (map.contains(QStringLiteral("yearFilter"))) { + if (map.contains(QLatin1String("yearFilter"))) { query.d->m_yearFilter = map[QStringLiteral("yearFilter")].toInt(); } - if (map.contains(QStringLiteral("monthFilter"))) { + if (map.contains(QLatin1String("monthFilter"))) { query.d->m_monthFilter = map[QStringLiteral("monthFilter")].toInt(); } - if (map.contains(QStringLiteral("dayFilter"))) { + if (map.contains(QLatin1String("dayFilter"))) { query.d->m_dayFilter = map[QStringLiteral("dayFilter")].toInt(); } - if (map.contains(QStringLiteral("sortingOption"))) { + if (map.contains(QLatin1String("sortingOption"))) { int option = map.value(QStringLiteral("sortingOption")).toInt(); query.d->m_sortingOption = static_cast<SortingOption>(option); } - if (map.contains(QStringLiteral("sortingProperty"))) { + if (map.contains(QLatin1String("sortingProperty"))) { query.d->m_sortingProperty = map.value(QStringLiteral("sortingProperty")).toString(); } - if (map.contains(QStringLiteral("customOptions"))) { + if (map.contains(QLatin1String("customOptions"))) { QVariant var = map[QStringLiteral("customOptions")]; if (var.type() == QVariant::Map) { query.d->m_customOptions = map[QStringLiteral("customOptions")].toMap(); @@ -376,7 +376,7 @@ Query Query::fromSearchUrl(const QUrl &url) { - if (url.scheme() != QStringLiteral("akonadisearch")) { + if (url.scheme() != QLatin1String("akonadisearch")) { return Query(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/core/query.h new/akonadi-search-19.12.0/core/query.h --- old/akonadi-search-19.08.3/core/query.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/core/query.h 2019-12-01 10:15:52.000000000 +0100 @@ -35,6 +35,7 @@ class Term; +/** Search query. */ class AKONADI_SEARCH_CORE_EXPORT Query { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/core/resultiterator.h new/akonadi-search-19.12.0/core/resultiterator.h --- old/akonadi-search-19.08.3/core/resultiterator.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/core/resultiterator.h 2019-12-01 10:15:52.000000000 +0100 @@ -55,6 +55,7 @@ SearchStore *store; }; +/** Result iterator. */ class AKONADI_SEARCH_CORE_EXPORT ResultIterator { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/core/searchstore.h new/akonadi-search-19.12.0/core/searchstore.h --- old/akonadi-search-19.08.3/core/searchstore.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/core/searchstore.h 2019-12-01 10:15:52.000000000 +0100 @@ -32,11 +32,13 @@ namespace Akonadi { +/** Akonadi search infrastructure. */ namespace Search { class Query; +/** Search store. */ class AKONADI_SEARCH_CORE_EXPORT SearchStore : public QObject { Q_OBJECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/core/term.cpp new/akonadi-search-19.12.0/core/term.cpp --- old/akonadi-search-19.08.3/core/term.cpp 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/core/term.cpp 2019-12-01 10:15:52.000000000 +0100 @@ -326,10 +326,10 @@ Term term; QString andOrString; - if (map.contains(QStringLiteral("$and"))) { + if (map.contains(QLatin1String("$and"))) { andOrString = QStringLiteral("$and"); term.setOperation(And); - } else if (map.contains(QStringLiteral("$or"))) { + } else if (map.contains(QLatin1String("$or"))) { andOrString = QStringLiteral("$or"); term.setOperation(Or); } @@ -359,15 +359,15 @@ QString op = map.cbegin().key(); Term::Comparator com; - if (op == QStringLiteral("$ct")) { + if (op == QLatin1String("$ct")) { com = Contains; - } else if (op == QStringLiteral("$gt")) { + } else if (op == QLatin1String("$gt")) { com = Greater; - } else if (op == QStringLiteral("$gte")) { + } else if (op == QLatin1String("$gte")) { com = GreaterEqual; - } else if (op == QStringLiteral("$lt")) { + } else if (op == QLatin1String("$lt")) { com = Less; - } else if (op == QStringLiteral("$lte")) { + } else if (op == QLatin1String("$lte")) { com = LessEqual; } else { return term; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/core/term.h new/akonadi-search-19.12.0/core/term.h --- old/akonadi-search-19.08.3/core/term.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/core/term.h 2019-12-01 10:15:52.000000000 +0100 @@ -34,6 +34,7 @@ namespace Search { +/** Search term. */ class AKONADI_SEARCH_CORE_EXPORT Term { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/debug/akonadisearchdebugdialog.h new/akonadi-search-19.12.0/debug/akonadisearchdebugdialog.h --- old/akonadi-search-19.08.3/debug/akonadisearchdebugdialog.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/debug/akonadisearchdebugdialog.h 2019-12-01 10:15:52.000000000 +0100 @@ -29,6 +29,10 @@ namespace Search { class AkonadiSearchDebugDialogPrivate; +/** + * @brief The AkonadiSearchDebugDialog class + * @author Laurent Montel <[email protected]> + */ class AKONADI_SEARCH_DEBUG_EXPORT AkonadiSearchDebugDialog : public QDialog { Q_OBJECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/debug/akonadisearchdebugsearchpathcombobox.h new/akonadi-search-19.12.0/debug/akonadisearchdebugsearchpathcombobox.h --- old/akonadi-search-19.08.3/debug/akonadisearchdebugsearchpathcombobox.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/debug/akonadisearchdebugsearchpathcombobox.h 2019-12-01 10:15:52.000000000 +0100 @@ -25,7 +25,10 @@ { namespace Search { - +/** + * @brief The AkonadiSearchDebugSearchPathComboBox class + * @author Laurent Montel <[email protected]> + */ class AKONADI_SEARCH_DEBUG_EXPORT AkonadiSearchDebugSearchPathComboBox : public QComboBox { Q_OBJECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/debug/akonadisearchdebugwidget.h new/akonadi-search-19.12.0/debug/akonadisearchdebugwidget.h --- old/akonadi-search-19.08.3/debug/akonadisearchdebugwidget.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/debug/akonadisearchdebugwidget.h 2019-12-01 10:15:52.000000000 +0100 @@ -30,6 +30,9 @@ { namespace Search { +/** + * @brief The AkonadiSearchDebugWidget class + */ class AKONADI_SEARCH_DEBUG_EXPORT AkonadiSearchDebugWidget : public QWidget { Q_OBJECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/debug/akonadisearchsyntaxhighlighter.h new/akonadi-search-19.12.0/debug/akonadisearchsyntaxhighlighter.h --- old/akonadi-search-19.08.3/debug/akonadisearchsyntaxhighlighter.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/debug/akonadisearchsyntaxhighlighter.h 2019-12-01 10:15:52.000000000 +0100 @@ -41,7 +41,7 @@ Q_OBJECT public: explicit AkonadiSearchSyntaxHighlighter(QTextDocument *doc); - ~AkonadiSearchSyntaxHighlighter(); + ~AkonadiSearchSyntaxHighlighter() override; void highlightBlock(const QString &text) override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/lib/collectionquery.h new/akonadi-search-19.12.0/lib/collectionquery.h --- old/akonadi-search-19.08.3/lib/collectionquery.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/lib/collectionquery.h 2019-12-01 10:15:52.000000000 +0100 @@ -34,9 +34,11 @@ { namespace Search { +/** PIM specific search API. */ namespace PIM { +/** Collection query. */ class AKONADI_SEARCH_PIM_EXPORT CollectionQuery : public Query { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/lib/contactcompleter.h new/akonadi-search-19.12.0/lib/contactcompleter.h --- old/akonadi-search-19.08.3/lib/contactcompleter.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/lib/contactcompleter.h 2019-12-01 10:15:52.000000000 +0100 @@ -34,6 +34,7 @@ { // FIXME: Make this async!! +/** Contact completer. */ class AKONADI_SEARCH_PIM_EXPORT ContactCompleter { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/lib/emailquery.h new/akonadi-search-19.12.0/lib/emailquery.h --- old/akonadi-search-19.08.3/lib/emailquery.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/lib/emailquery.h 2019-12-01 10:15:52.000000000 +0100 @@ -36,6 +36,7 @@ namespace PIM { +/** Email query. */ class AKONADI_SEARCH_PIM_EXPORT EmailQuery : public Query { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/lib/indexeditems.h new/akonadi-search-19.12.0/lib/indexeditems.h --- old/akonadi-search-19.08.3/lib/indexeditems.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/lib/indexeditems.h 2019-12-01 10:15:52.000000000 +0100 @@ -33,6 +33,8 @@ namespace PIM { class IndexedItemsPrivate; + +/** Indexed items. */ class AKONADI_SEARCH_PIM_EXPORT IndexedItems : public QObject { Q_OBJECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/lib/query.h new/akonadi-search-19.12.0/lib/query.h --- old/akonadi-search-19.08.3/lib/query.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/lib/query.h 2019-12-01 10:15:52.000000000 +0100 @@ -35,6 +35,7 @@ class ResultIterator; +/** Query base class. */ class AKONADI_SEARCH_PIM_EXPORT Query { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/lib/resultiterator.h new/akonadi-search-19.12.0/lib/resultiterator.h --- old/akonadi-search-19.08.3/lib/resultiterator.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/lib/resultiterator.h 2019-12-01 10:15:52.000000000 +0100 @@ -38,6 +38,7 @@ class EmailQuery; class NoteQuery; +/** Result iterator. */ class AKONADI_SEARCH_PIM_EXPORT ResultIterator { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/lib/tests/contactcompletiontest.cpp new/akonadi-search-19.12.0/lib/tests/contactcompletiontest.cpp --- old/akonadi-search-19.08.3/lib/tests/contactcompletiontest.cpp 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/lib/tests/contactcompletiontest.cpp 2019-12-01 10:15:52.000000000 +0100 @@ -25,6 +25,7 @@ #include <iostream> #include <QCoreApplication> #include <QTimer> +#include <QElapsedTimer> #include <QDebug> #include <AkonadiCore/ItemFetchJob> @@ -68,7 +69,7 @@ { ContactCompleter com(m_query, 100); - QTime timer; + QElapsedTimer timer; timer.start(); const QStringList emails = com.complete(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/metainfo.yaml new/akonadi-search-19.12.0/metainfo.yaml --- old/akonadi-search-19.08.3/metainfo.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/akonadi-search-19.12.0/metainfo.yaml 2019-12-01 10:15:52.000000000 +0100 @@ -0,0 +1,26 @@ +name: akonadi-search +fancyname: Akonadi Search +maintainer: dvratil +description: Akonadi indexing and searching library +tier: 3 +type: solution +platforms: + - name: All +portingAid: false +deprecated: false +release: false +libraries: + - qmake: KF5AkonadiSearchXapian + cmake: "KF5::AkonadiSearchXapian" + - qmake: KF5AkonadiSearchCore + cmake: "KF5::AkonadiSearchCore" +cmakename: KF5AkonadiSearch + +public_lib: true +group: kdepim + +public_source_dirs: + - core + - lib + - xapian + - debug diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/ar/akonadi_search.po new/akonadi-search-19.12.0/po/ar/akonadi_search.po --- old/akonadi-search-19.08.3/po/ar/akonadi_search.po 2019-11-05 05:14:49.000000000 +0100 +++ new/akonadi-search-19.12.0/po/ar/akonadi_search.po 2019-12-06 02:48:10.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2018-01-23 16:00+0300\n" "Last-Translator: Safa Alfulaij <[email protected]>\n" "Language-Team: Arabic <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/ca/akonadi_search.po new/akonadi-search-19.12.0/po/ca/akonadi_search.po --- old/akonadi-search-19.08.3/po/ca/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/ca/akonadi_search.po 2019-12-06 02:48:10.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: akonadi_search\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-04-22 16:05+0100\n" "Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/ca@valencia/akonadi_search.po new/akonadi-search-19.12.0/po/ca@valencia/akonadi_search.po --- old/akonadi-search-19.08.3/po/ca@valencia/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/ca@valencia/akonadi_search.po 2019-12-06 02:48:11.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: akonadi_search\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-04-22 16:05+0100\n" "Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/cs/akonadi_search.po new/akonadi-search-19.12.0/po/cs/akonadi_search.po --- old/akonadi-search-19.08.3/po/cs/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/cs/akonadi_search.po 2019-12-06 02:48:11.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-04-25 14:47+0100\n" "Last-Translator: Vít Pelčák <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/da/akonadi_search.po new/akonadi-search-19.12.0/po/da/akonadi_search.po --- old/akonadi-search-19.08.3/po/da/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/da/akonadi_search.po 2019-12-06 02:48:11.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2016-08-11 21:45+0100\n" "Last-Translator: Martin Schlander <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/de/akonadi_search.po new/akonadi-search-19.12.0/po/de/akonadi_search.po --- old/akonadi-search-19.08.3/po/de/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/de/akonadi_search.po 2019-12-06 02:48:11.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-10-31 21:41+0100\n" "Last-Translator: Burkhard Lück <[email protected]>\n" "Language-Team: German <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/el/akonadi_search.po new/akonadi-search-19.12.0/po/el/akonadi_search.po --- old/akonadi-search-19.08.3/po/el/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/el/akonadi_search.po 2019-12-06 02:48:11.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2014-11-20 16:25+0200\n" "Last-Translator: Dimitris Kardarakos <[email protected]>\n" "Language-Team: Greek <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/en_GB/akonadi_search.po new/akonadi-search-19.12.0/po/en_GB/akonadi_search.po --- old/akonadi-search-19.08.3/po/en_GB/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/en_GB/akonadi_search.po 2019-12-06 02:48:11.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-05-21 15:27+0000\n" "Last-Translator: Steve Allewell <[email protected]>\n" "Language-Team: English <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/es/akonadi_search.po new/akonadi-search-19.12.0/po/es/akonadi_search.po --- old/akonadi-search-19.08.3/po/es/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/es/akonadi_search.po 2019-12-06 02:48:11.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: akonadi_baloo_indexer\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-04-29 22:48+0100\n" "Last-Translator: Javier Vinal <[email protected]>\n" "Language-Team: Spanish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/et/akonadi_search.po new/akonadi-search-19.12.0/po/et/akonadi_search.po --- old/akonadi-search-19.08.3/po/et/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/et/akonadi_search.po 2019-12-06 02:48:11.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2016-08-18 02:56+0300\n" "Last-Translator: Marek Laane <[email protected]>\n" "Language-Team: Estonian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/fi/akonadi_search.po new/akonadi-search-19.12.0/po/fi/akonadi_search.po --- old/akonadi-search-19.08.3/po/fi/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/fi/akonadi_search.po 2019-12-06 02:48:11.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-12-11 19:45+0200\n" "Last-Translator: Tommi Nieminen <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/fr/akonadi_search.po new/akonadi-search-19.12.0/po/fr/akonadi_search.po --- old/akonadi-search-19.08.3/po/fr/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/fr/akonadi_search.po 2019-12-06 02:48:11.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-06-12 17:41+0100\n" "Last-Translator: Vincent Pinon <[email protected]>\n" "Language-Team: French <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/gl/akonadi_search.po new/akonadi-search-19.12.0/po/gl/akonadi_search.po --- old/akonadi-search-19.08.3/po/gl/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/gl/akonadi_search.po 2019-12-06 02:48:11.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2018-04-22 11:12+0100\n" "Last-Translator: Adrian Chaves <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/hu/akonadi_search.po new/akonadi-search-19.12.0/po/hu/akonadi_search.po --- old/akonadi-search-19.08.3/po/hu/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/hu/akonadi_search.po 2019-12-06 02:48:11.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2014-12-20 12:28+0100\n" "Last-Translator: Kristóf Kiszel <[email protected]>\n" "Language-Team: Hungarian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/ia/akonadi_search.po new/akonadi-search-19.12.0/po/ia/akonadi_search.po --- old/akonadi-search-19.08.3/po/ia/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/ia/akonadi_search.po 2019-12-06 02:48:11.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-02-05 23:34+0100\n" "Last-Translator: giovanni <[email protected]>\n" "Language-Team: Interlingua <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/it/akonadi_search.po new/akonadi-search-19.12.0/po/it/akonadi_search.po --- old/akonadi-search-19.08.3/po/it/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/it/akonadi_search.po 2019-12-06 02:48:12.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-04-22 22:19+0100\n" "Last-Translator: Luigi Toscano <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/ja/akonadi_search.po new/akonadi-search-19.12.0/po/ja/akonadi_search.po --- old/akonadi-search-19.08.3/po/ja/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/ja/akonadi_search.po 2019-12-06 02:48:12.000000000 +0100 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: akonadi_baloo_feeder\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2013-12-24 01:19-0800\n" "Last-Translator: Japanese KDE translation team <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/ko/akonadi_search.po new/akonadi-search-19.12.0/po/ko/akonadi_search.po --- old/akonadi-search-19.08.3/po/ko/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/ko/akonadi_search.po 2019-12-06 02:48:12.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-12-03 19:17+0100\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/lt/akonadi_search.po new/akonadi-search-19.12.0/po/lt/akonadi_search.po --- old/akonadi-search-19.08.3/po/lt/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/lt/akonadi_search.po 2019-12-06 02:48:12.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: trunk-kf 5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2015-08-30 15:56+0200\n" "Last-Translator: Liudas Ališauskas <[email protected]>\n" "Language-Team: Lithuanian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/nb/akonadi_search.po new/akonadi-search-19.12.0/po/nb/akonadi_search.po --- old/akonadi-search-19.08.3/po/nb/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/nb/akonadi_search.po 2019-12-06 02:48:12.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2014-09-02 21:20+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/nl/akonadi_search.po new/akonadi-search-19.12.0/po/nl/akonadi_search.po --- old/akonadi-search-19.08.3/po/nl/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/nl/akonadi_search.po 2019-12-06 02:48:12.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-04-22 23:42+0100\n" "Last-Translator: Freek de Kruijf <[email protected]>\n" "Language-Team: Dutch <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/nn/akonadi_search.po new/akonadi-search-19.12.0/po/nn/akonadi_search.po --- old/akonadi-search-19.08.3/po/nn/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/nn/akonadi_search.po 2019-12-06 02:48:12.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2016-11-02 20:12+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/pl/akonadi_search.po new/akonadi-search-19.12.0/po/pl/akonadi_search.po --- old/akonadi-search-19.08.3/po/pl/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/pl/akonadi_search.po 2019-12-06 02:48:12.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-04-22 06:33+0100\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/pt/akonadi_search.po new/akonadi-search-19.12.0/po/pt/akonadi_search.po --- old/akonadi-search-19.08.3/po/pt/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/pt/akonadi_search.po 2019-12-06 02:48:12.000000000 +0100 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: akonadi_baloo_indexer\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-04-22 11:34+0100\n" "Last-Translator: José Nuno Coelho Pires <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/pt_BR/akonadi_search.po new/akonadi-search-19.12.0/po/pt_BR/akonadi_search.po --- old/akonadi-search-19.08.3/po/pt_BR/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/pt_BR/akonadi_search.po 2019-12-06 02:48:12.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: akonadi_baloo_indexer\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2018-07-29 16:13-0300\n" "Last-Translator: André Marcelo Alvarenga <[email protected]>\n" "Language-Team: Brazilian Portuguese <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/ro/akonadi_search.po new/akonadi-search-19.12.0/po/ro/akonadi_search.po --- old/akonadi-search-19.08.3/po/ro/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/ro/akonadi_search.po 2019-12-06 02:48:12.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2015-04-26 12:41+0300\n" "Last-Translator: Sergiu Bivol <[email protected]>\n" "Language-Team: Romanian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/ru/akonadi_search.po new/akonadi-search-19.12.0/po/ru/akonadi_search.po --- old/akonadi-search-19.08.3/po/ru/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/ru/akonadi_search.po 2019-12-06 02:48:13.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2018-10-04 11:42+0300\n" "Last-Translator: Alexander Yavorsky <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/sk/akonadi_search.po new/akonadi-search-19.12.0/po/sk/akonadi_search.po --- old/akonadi-search-19.08.3/po/sk/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/sk/akonadi_search.po 2019-12-06 02:48:13.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: akonadi_baloo_indexer\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-04-26 21:17+0100\n" "Last-Translator: Roman Paholik <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/sl/akonadi_search.po new/akonadi-search-19.12.0/po/sl/akonadi_search.po --- old/akonadi-search-19.08.3/po/sl/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/sl/akonadi_search.po 2019-12-06 02:48:13.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-07-16 11:43+0100\n" "Last-Translator: Andrej Mernik <[email protected]>\n" "Language-Team: Slovenian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/sv/akonadi_search.po new/akonadi-search-19.12.0/po/sv/akonadi_search.po --- old/akonadi-search-19.08.3/po/sv/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/sv/akonadi_search.po 2019-12-06 02:48:13.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-04-22 06:14+0100\n" "Last-Translator: Stefan Asserhäll <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/tr/akonadi_search.po new/akonadi-search-19.12.0/po/tr/akonadi_search.po --- old/akonadi-search-19.08.3/po/tr/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/tr/akonadi_search.po 2019-12-06 02:48:13.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: akonadi_search\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-06-19 12:23+0000\n" "Last-Translator: Kaan <[email protected]>\n" "Language-Team: Turkish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/uk/akonadi_search.po new/akonadi-search-19.12.0/po/uk/akonadi_search.po --- old/akonadi-search-19.08.3/po/uk/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/uk/akonadi_search.po 2019-12-06 02:48:13.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: akonadi_search\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2017-04-22 10:24+0300\n" "Last-Translator: Yuri Chornoivan <[email protected]>\n" "Language-Team: Ukrainian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/zh_CN/akonadi_search.po new/akonadi-search-19.12.0/po/zh_CN/akonadi_search.po --- old/akonadi-search-19.08.3/po/zh_CN/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/zh_CN/akonadi_search.po 2019-12-06 02:48:13.000000000 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" -"PO-Revision-Date: 2019-10-09 10:05\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" +"PO-Revision-Date: 2019-11-19 23:11\n" "Last-Translator: Guo Yunhe (guoyunhe)\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/po/zh_TW/akonadi_search.po new/akonadi-search-19.12.0/po/zh_TW/akonadi_search.po --- old/akonadi-search-19.08.3/po/zh_TW/akonadi_search.po 2019-11-05 05:14:50.000000000 +0100 +++ new/akonadi-search-19.12.0/po/zh_TW/akonadi_search.po 2019-12-06 02:48:13.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: akonadi_baloo_indexer\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-08-30 07:47+0200\n" +"POT-Creation-Date: 2019-06-23 03:10+0200\n" "PO-Revision-Date: 2018-03-25 16:03+0800\n" "Last-Translator: pan93412 <[email protected]>\n" "Language-Team: Chinese <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/runner/pimcontactsrunnerconfig.cpp new/akonadi-search-19.12.0/runner/pimcontactsrunnerconfig.cpp --- old/akonadi-search-19.08.3/runner/pimcontactsrunnerconfig.cpp 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/runner/pimcontactsrunnerconfig.cpp 2019-12-01 10:15:52.000000000 +0100 @@ -18,7 +18,7 @@ */ #include "pimcontactsrunnerconfig.h" - +#include <kconfigwidgets_version.h> #include <QCheckBox> #include <QVBoxLayout> #include <KLocalizedString> @@ -45,7 +45,11 @@ void PIMContactsRunnerConfig::configChanged() { +#if KCONFIGWIDGETS_VERSION < QT_VERSION_CHECK(5, 64, 0) Q_EMIT changed(); +#else + Q_EMIT markAsChanged(); +#endif } void PIMContactsRunnerConfig::load() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/search/email/agepostingsource.cpp new/akonadi-search-19.12.0/search/email/agepostingsource.cpp --- old/akonadi-search-19.08.3/search/email/agepostingsource.cpp 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/search/email/agepostingsource.cpp 2019-12-01 10:15:52.000000000 +0100 @@ -32,7 +32,7 @@ AgePostingSource::AgePostingSource(Xapian::valueno slot_) : Xapian::ValuePostingSource(slot_) { - m_currentTime_t = QDateTime::currentDateTimeUtc().toTime_t(); + m_currentTime_t = QDateTime::currentDateTimeUtc().toSecsSinceEpoch(); } Xapian::weight AgePostingSource::get_weight() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/xapian/autotests/termgeneratortest.cpp new/akonadi-search-19.12.0/xapian/autotests/termgeneratortest.cpp --- old/akonadi-search-19.08.3/xapian/autotests/termgeneratortest.cpp 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/xapian/autotests/termgeneratortest.cpp 2019-12-01 10:15:52.000000000 +0100 @@ -95,7 +95,7 @@ { // The 0xfb00 corresponds to U+FB00 which is a 'ff' QString str = QStringLiteral("maffab"); - QString str2 = QLatin1Literal("ma") + QChar(0xfb00) + QStringLiteral("ab"); + QString str2 = QLatin1String("ma") + QChar(0xfb00) + QStringLiteral("ab"); Xapian::Document doc; XapianTermGenerator termGen(&doc); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/xapian/xapiandatabase.h new/akonadi-search-19.12.0/xapian/xapiandatabase.h --- old/akonadi-search-19.08.3/xapian/xapiandatabase.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/xapian/xapiandatabase.h 2019-12-01 10:15:52.000000000 +0100 @@ -34,6 +34,7 @@ class XapianDocument; +/** Xapian database. */ class AKONADI_SEARCH_XAPIAN_EXPORT XapianDatabase { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/xapian/xapianqueryparser.h new/akonadi-search-19.12.0/xapian/xapianqueryparser.h --- old/akonadi-search-19.08.3/xapian/xapianqueryparser.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/xapian/xapianqueryparser.h 2019-12-01 10:15:52.000000000 +0100 @@ -31,6 +31,7 @@ namespace Search { +/** Xapian query parser. */ class AKONADI_SEARCH_XAPIAN_EXPORT XapianQueryParser { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-19.08.3/xapian/xapiantermgenerator.h new/akonadi-search-19.12.0/xapian/xapiantermgenerator.h --- old/akonadi-search-19.08.3/xapian/xapiantermgenerator.h 2019-10-30 07:36:57.000000000 +0100 +++ new/akonadi-search-19.12.0/xapian/xapiantermgenerator.h 2019-12-01 10:15:52.000000000 +0100 @@ -31,6 +31,7 @@ namespace Search { +/** Xapian term generator. */ class AKONADI_SEARCH_XAPIAN_EXPORT XapianTermGenerator { public: ++++++ applications.keyring ++++++ Binary files /var/tmp/diff_new_pack.il0C3B/_old and /var/tmp/diff_new_pack.il0C3B/_new differ
