Hello community, here is the log from the commit of package akonadi-search for openSUSE:Factory checked in at 2016-05-31 12:21:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-search (Old) and /work/SRC/openSUSE:Factory/.akonadi-search.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-search" Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-search/akonadi-search.changes 2016-03-26 15:12:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.akonadi-search.new/akonadi-search.changes 2016-05-31 12:21:13.000000000 +0200 @@ -1,0 +2,24 @@ +Sat May 7 10:09:53 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + +------------------------------------------------------------------- +Sun Apr 17 05:48:39 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + +------------------------------------------------------------------- +Mon Apr 11 06:29:47 UTC 2016 - [email protected] + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + +------------------------------------------------------------------- Old: ---- akonadi-search-15.12.3.tar.xz New: ---- akonadi-search-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-search.spec ++++++ --- /var/tmp/diff_new_pack.JvLBYd/_old 2016-05-31 12:21:14.000000000 +0200 +++ /var/tmp/diff_new_pack.JvLBYd/_new 2016-05-31 12:21:14.000000000 +0200 @@ -17,7 +17,7 @@ Name: akonadi-search -Version: 15.12.3 +Version: 16.04.1 Release: 0 Summary: Framework for searching and managing PIM metadata License: GPL-2.0+ and LGPL-2.1+ and LGPL-3.0 @@ -42,7 +42,6 @@ BuildRequires: kio-devel >= 5.0.0 BuildRequires: kmime-devel BuildRequires: krunner-devel >= 5.0.0 -BuildRequires: libKF5AkonadiPrivate-devel BuildRequires: libattr-devel BuildRequires: libxapian-devel BuildRequires: solid-devel >= 5.0.0 ++++++ akonadi-search-15.12.3.tar.xz -> akonadi-search-16.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/CMakeLists.txt new/akonadi-search-16.04.1/CMakeLists.txt --- old/akonadi-search-15.12.3/CMakeLists.txt 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/CMakeLists.txt 2016-04-26 22:14:49.000000000 +0200 @@ -1,10 +1,9 @@ cmake_minimum_required(VERSION 2.8.12) project(AkonadiSearch) -set(PROJECT_VERSION "5.1.00") -set(KF5_VERSION "5.16.0") + # ECM setup -find_package(ECM 5.16.0 REQUIRED NO_MODULE) +find_package(ECM 5.17.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) @@ -14,20 +13,25 @@ include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMInstallIcons) include(ECMAddTests) include(ECMQtDeclareLoggingCategory) + +set(AKONADISEARCH_VERSION "5.2.1") +set(KF5_VERSION "5.19.0") + +set(AKONADI_VERSION "5.2.0") +set(KDEPIMLIBS_LIB_VERSION "5.2.0") +set(KCONTACTS_LIB_VERSION "5.2.0") +set(KCALENDARCORE_LIB_VERSION "5.2.0") +set(KMIME_LIB_VERSION "5.2.0") + + find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Test) find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Config Crash KCMUtils Runner) -find_package(KF5Akonadi CONFIG) -set_package_properties(KF5Akonadi PROPERTIES - DESCRIPTION "The KDEPIM libraries" - URL "http://www.kde.org"; - TYPE REQUIRED -) find_package(Xapian CONFIG) set_package_properties(Xapian PROPERTIES @@ -36,22 +40,13 @@ TYPE REQUIRED ) -set(KF5AkonadiServer_MIN_VERSION "5.0.51") -find_package(KF5AkonadiServer ${KF5AkonadiServer_MIN_VERSION} CONFIG REQUIRED) - -set(KDEPIMLIBS_LIB_VERSION "4.87.0") - -set(KCONTACTS_LIB_VERSION "4.87.0") -set(KCALENDARCORE_LIB_VERSION "4.81.0") -set(KMIME_LIB_VERSION "4.85.0") - - +find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED) find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED) -ecm_setup_version(${PROJECT_VERSION} +ecm_setup_version(${AKONADISEARCH_VERSION} VARIABLE_PREFIX AKONADISEARCH VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/akonadi_search_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiSearchConfigVersion.cmake" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/KF5AkonadiSearchConfig.cmake.in new/akonadi-search-16.04.1/KF5AkonadiSearchConfig.cmake.in --- old/akonadi-search-15.12.3/KF5AkonadiSearchConfig.cmake.in 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/KF5AkonadiSearchConfig.cmake.in 2016-04-26 22:14:49.000000000 +0200 @@ -3,7 +3,6 @@ find_dependency(Qt5Core) find_dependency(KF5CoreAddons) find_dependency(KF5Akonadi) -find_dependency(KF5AkonadiServer) find_dependency(KF5Contacts) find_dependency(KF5Mime) find_dependency(KF5AkonadiMime) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/agent/abstractindexer.cpp new/akonadi-search-16.04.1/agent/abstractindexer.cpp --- old/akonadi-search-15.12.3/agent/abstractindexer.cpp 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/agent/abstractindexer.cpp 2016-04-26 22:14:49.000000000 +0200 @@ -29,9 +29,9 @@ { } -void AbstractIndexer::move(const Akonadi::Item::Id &item, - const Akonadi::Collection::Id &from, - const Akonadi::Collection::Id &to) +void AbstractIndexer::move(Akonadi::Item::Id item, + Akonadi::Collection::Id from, + Akonadi::Collection::Id to) { Q_UNUSED(item); Q_UNUSED(from); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/agent/abstractindexer.h new/akonadi-search-16.04.1/agent/abstractindexer.h --- old/akonadi-search-15.12.3/agent/abstractindexer.h 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/agent/abstractindexer.h 2016-04-26 22:14:49.000000000 +0200 @@ -42,9 +42,9 @@ virtual void remove(const Akonadi::Collection &item) = 0; virtual void commit() = 0; - virtual void move(const Akonadi::Item::Id &item, - const Akonadi::Collection::Id &from, - const Akonadi::Collection::Id &to); + virtual void move(Akonadi::Item::Id item, + Akonadi::Collection::Id from, + Akonadi::Collection::Id to); virtual void updateFlags(const Akonadi::Item &item, const QSet<QByteArray> &addedFlags, const QSet<QByteArray> &removed); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/agent/akonadiindexingagent.desktop new/akonadi-search-16.04.1/agent/akonadiindexingagent.desktop --- old/akonadi-search-15.12.3/agent/akonadiindexingagent.desktop 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/agent/akonadiindexingagent.desktop 2016-04-26 22:14:49.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Akonadi Indexing Agent +Name[ar]=وسيط أكونادي للفهرسة Name[ast]=Axente d'índiz Baloo d'Akonadi Name[ca]=Agent d'indexació de l'Akonadi Name[ca@valencia]=Agent d'indexació de l'Akonadi @@ -8,7 +9,6 @@ Name[de]=Akonadi-Indizierungsagent Name[en_GB]=Akonadi Indexing Agent Name[es]=Agente de indexado de Akonadi -Name[et]=Akonadi indekseerimise agent Name[fi]=Akonadin indeksointiagentti Name[gl]=Axente de indexación de Akonadi Name[hu]=Akonadi indexelő szolgáltatás @@ -31,7 +31,6 @@ Name[uk]=Агент індексування для Akonadi Name[x-test]=xxAkonadi Indexing Agentxx Name[zh_CN]=Akonadi 索引器 -Name[zh_TW]=Akonadi 索引代理程式 Type=AkonadiAgent Exec=akonadi_indexing_agent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/agent/akonotesindexer.cpp new/akonadi-search-16.04.1/agent/akonotesindexer.cpp --- old/akonadi-search-15.12.3/agent/akonotesindexer.cpp 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/agent/akonotesindexer.cpp 2016-04-26 22:14:49.000000000 +0200 @@ -25,7 +25,7 @@ #include <QTextDocument> AkonotesIndexer::AkonotesIndexer(const QString &path) - : AbstractIndexer(), m_db(0), m_termGen(0) + : AbstractIndexer(), m_db(Q_NULLPTR), m_doc(Q_NULLPTR), m_termGen(Q_NULLPTR) { try { m_db = new Xapian::WritableDatabase(path.toUtf8().constData(), Xapian::DB_CREATE_OR_OPEN); @@ -176,9 +176,9 @@ } } -void AkonotesIndexer::move(const Akonadi::Item::Id &itemId, - const Akonadi::Collection::Id &from, - const Akonadi::Collection::Id &to) +void AkonotesIndexer::move(Akonadi::Item::Id itemId, + Akonadi::Collection::Id from, + Akonadi::Collection::Id to) { if (!m_db) { return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/agent/akonotesindexer.h new/akonadi-search-16.04.1/agent/akonotesindexer.h --- old/akonadi-search-15.12.3/agent/akonotesindexer.h 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/agent/akonotesindexer.h 2016-04-26 22:14:49.000000000 +0200 @@ -48,9 +48,9 @@ void remove(const Akonadi::Item &item) Q_DECL_OVERRIDE; void remove(const Akonadi::Collection &collection) Q_DECL_OVERRIDE; - void move(const Akonadi::Item::Id &itemId, - const Akonadi::Collection::Id &from, - const Akonadi::Collection::Id &to) Q_DECL_OVERRIDE; + void move(Akonadi::Item::Id itemId, + Akonadi::Collection::Id from, + Akonadi::Collection::Id to) Q_DECL_OVERRIDE; private: void processPart(KMime::Content *content, KMime::Content *mainContent); void process(const KMime::Message::Ptr &msg); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/agent/calendarindexer.cpp new/akonadi-search-16.04.1/agent/calendarindexer.cpp --- old/akonadi-search-15.12.3/agent/calendarindexer.cpp 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/agent/calendarindexer.cpp 2016-04-26 22:14:49.000000000 +0200 @@ -114,9 +114,9 @@ } } -void CalendarIndexer::move(const Akonadi::Item::Id &itemId, - const Akonadi::Collection::Id &from, - const Akonadi::Collection::Id &to) +void CalendarIndexer::move(Akonadi::Item::Id itemId, + Akonadi::Collection::Id from, + Akonadi::Collection::Id to) { if (!m_db) { return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/agent/calendarindexer.h new/akonadi-search-16.04.1/agent/calendarindexer.h --- old/akonadi-search-15.12.3/agent/calendarindexer.h 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/agent/calendarindexer.h 2016-04-26 22:14:49.000000000 +0200 @@ -50,9 +50,9 @@ void remove(const Akonadi::Item &item) Q_DECL_OVERRIDE; void remove(const Akonadi::Collection &collection) Q_DECL_OVERRIDE; - void move(const Akonadi::Item::Id &itemId, - const Akonadi::Collection::Id &from, - const Akonadi::Collection::Id &to) Q_DECL_OVERRIDE; + void move(Akonadi::Item::Id itemId, + Akonadi::Collection::Id from, + Akonadi::Collection::Id to) Q_DECL_OVERRIDE; private: void indexEventItem(const Akonadi::Item &item, const KCalCore::Event::Ptr &event); void indexJournalItem(const Akonadi::Item &item, const KCalCore::Journal::Ptr &journal); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/agent/collectionindexer.h new/akonadi-search-16.04.1/agent/collectionindexer.h --- old/akonadi-search-15.12.3/agent/collectionindexer.h 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/agent/collectionindexer.h 2016-04-26 22:14:49.000000000 +0200 @@ -32,8 +32,9 @@ class CollectionIndexer : public QObject { + Q_OBJECT public: - CollectionIndexer(const QString &path); + explicit CollectionIndexer(const QString &path); ~CollectionIndexer(); void index(const Akonadi::Collection &collection); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/agent/collectionindexingjob.cpp new/akonadi-search-16.04.1/agent/collectionindexingjob.cpp --- old/akonadi-search-15.12.3/agent/collectionindexingjob.cpp 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/agent/collectionindexingjob.cpp 2016-04-26 22:14:49.000000000 +0200 @@ -38,7 +38,8 @@ m_pending(pending), m_index(index), m_reindexingLock(false), - m_fullSync(true) + m_fullSync(true), + m_progressTotal(0) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/agent/contactindexer.cpp new/akonadi-search-16.04.1/agent/contactindexer.cpp --- old/akonadi-search-15.12.3/agent/contactindexer.cpp 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/agent/contactindexer.cpp 2016-04-26 22:14:49.000000000 +0200 @@ -181,9 +181,9 @@ } } -void ContactIndexer::move(const Akonadi::Item::Id &itemId, - const Akonadi::Collection::Id &from, - const Akonadi::Collection::Id &to) +void ContactIndexer::move(Akonadi::Item::Id itemId, + Akonadi::Collection::Id from, + Akonadi::Collection::Id to) { if (!m_db) { return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/agent/contactindexer.h new/akonadi-search-16.04.1/agent/contactindexer.h --- old/akonadi-search-15.12.3/agent/contactindexer.h 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/agent/contactindexer.h 2016-04-26 22:14:49.000000000 +0200 @@ -40,9 +40,9 @@ void commit() Q_DECL_OVERRIDE; - void move(const Akonadi::Item::Id &itemId, - const Akonadi::Collection::Id &from, - const Akonadi::Collection::Id &to) Q_DECL_OVERRIDE; + void move(Akonadi::Item::Id itemId, + Akonadi::Collection::Id from, + Akonadi::Collection::Id to) Q_DECL_OVERRIDE; private: bool indexContact(const Akonadi::Item &item); void indexContactGroup(const Akonadi::Item &item); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/agent/emailindexer.cpp new/akonadi-search-16.04.1/agent/emailindexer.cpp --- old/akonadi-search-15.12.3/agent/emailindexer.cpp 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/agent/emailindexer.cpp 2016-04-26 22:14:49.000000000 +0200 @@ -389,9 +389,9 @@ } } -void EmailIndexer::move(const Akonadi::Item::Id &itemId, - const Akonadi::Collection::Id &from, - const Akonadi::Collection::Id &to) +void EmailIndexer::move(Akonadi::Item::Id itemId, + Akonadi::Collection::Id from, + Akonadi::Collection::Id to) { if (!m_db) { return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/agent/emailindexer.h new/akonadi-search-16.04.1/agent/emailindexer.h --- old/akonadi-search-15.12.3/agent/emailindexer.h 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/agent/emailindexer.h 2016-04-26 22:14:49.000000000 +0200 @@ -47,9 +47,9 @@ const QSet<QByteArray> &removed) Q_DECL_OVERRIDE; void remove(const Akonadi::Item &item) Q_DECL_OVERRIDE; void remove(const Akonadi::Collection &item) Q_DECL_OVERRIDE; - void move(const Akonadi::Item::Id &itemId, - const Akonadi::Collection::Id &from, - const Akonadi::Collection::Id &to) Q_DECL_OVERRIDE; + void move(Akonadi::Item::Id itemId, + Akonadi::Collection::Id from, + Akonadi::Collection::Id to) Q_DECL_OVERRIDE; void commit() Q_DECL_OVERRIDE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/agent/index.cpp new/akonadi-search-16.04.1/agent/index.cpp --- old/akonadi-search-15.12.3/agent/index.cpp 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/agent/index.cpp 2016-04-26 22:14:49.000000000 +0200 @@ -151,7 +151,7 @@ void Index::remove(const QSet<Akonadi::Item::Id> &ids, const QStringList &mimeTypes) { const QList<AbstractIndexer *> indexers = indexersForMimetypes(mimeTypes); - Q_FOREACH (const Akonadi::Item::Id &id, ids) { + Q_FOREACH (Akonadi::Item::Id id, ids) { Q_FOREACH (AbstractIndexer *indexer, indexers) { try { indexer->remove(Akonadi::Item(id)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/debug/akonadisearchdebugdialog.cpp new/akonadi-search-16.04.1/debug/akonadisearchdebugdialog.cpp --- old/akonadi-search-15.12.3/debug/akonadisearchdebugdialog.cpp 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/debug/akonadisearchdebugdialog.cpp 2016-04-26 22:14:49.000000000 +0200 @@ -15,6 +15,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <errno.h> + #include "akonadisearchdebugdialog.h" #include "akonadisearchdebugwidget.h" @@ -34,12 +36,12 @@ { public: AkonadiSearchDebugDialogPrivate() - : mBalooDebugWidget(Q_NULLPTR) + : mAkonadiSearchDebugWidget(Q_NULLPTR) { } - AkonadiSearchDebugWidget *mBalooDebugWidget; + AkonadiSearchDebugWidget *mAkonadiSearchDebugWidget; }; AkonadiSearchDebugDialog::AkonadiSearchDebugDialog(QWidget *parent) @@ -58,9 +60,9 @@ QVBoxLayout *mainLayout = new QVBoxLayout; setLayout(mainLayout); connect(buttonBox, &QDialogButtonBox::rejected, this, &AkonadiSearchDebugDialog::reject); - d->mBalooDebugWidget = new AkonadiSearchDebugWidget(this); - d->mBalooDebugWidget->setObjectName(QStringLiteral("akonadisearchdebugwidget")); - mainLayout->addWidget(d->mBalooDebugWidget); + d->mAkonadiSearchDebugWidget = new AkonadiSearchDebugWidget(this); + d->mAkonadiSearchDebugWidget->setObjectName(QStringLiteral("akonadisearchdebugwidget")); + mainLayout->addWidget(d->mAkonadiSearchDebugWidget); mainLayout->addWidget(buttonBox); readConfig(); } @@ -88,23 +90,23 @@ void AkonadiSearchDebugDialog::setAkonadiId(Akonadi::Item::Id akonadiId) { - d->mBalooDebugWidget->setAkonadiId(akonadiId); + d->mAkonadiSearchDebugWidget->setAkonadiId(akonadiId); } void AkonadiSearchDebugDialog::setSearchType(AkonadiSearchDebugSearchPathComboBox::SearchType type) { - d->mBalooDebugWidget->setSearchType(type); + d->mAkonadiSearchDebugWidget->setSearchType(type); } void AkonadiSearchDebugDialog::doSearch() { - d->mBalooDebugWidget->doSearch(); + d->mAkonadiSearchDebugWidget->doSearch(); } void AkonadiSearchDebugDialog::slotSaveAs() { const QString filter = i18n("Text Files (*.txt);;All Files (*)"); - saveTextAs(d->mBalooDebugWidget->plainText(), filter); + saveTextAs(d->mAkonadiSearchDebugWidget->plainText(), filter); } void AkonadiSearchDebugDialog::saveTextAs(const QString &text, const QString &filter) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/debug/akonadisearchdebugdialog.h new/akonadi-search-16.04.1/debug/akonadisearchdebugdialog.h --- old/akonadi-search-15.12.3/debug/akonadisearchdebugdialog.h 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/debug/akonadisearchdebugdialog.h 2016-04-26 22:14:49.000000000 +0200 @@ -15,8 +15,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef BALOODEBUGDIALOG_H -#define BALOODEBUGDIALOG_H +#ifndef AKONADISEACHDEBUGDIALOG_H +#define AKONADISEACHDEBUGDIALOG_H #include <QDialog> #include "search_debug_export.h" @@ -49,5 +49,5 @@ }; } } -#endif // BALOODEBUGDIALOG_H +#endif // AKONADISEACHDEBUGDIALOG_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/lib/emailquery.cpp new/akonadi-search-16.04.1/lib/emailquery.cpp --- old/akonadi-search-15.12.3/lib/emailquery.cpp 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/lib/emailquery.cpp 2016-04-26 22:14:49.000000000 +0200 @@ -278,7 +278,7 @@ if (!d->collections.isEmpty()) { Xapian::Query query; - Q_FOREACH (const Akonadi::Collection::Id &id, d->collections) { + Q_FOREACH (Akonadi::Collection::Id id, d->collections) { QString c = QString::number(id); Xapian::Query q = Xapian::Query('C' + c.toStdString()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/runner/pimcontactsrunnerconfig.h new/akonadi-search-16.04.1/runner/pimcontactsrunnerconfig.h --- old/akonadi-search-15.12.3/runner/pimcontactsrunnerconfig.h 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/runner/pimcontactsrunnerconfig.h 2016-04-26 22:14:49.000000000 +0200 @@ -26,6 +26,7 @@ class PIMContactsRunnerConfig : public KCModule { + Q_OBJECT public: explicit PIMContactsRunnerConfig(QWidget *parent = Q_NULLPTR, const QVariantList &args = QVariantList()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/runner/plasma-krunner-pimcontacts.desktop new/akonadi-search-16.04.1/runner/plasma-krunner-pimcontacts.desktop --- old/akonadi-search-15.12.3/runner/plasma-krunner-pimcontacts.desktop 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/runner/plasma-krunner-pimcontacts.desktop 2016-04-26 22:14:49.000000000 +0200 @@ -1,12 +1,13 @@ [Desktop Entry] Name=PIM Contacts Search +Name[ar]=بحث في متراسلي PIM +Name[ast]=Gueta de contautos de PIM Name[ca]=Cerca de contactes PIM Name[ca@valencia]=Cerca de contactes PIM Name[da]=Søgning i PIM-kontakter Name[de]=PIM-Kontaktsuche Name[en_GB]=PIM Contacts Search Name[es]=Búsqueda de contactos PIM -Name[et]=PIM-i kontaktide otsing Name[fi]=PIM-yhteystietojen haku Name[gl]=Busca de contactos Name[it]=Ricerca contatti PIM @@ -25,15 +26,16 @@ Name[sv]=Kontaktsökning i personlig informationshantering Name[uk]=Пошук у записах контактів PIM Name[x-test]=xxPIM Contacts Searchxx -Name[zh_TW]=PIM 聯絡人搜尋 +Name[zh_CN]=个人信息存储联系人搜索 Comment=Runner which searches through your contacts +Comment[ar]=مشغّل يبحث في متراسليك +Comment[ast]=Executor que gueta pente los tos contautos Comment[ca]=Executor que cerca a través dels vostres contactes Comment[ca@valencia]=Executor que cerca a través dels vostres contactes Comment[da]=Runner som søger efter dine kontakter Comment[de]=Runner, der Ihre Kontakte durchsucht Comment[en_GB]=Runner which searches through your contacts Comment[es]=Lanzador que busca por sus contactos -Comment[et]=Käivitaja, mis otsib sinu kontaktides Comment[fi]=Suoritusohjelma, joka etsii yhteystiedoista Comment[gl]=Executor que busca contactos. Comment[it]=Esecutore che cerca tra i contatti @@ -52,7 +54,7 @@ Comment[sv]=Körprogram som söker igenom kontakter Comment[uk]=Засіб запуску для пошуку у записах ваших контактів Comment[x-test]=xxRunner which searches through your contactsxx -Comment[zh_TW]=搜尋您的聯絡人的執行器 +Comment[zh_CN]=搜索您的联系人的运行器 Type=Service Icon=view-pim-contacts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/runner/plasma-krunner-pimcontacts_config.desktop new/akonadi-search-16.04.1/runner/plasma-krunner-pimcontacts_config.desktop --- old/akonadi-search-15.12.3/runner/plasma-krunner-pimcontacts_config.desktop 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/runner/plasma-krunner-pimcontacts_config.desktop 2016-04-26 22:14:49.000000000 +0200 @@ -1,12 +1,13 @@ [Desktop Entry] Name=PIM Contacts Search +Name[ar]=بحث في متراسلي PIM +Name[ast]=Gueta de contautos de PIM Name[ca]=Cerca de contactes PIM Name[ca@valencia]=Cerca de contactes PIM Name[da]=Søgning i PIM-kontakter Name[de]=PIM-Kontaktsuche Name[en_GB]=PIM Contacts Search Name[es]=Búsqueda de contactos PIM -Name[et]=PIM-i kontaktide otsing Name[fi]=PIM-yhteystietojen haku Name[gl]=Busca de contactos Name[it]=Ricerca contatti PIM @@ -25,7 +26,7 @@ Name[sv]=Kontaktsökning i personlig informationshantering Name[uk]=Пошук у записах контактів PIM Name[x-test]=xxPIM Contacts Searchxx -Name[zh_TW]=PIM 聯絡人搜尋 +Name[zh_CN]=个人信息存储联系人搜索 Type=Service X-KDE-ServiceTypes=KCModule diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-search-15.12.3/xapian/xapiansearchstore.h new/akonadi-search-16.04.1/xapian/xapiansearchstore.h --- old/akonadi-search-15.12.3/xapian/xapiansearchstore.h 2016-02-24 13:04:58.000000000 +0100 +++ new/akonadi-search-16.04.1/xapian/xapiansearchstore.h 2016-04-26 22:14:49.000000000 +0200 @@ -39,6 +39,7 @@ */ class AKONADI_SEARCH_XAPIAN_EXPORT XapianSearchStore : public SearchStore { + Q_OBJECT public: explicit XapianSearchStore(QObject *parent = Q_NULLPTR); virtual ~XapianSearchStore();
