Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: akonadiconsole

akonadiconsole (4:19.04.3-0ubuntu1) eoan; urgency=medium * New upstream release (19.04.3) -- Rik Mills <rikmills@kubuntu.org> Tue, 23 Jul 2019 18:53:25 +0100 akonadiconsole (4:18.12.3-0ubuntu2) disco; urgency=medium * No-change rebuild for fixed akonadi server. -- Rik Mills <rikmills@kubuntu.org> Sun, 07 Apr 2019 17:44:09 +0100 akonadiconsole (4:18.12.3-0ubuntu1) disco; urgency=medium * New upstream release (18.12.3) -- Rik Mills <rikmills@kubuntu.org> Sat, 16 Mar 2019 15:03:52 +0000 akonadiconsole (4:18.04.3-0ubuntu1) cosmic; urgency=medium * New upstream release (18.03.80) * New upstream release (18.04.0) * New upstream release (18.04.1) * New upstream release (18.04.3) -- Rik Mills <rikmills@kubuntu.org> Tue, 21 Aug 2018 18:52:40 +0100 akonadiconsole (4:17.12.3-0ubuntu1) bionic; urgency=medium * New upstream release (17.12.3) -- Rik Mills <rikmills@kubuntu.org> Fri, 16 Mar 2018 13:21:54 +0000 akonadiconsole (4:17.12.2-0ubuntu1) bionic; urgency=medium * New build depends on libkf5akonadisearch-dev & libxapian-dev * New upstream release (17.11.80) * New upstream release (17.11.90) * New upstream release (17.12.0) * New upstream release (17.12.2) -- Rik Mills <rikmills@kubuntu.org> Wed, 28 Feb 2018 09:43:30 +0000 akonadiconsole (4:17.08.3-0ubuntu1) bionic; urgency=medium * New build depend on libkf5contacteditor-dev * New upstream release (17.08.3) -- Rik Mills <rikmills@kubuntu.org> Fri, 01 Dec 2017 15:00:18 +0000 akonadiconsole (4:17.04.3-0ubuntu1) artful; urgency=medium [ Rik Mills ] * Add lintian override: package-name-doesnt-match-sonames libakonadiconsole5 [ José Manuel Santamaría Lema ] * New upstream release (17.04.1) * Add kde-10n Breaks/Replaces * New upstream release (17.04.2) * New upstream release (17.04.3) -- José Manuel Santamaría Lema <panfaust@gmail.com> Mon, 21 Aug 2017 14:34:26 +0100 akonadiconsole (4:16.12.3-0ubuntu1) artful; urgency=medium [ Simon Quigley ] * Initial split from kdepim. [ Clive Johnston ] * Fix packaging * This package is in the archive and therefore needs an epoch [ Rik Mills ] * New upstream release (16.12.0) * New upstream release (16.12.1) [ Darin Miller ] * New upstream release (16.12.2) [ José Manuel Santamaría Lema ] * New upstream release (16.12.3) * Update copyright file -- José Manuel Santamaría Lema <panfaust@gmail.com> Mon, 01 May 2017 20:29:19 +0100

Modifications :
  1. Download patch akonadiconsole.categories

    --- 4:18.08.3-3/akonadiconsole.categories 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/akonadiconsole.categories 2019-06-24 05:05:09.000000000 +0000 @@ -1 +1 @@ -org.kde.pim.akonadiconsole akonadiconsole (akonadiconsole) +org.kde.pim.akonadiconsole akonadiconsole (akonadiconsole) IDENTIFIER [AKONADICONSOLE_LOG]
  2. Download patch debian/upstream/metadata

    --- 4:18.08.3-3/debian/upstream/metadata 2017-12-16 14:20:34.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -Name: akonadiconsole -Changelog: https://cgit.kde.org/akonadiconsole.git/log -Contact: kde-devel@kde.org -Donation: https://www.kde.org/community/donations/index.php -Repository: https://anongit.kde.org/akonadiconsole.git -Repository-Browse: https://cgit.kde.org/akonadiconsole.git -Security-Contact: security@kde.org
  3. Download patch debian/rules

    --- 4:18.08.3-3/debian/rules 2019-11-14 22:33:25.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/rules 2019-07-23 17:53:25.000000000 +0000 @@ -1,13 +1,10 @@ #!/usr/bin/make -f -l10npkgs_firstversion_ok := 4:16.04.3-9~ +l10npkgs_firstversion_ok := 4:17.03.90-0~ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk -override_dh_strip: - $(overridden_command) --dbgsym-migration='akonadiconsole-dbg (<= 4:15.12.1-1~~)' - override_dh_auto_test: - xvfb-run -a --server-args="-screen 0 1024x768x24 +extension GLX" --\ - dh_auto_test --no-parallel + # Disable dh_auto_test at build time + :
  4. Download patch src/notificationfiltermodel.h

    --- 4:18.08.3-3/src/notificationfiltermodel.h 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/notificationfiltermodel.h 2019-06-24 05:05:09.000000000 +0000 @@ -15,7 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef NOTIFICATIONFILTERMODEL_H
  5. Download patch debian/compat

    --- 4:18.08.3-3/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/compat 2019-07-23 17:53:25.000000000 +0000 @@ -0,0 +1 @@ +9
  6. Download patch src/jobtrackersearchwidget.h

    --- 4:18.08.3-3/src/jobtrackersearchwidget.h 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/jobtrackersearchwidget.h 2019-06-24 05:05:09.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2017-2019 Montel Laurent <montel@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as
  7. Download patch src/browserwidget.h

    --- 4:18.08.3-3/src/browserwidget.h 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/browserwidget.h 2019-06-24 05:05:09.000000000 +0000 @@ -74,7 +74,7 @@ public Q_SLOTS: void clearCache(); private Q_SLOTS: - void itemActivated(const QModelIndex &index); + void currentChanged(const QModelIndex &index); void itemFetchDone(KJob *job); void modelChanged(); void save();
  8. Download patch src/notificationmonitor.cpp

    --- 4:18.08.3-3/src/notificationmonitor.cpp 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/notificationmonitor.cpp 2019-06-24 05:05:09.000000000 +0000 @@ -249,6 +249,9 @@ void NotificationMonitor::populateItemNt } model->appendRow(relationsItem); + appendRow(model, QStringLiteral("Must retrieve"), + toString(ntf.mustRetrieve())); + auto itemsItem = new QStandardItem(QStringLiteral("Items")); const auto &items = ntf.items(); for (const auto &item : items) { @@ -543,7 +546,6 @@ void NotificationMonitor::populateSubscr const auto ifs = ntf.itemFetchScope(); appendRow(item, QStringLiteral("Requested Parts"), toString(ifs.requestedParts())); appendRow(item, QStringLiteral("Changed Since"), ifs.changedSince().toString(Qt::ISODateWithMs)); - appendRow(item, QStringLiteral("Tag Fetch Scope"), toString(ifs.tagFetchScope())); QString ancestorDepth; switch (ifs.ancestorDepth()) { case Akonadi::Protocol::ItemFetchScope::NoAncestor: @@ -617,6 +619,14 @@ void NotificationMonitor::populateSubscr appendRow(item, QStringLiteral("Ancestor Attributes"), toString(cfs.ancestorAttributes())); appendRow(item, QStringLiteral("Ignore Retrieval Errors"), toString(cfs.ignoreRetrievalErrors())); model->appendRow(item); + + item = new QStandardItem(QStringLiteral("Tag Fetch Scope")); + const Akonadi::Protocol::TagFetchScope tfs = ntf.tagFetchScope(); + appendRow(item, QStringLiteral("Fetch ID Only"), toString(tfs.fetchIdOnly())); + appendRow(item, QStringLiteral("Fetch RemoteID"), toString(tfs.fetchRemoteID())); + appendRow(item, QStringLiteral("Fetch All Attributes"), toString(tfs.fetchAllAttributes())); + appendRow(item, QStringLiteral("Attributes"), toString(tfs.attributes())); + model->appendRow(item); } void NotificationMonitor::saveToFile()
  9. Download patch debian/upstream/signing-key.asc

    --- 4:18.08.3-3/debian/upstream/signing-key.asc 2017-12-16 14:20:34.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -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 -RJWljvaVa8fj2U2D659nVsq8og== -=5Ltf ------END PGP PUBLIC KEY BLOCK-----
  10. Download patch debian/control

    --- 4:18.08.3-3/debian/control 2019-11-14 22:33:25.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/control 2019-07-23 17:53:25.000000000 +0000 @@ -3,58 +3,95 @@ Section: kde Priority: optional Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Sune Vuorela <sune@debian.org>, + Fathi Boudra <fabo@debian.org>, Modestas Vainius <modax@debian.org>, Michael Meskes <meskes@debian.org>, George Kiagiadakis <kiagiadakis.george@gmail.com>, Eshat Cakar <info@eshat.de>, - Maximiliano Curia <maxy@debian.org>, - Sandro Knauß <hefee@debian.org>, -Build-Depends: cmake (>= 3.1~), - debhelper-compat (= 12), - extra-cmake-modules (>= 5.47.0~), - libkf5akonadi-dev (>> 4:18.08.3-7), - libkf5akonadicontact-dev (>> 4:18.08.3-1), - libkf5akonadimime-dev (>> 4:18.08.3-1), - libkf5akonadisearch-dev (>> 4:18.08.3-1), - libkf5calendarcore-dev (>> 4:18.08.3-1), - libkf5calendarsupport-dev (>> 4:18.08.3-1), - libkf5completion-dev (>= 5.47.0~), - libkf5config-dev (>= 5.47.0~), - libkf5configwidgets-dev (>= 5.47.0~), - libkf5contacts-dev (>> 4:18.08.3-1), - libkf5crash-dev (>= 5.47.0~), - libkf5dbusaddons-dev (>= 5.47.0~), - libkf5doctools-dev (>= 5.47.0~), - libkf5i18n-dev (>= 5.47.0~), - libkf5imap-dev (>> 18.08.3-1), - libkf5itemmodels-dev (>= 5.47.0~), - libkf5itemviews-dev (>= 5.47.0~), - libkf5kio-dev (>= 5.47.0~), - libkf5libkdepim-dev (>> 4:18.08.3-2), - libkf5libkleo-dev (>> 4:18.08.3-2), - libkf5messageviewer-dev (>> 4:18.08.3-2), - libkf5mime-dev (>> 18.08.3-1), - libkf5pimtextedit-dev (>> 18.08.3-1), - libkf5textwidgets-dev (>= 5.47.0~), - libkf5widgetsaddons-dev (>= 5.47.0~), - libkf5xmlgui-dev (>= 5.47.0~), + Maximiliano Curia <maxy@debian.org> +Build-Depends: cmake (>= 2.8.12~), + debhelper (>= 9), + extra-cmake-modules (>= 5.31.0~), + libassuan-dev, + libkf5akonadi-dev (>= 4:19.04.3~), + libkf5akonadicalendar-dev (>= 4:19.04.3~), + libkf5akonadicontact-dev (>= 4:19.04.3~), + libkf5akonadimime-dev (>= 4:19.04.3~), + libkf5akonadisearch-dev (>= 4:19.04.3~), + libkf5akonadiserver-dev (>= 4:19.04.3~), + libkf5archive-dev (>= 5.31.0~), + libkf5auth-dev (>= 5.31.0~), + libkf5calendarcore-dev (>= 4:19.04.3~), + libkf5calendarsupport-dev (>= 4:19.04.3~), + libkf5codecs-dev (>= 5.31.0~), + libkf5completion-dev (>= 5.31.0~), + libkf5config-dev (>= 5.31.0~), + libkf5contacteditor-dev (>= 4:19.04.3~), + libkf5contacts-dev (>= 4:19.04.3~), + libkf5coreaddons-dev (>= 5.31.0~), + libkf5crash-dev (>= 5.31.0~), + libkf5dbusaddons-dev (>= 5.31.0~), + libkf5dnssd-dev (>= 5.31.0~), + libkf5doctools-dev (>= 5.31.0~), + libkf5globalaccel-dev (>= 5.31.0~), + libkf5i18n-dev (>= 5.31.0~), + libkf5iconthemes-dev (>= 5.31.0~), + libkf5itemviews-dev (>= 5.31.0~), + libkf5kcmutils-dev (>= 5.31.0~), + libkf5kdelibs4support-dev (>= 5.31.0~), + libkf5khtml-dev (>= 5.31.0~), + libkf5libkdepim-dev (>= 4:19.04.3~), + libkf5libkleo-dev (>= 4:19.04.3~), + libkf5mailimporter-dev (>= 4:19.04.3~), + libkf5messagecomposer-dev (>= 4:19.04.3~), + libkf5messagecore-dev (>= 4:19.04.3~), + libkf5messagelist-dev (>= 4:19.04.3~), + libkf5messageviewer-dev (>= 4:19.04.3~), + libkf5mime-dev (>= 19.04.3~), + libkf5mimetreeparser-dev (>= 4:19.04.3~), + libkf5newstuff-dev (>= 5.31.0~), + libkf5notifyconfig-dev (>= 5.31.0~), + libkf5pimcommon-dev (>= 4:19.04.3~), + libkf5pimtextedit-dev (>= 19.04.3~), + libkf5service-dev (>= 5.31.0~), + libkf5sonnet-dev (>= 5.31.0~), + libkf5templateparser-dev (>= 4:19.04.3~), + libkf5texteditor-dev (>= 5.31.0~), + libkf5textwidgets-dev (>= 5.31.0~), + libkf5wallet-dev (>= 5.31.0~), + libkf5webengineviewer-dev (>= 4:19.04.3~), + libkf5webkit-dev (>= 5.31.0~), + libkf5widgetsaddons-dev (>= 5.31.0~), + libkf5windowsystem-dev (>= 5.31.0~), + libkf5xmlgui-dev (>= 5.31.0~), + libkf5xmlrpcclient-dev (>= 5.31.0~), + libphonon4qt5-dev, + libphonon4qt5experimental-dev, + libqt5opengl5-dev (>= 5.6.1~), + libqt5webkit5-dev (>= 5.5.0~), + libx11-dev, libxapian-dev, pkg-config, pkg-kde-tools (>= 0.12), - qtbase5-dev (>= 5.9.0~), - xauth, - xvfb, -Standards-Version: 4.4.1 + qtbase5-dev (>= 5.6.1~), + qtdeclarative5-dev (>= 5.6.1~), + qttools5-dev (>= 5.6.1~), + shared-mime-info, + xsltproc, + zlib1g-dev, +Standards-Version: 3.9.8 Homepage: http://pim.kde.org/ -Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/akonadiconsole -Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/akonadiconsole.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/akonadiconsole +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/akonadiconsole Package: akonadiconsole Section: utils Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: ${kde-l10n:all} -Replaces: ${kde-l10n:all} +Depends: kdepim-runtime, ${misc:Depends}, ${shlibs:Depends} +Breaks: akonadi-kde (<< 4:4.3.0), kdepim-runtime (<< 4:4.4.0), ${kde-l10n:all} +Replaces: akonadi-kde (<< 4:4.3.0), + kdepim-runtime (<< 4:4.4.0), + ${kde-l10n:all} Description: management and debugging console for akonadi Akonadi Console is a useful utility that can be used to explore or manage Akonadi. Since this utility exposes Akonadi internals, it is very useful for
  11. Download patch COPYING.DOC

    --- 4:18.08.3-3/COPYING.DOC 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/COPYING.DOC 2019-06-24 05:05:09.000000000 +0000 @@ -355,7 +355,7 @@ The Free Software Foundation may publish of the GNU Free Documentation License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. See -http://www.gnu.org/copyleft/. +https://www.gnu.org/copyleft/. Each version of the License is given a distinguishing version number. If the Document specifies that a particular numbered version of this
  12. Download patch src/searchwidget.cpp

    --- 4:18.08.3-3/src/searchwidget.cpp 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/searchwidget.cpp 2019-06-24 05:05:09.000000000 +0000 @@ -58,7 +58,7 @@ SearchWidget::SearchWidget(QWidget *pare QVBoxLayout *layout = new QVBoxLayout(this); QHBoxLayout *hbox = new QHBoxLayout; - hbox->addWidget(new QLabel(QStringLiteral("Search store:")), 0, 0); + hbox->addWidget(new QLabel(QStringLiteral("Search store:")), 0, {}); mStoreCombo = new KComboBox; mStoreCombo->setObjectName(QStringLiteral("SearchStoreCombo")); hbox->addWidget(mStoreCombo);
  13. Download patch autotests/jobtrackermodeltest.cpp

    --- 4:18.08.3-3/autotests/jobtrackermodeltest.cpp 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/autotests/jobtrackermodeltest.cpp 2019-06-24 05:05:09.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2017-2019 Montel Laurent <montel@kde.org> Copyright (c) 2017 David Faure <faure@kde.org> This program is free software; you can redistribute it and/or modify it @@ -51,7 +51,7 @@ JobTrackerModelTest::~JobTrackerModelTes void JobTrackerModelTest::initTestCase() { // Don't interfere with a running akonadiconsole - Akonadi::Instance::setIdentifier("jobtrackertest"); + Akonadi::Instance::setIdentifier(QStringLiteral("jobtrackertest")); } void JobTrackerModelTest::shouldBeEmpty() @@ -66,7 +66,7 @@ void JobTrackerModelTest::shouldDisplayO // GIVEN JobTrackerModel model("jobtracker"); //ModelTest modelTest(&model); - const QString jobName("job1"); + const QString jobName(QStringLiteral("job1")); QSignalSpy rowATBISpy(&model, &QAbstractItemModel::rowsAboutToBeInserted); QSignalSpy rowInsertedSpy(&model, &QAbstractItemModel::rowsInserted); connect(&model, &QAbstractItemModel::rowsAboutToBeInserted, @@ -89,7 +89,7 @@ void JobTrackerModelTest::shouldDisplayO }); // WHEN - model.jobTracker().jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + model.jobTracker().jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); // THEN QCOMPARE(model.rowCount(), 1); @@ -110,8 +110,8 @@ void JobTrackerModelTest::shouldSignalDa { // GIVEN JobTrackerModel model("jobtracker"); - const QString jobName("job1"); - model.jobTracker().jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + const QString jobName(QStringLiteral("job1")); + model.jobTracker().jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); QSignalSpy dataChangedSpy(&model, &JobTrackerModel::dataChanged); // WHEN @@ -133,8 +133,8 @@ void JobTrackerModelTest::shouldHandleRe { // GIVEN JobTrackerModel model("jobtracker"); - const QString jobName("job1"); - model.jobTracker().jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + const QString jobName(QStringLiteral("job1")); + model.jobTracker().jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); QSignalSpy modelATBResetSpy(&model, &JobTrackerModel::modelAboutToBeReset); QSignalSpy modelResetSpy(&model, &JobTrackerModel::modelReset); QSignalSpy dataChangedSpy(&model, &JobTrackerModel::dataChanged); @@ -157,8 +157,8 @@ void JobTrackerModelTest::shouldHandleDu { // GIVEN JobTrackerModel model("jobtracker"); - const QString jobName("job1"); - model.jobTracker().jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + const QString jobName(QStringLiteral("job1")); + model.jobTracker().jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); model.jobTracker().jobStarted(jobName); model.jobTracker().jobEnded(jobName, QString()); model.jobTracker().signalUpdates(); @@ -166,7 +166,7 @@ void JobTrackerModelTest::shouldHandleDu // WHEN QSignalSpy rowATBISpy(&model, &QAbstractItemModel::rowsAboutToBeInserted); QSignalSpy rowInsertedSpy(&model, &QAbstractItemModel::rowsInserted); - model.jobTracker().jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + model.jobTracker().jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); // THEN QCOMPARE(model.rowCount(), 1); // 1 session
  14. Download patch CMakeLists.txt

    --- 4:18.08.3-3/CMakeLists.txt 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/CMakeLists.txt 2019-06-24 05:05:09.000000000 +0000 @@ -1,33 +1,33 @@ -cmake_minimum_required(VERSION 3.1) -set(KDEPIM_VERSION_NUMBER "5.9.3") +cmake_minimum_required(VERSION 3.5) +set(KDEPIM_VERSION_NUMBER "5.11.3") project(akonadiconsole VERSION ${KDEPIM_VERSION_NUMBER}) -set(KF5_VERSION "5.47.0") +set(KF5_MIN_VERSION "5.56.0") -find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) +find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(ECMInstallIcons) -include(ECMOptionalAddSubdirectory) + include(ECMSetupVersion) include(ECMAddTests) -include(ECMMarkNonGuiExecutable) + include(GenerateExportHeader) include(ECMGenerateHeaders) -include(CMakePackageConfigHelpers) + include(FeatureSummary) include(CheckFunctionExists) include(ECMGeneratePriFile) include(KDEInstallDirs) include(KDECMakeSettings) -include(KDECompilerSettings NO_POLICY_SCOPE) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMAddAppIcon) include(ECMQtDeclareLoggingCategory) -include(ECMCoverageOption) + # Do NOT add quote -set(KDEPIM_DEV_VERSION) +set(KDEPIM_DEV_VERSION ) # add an extra space if(DEFINED KDEPIM_DEV_VERSION) @@ -40,38 +40,38 @@ set(KDEPIM_VERSION "${KDEPIM_VERSION_NUM set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") -set(AKONADI_CONTACT_VERSION "5.9.3") -set(CALENDARSUPPORT_LIB_VERSION_LIB "5.9.3") -set(AKONADI_VERSION "5.9.3") -set(AKONADI_SEARCH_VERSION "5.9.3") +set(AKONADI_CONTACT_VERSION "5.11.3") +set(CALENDARSUPPORT_LIB_VERSION_LIB "5.11.3") +set(AKONADI_VERSION "5.11.3") +set(AKONADI_SEARCH_VERSION "5.11.3") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") -set(QT_REQUIRED_VERSION "5.9.0") +set(QT_REQUIRED_VERSION "5.10.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql Test) -set(MESSAGELIB_LIB_VERSION_LIB "5.9.3") -set(LIBKDEPIM_LIB_VERSION_LIB "5.9.3") -set(KCALENDARCORE_LIB_VERSION "5.9.3") -set(KCONTACTS_LIB_VERSION "5.9.3") -set(KMIME_LIB_VERSION "5.9.3") +set(MESSAGELIB_LIB_VERSION_LIB "5.11.3") +set(LIBKDEPIM_LIB_VERSION_LIB "5.11.3") +set(KCALENDARCORE_LIB_VERSION "5.11.3") +set(KCONTACTS_LIB_VERSION "5.11.3") +set(KMIME_LIB_VERSION "5.11.3") # Find KF5 package -find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5ConfigWidgets ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5DocTools ${KF5_VERSION} REQUIRED) -find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5ItemModels ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5TextWidgets ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5Crash ${KF5_VERSION} REQUIRED) -find_package(KF5Completion ${KF5_VERSION} REQUIRED) -find_package(KF5ItemViews ${KF5_VERSION} REQUIRED) -find_package(KF5KIO ${KF5_VERSION} REQUIRED) +find_package(KF5Completion ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5DocTools ${KF5_MIN_VERSION} REQUIRED) +find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5ItemModels ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5Crash ${KF5_MIN_VERSION} REQUIRED) +find_package(KF5Completion ${KF5_MIN_VERSION} REQUIRED) +find_package(KF5ItemViews ${KF5_MIN_VERSION} REQUIRED) +find_package(KF5KIO ${KF5_MIN_VERSION} REQUIRED) # Find KdepimLibs Package find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) @@ -102,9 +102,6 @@ include_directories(${akonadiconsole_SOU configure_file(config-akonadiconsole.h.cmake ${CMAKE_BINARY_DIR}/config-akonadiconsole.h) -add_definitions(-DQT_NO_URL_CAST_FROM_STRING) -add_definitions(-DQT_USE_QSTRINGBUILDER) -add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) install( FILES akonadiconsole.renamecategories akonadiconsole.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) add_subdirectory(src)
  15. Download patch autotests/jobtrackertest.h

    --- 4:18.08.3-3/autotests/jobtrackertest.h 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/autotests/jobtrackertest.h 2019-06-24 05:05:09.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2017-2019 Montel Laurent <montel@kde.org> Copyright (c) 2017 David Faure <faure@kde.org> This program is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ class JobTrackerTest : public QObject public: explicit JobTrackerTest(QObject *parent = nullptr); ~JobTrackerTest(); -private slots: +private Q_SLOTS: void initTestCase(); void shouldBeEmpty(); void shouldDisplayOneJob();
  16. Download patch autotests/jobtrackersearchwidgettest.cpp

    --- 4:18.08.3-3/autotests/jobtrackersearchwidgettest.cpp 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/autotests/jobtrackersearchwidgettest.cpp 2019-06-24 05:05:09.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2017-2019 Montel Laurent <montel@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as
  17. Download patch .gitignore

    --- 4:18.08.3-3/.gitignore 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/.gitignore 2019-06-24 05:05:09.000000000 +0000 @@ -16,6 +16,6 @@ Doxyfile Makefile avail random_seed -/build/ +/build*/ CMakeLists.txt.user* *.unc-backup*
  18. Download patch autotests/jobtrackertest.cpp

    --- 4:18.08.3-3/autotests/jobtrackertest.cpp 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/autotests/jobtrackertest.cpp 2019-06-24 05:05:09.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2017-2019 Montel Laurent <montel@kde.org> Copyright (c) 2017 David Faure <faure@kde.org> This program is free software; you can redistribute it and/or modify it @@ -28,9 +28,9 @@ static QString intPairListToString(const QString ret; for (const auto &pair : arg) { if (!ret.isEmpty()) { - ret += ' '; + ret += QLatin1Char(' '); } - ret += QString::number(pair.first) + ',' + QString::number(pair.second); + ret += QString::number(pair.first) + QLatin1Char(',') + QString::number(pair.second); } return ret; } @@ -47,7 +47,7 @@ JobTrackerTest::~JobTrackerTest() void JobTrackerTest::initTestCase() { // Don't interfere with a running akonadiconsole - Akonadi::Instance::setIdentifier("jobtrackertest"); + Akonadi::Instance::setIdentifier(QStringLiteral("jobtrackertest")); qRegisterMetaType<QList<QPair<int, int>>>(); } @@ -63,17 +63,17 @@ void JobTrackerTest::shouldDisplayOneJob { // GIVEN JobTracker tracker("jobtracker"); - const QString jobName("job1"); + const QString jobName(QStringLiteral("job1")); QSignalSpy spyAboutToAdd(&tracker, &JobTracker::aboutToAdd); QSignalSpy spyUpdated(&tracker, &JobTracker::updated); // WHEN - tracker.jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + tracker.jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); // THEN QCOMPARE(tracker.sessions().count(), 1); QCOMPARE(tracker.sessions().at(0), QStringLiteral("session1")); - QCOMPARE(tracker.idForSession("session1"), -2); + QCOMPARE(tracker.idForSession(QStringLiteral("session1")), -2); QCOMPARE(tracker.sessionForId(-2), QStringLiteral("session1")); QCOMPARE(tracker.parentId(-2), -1); QCOMPARE(tracker.jobCount(-2), 1); @@ -97,8 +97,8 @@ void JobTrackerTest::shouldHandleJobStar { // GIVEN JobTracker tracker("jobtracker"); - const QString jobName("job1"); - tracker.jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + const QString jobName(QStringLiteral("job1")); + tracker.jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); tracker.signalUpdates(); QSignalSpy spyAdded(&tracker, &JobTracker::added); QSignalSpy spyUpdated(&tracker, &JobTracker::updated); @@ -120,15 +120,15 @@ void JobTrackerTest::shouldHandleJobEnd( { // GIVEN JobTracker tracker("jobtracker"); - const QString jobName("job1"); - tracker.jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + const QString jobName(QStringLiteral("job1")); + tracker.jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); tracker.jobStarted(jobName); tracker.signalUpdates(); QSignalSpy spyAdded(&tracker, &JobTracker::added); QSignalSpy spyUpdated(&tracker, &JobTracker::updated); // WHEN - tracker.jobEnded("job1", "errorString"); + tracker.jobEnded(QStringLiteral("job1"), QStringLiteral("errorString")); // THEN QCOMPARE(tracker.info(42).state, JobInfo::Failed);
  19. Download patch src/akonadibrowsermodel.cpp

    --- 4:18.08.3-3/src/akonadibrowsermodel.cpp 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/akonadibrowsermodel.cpp 2019-06-24 05:05:09.000000000 +0000 @@ -101,6 +101,7 @@ public: } const KMime::Message::Ptr mail = item.payload<KMime::Message::Ptr>(); + // NOTE: remember to update AkonadiBrowserSortModel::lessThan if you insert/move columns switch (column) { case 0: if (mail->subject()) { @@ -179,7 +180,7 @@ public: CalendarState() { m_collectionHeaders << QStringLiteral("Collection"); - m_itemHeaders << QStringLiteral("Summary") << QStringLiteral("DateTime start") << QStringLiteral("DateTime End") << QStringLiteral("Type"); + m_itemHeaders << QStringLiteral("UID") << QStringLiteral("Summary") << QStringLiteral("DateTime start") << QStringLiteral("DateTime End") << QStringLiteral("Type"); } virtual ~CalendarState() {} @@ -193,19 +194,18 @@ public: return QVariant(); } const IncidencePtr incidence = item.payload<IncidencePtr>(); + // NOTE: remember to update AkonadiBrowserSortModel::lessThan if you insert/move columns switch (column) { case 0: - return incidence->summary(); - break; + return incidence->uid(); case 1: - return incidence->dtStart().toString(); - break; + return incidence->summary(); case 2: - return incidence->dateTime(KCalCore::Incidence::RoleEnd).toString(); - break; + return incidence->dtStart().toString(); case 3: + return incidence->dateTime(KCalCore::Incidence::RoleEnd).toString(); + case 4: return incidence->typeStr(); - break; default: break; } @@ -352,7 +352,7 @@ AkonadiBrowserSortModel::~AkonadiBrowser bool AkonadiBrowserSortModel::lessThan(const QModelIndex &left, const QModelIndex &right) const { if (mBrowserModel->itemDisplayMode() == AkonadiBrowserModel::CalendarMode) { - if (left.column() == 1 || left.column() == 2) { + if (left.column() == 2 || left.column() == 3) { const Item leftItem = left.data(EntityTreeModel::ItemRole).value<Item>(); const Item rightItem = right.data(EntityTreeModel::ItemRole).value<Item>(); if (!leftItem.hasPayload<IncidencePtr>() || !rightItem.hasPayload<IncidencePtr>()) {
  20. Download patch src/jobtrackerfilterproxymodel.h

    --- 4:18.08.3-3/src/jobtrackerfilterproxymodel.h 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/jobtrackerfilterproxymodel.h 2019-06-24 05:05:09.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2017-2019 Montel Laurent <montel@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as
  21. Download patch debian/watch

    --- 4:18.08.3-3/debian/watch 2019-10-16 17:05:22.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/watch 2019-07-23 17:53:25.000000000 +0000 @@ -1,2 +1,3 @@ -version=4 -opts=pgpsigurlmangle=s/$/.sig/ https://download.kde.org/stable/applications/([\d.]+)/src/@PACKAGE@-([\d.]+).tar.xz +version=3 +http://download.kde.org/stable/applications/([\d.]+)/src/akonadiconsole-([\d.]+).tar.xz +http://download.kde.org/unstable/applications/([\d.]+)/src/akonadiconsole-([\d.]+).tar.xz
  22. Download patch src/monitorswidget.cpp

    --- 4:18.08.3-3/src/monitorswidget.cpp 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/monitorswidget.cpp 2019-06-24 05:05:09.000000000 +0000 @@ -175,16 +175,12 @@ void MonitorsWidget::onSubscriberSelecte appendRow(ifsItem, QStringLiteral("Fetch RID"), toString(ifs.fetchRemoteIdentification())); appendRow(ifsItem, QStringLiteral("Fetch Tags"), toString(ifs.fetchTags())); - auto tfsItem = new QStandardItem(QStringLiteral("Tag Fetch Scope")); - populateTagFetchScope(tfsItem, ifs.tagFetchScope()); - model->appendRow(ifsItem); - const auto cfs = subscriber.collectionFetchScope(); auto cfsItem = new QStandardItem(QStringLiteral("Collection Fetch Scope")); populateCollectionFetchScope(cfsItem, cfs); auto tagScope = new QStandardItem(QStringLiteral("Tag Fetch Scope")); - populateTagFetchScope(tagScope, ifs.tagFetchScope()); + populateTagFetchScope(tagScope, subscriber.tagFetchScope()); model->appendRow(tagScope); mSubscriberView->expandAll();
  23. Download patch src/jobtrackerfilterproxymodel.cpp

    --- 4:18.08.3-3/src/jobtrackerfilterproxymodel.cpp 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/jobtrackerfilterproxymodel.cpp 2019-06-24 05:05:09.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2017-2019 Montel Laurent <montel@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as
  24. Download patch src/agentwidget.cpp

    --- 4:18.08.3-3/src/agentwidget.cpp 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/agentwidget.cpp 2019-06-24 05:05:09.000000000 +0000 @@ -29,6 +29,7 @@ #include <AkonadiCore/AgentFilterProxyModel> #include <AkonadiCore/agentinstancecreatejob.h> #include <AkonadiWidgets/controlgui.h> +#include <AkonadiWidgets/AgentConfigurationDialog> #include <KLocalizedString> #include <KMessageBox> @@ -113,6 +114,18 @@ AgentWidget::AgentWidget(QWidget *parent mSyncMenu = new QMenu(QStringLiteral("Synchronize"), this); mSyncMenu->addAction(QStringLiteral("Synchronize All"), this, &AgentWidget::synchronizeAgent); mSyncMenu->addAction(QStringLiteral("Synchronize Collection Tree"), this, &AgentWidget::synchronizeTree); + mSyncMenu->addAction(QStringLiteral("Synchronize Tags"), this, [this]() { + const AgentInstance::List list = ui.instanceWidget->selectedAgentInstances(); + for (auto agent : list) { + agent.synchronizeTags(); + } + }); + mSyncMenu->addAction(QStringLiteral("Synchronize Relations"), this, [this]() { + const auto list = ui.instanceWidget->selectedAgentInstances(); + for (auto agent : list) { + agent.synchronizeRelations(); + } + }); mSyncMenu->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh"))); ui.syncButton->setMenu(mSyncMenu); ui.syncButton->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh"))); @@ -209,7 +222,9 @@ void AgentWidget::configureAgent() { AgentInstance agent = ui.instanceWidget->currentAgentInstance(); if (agent.isValid()) { - agent.configure(this); + QPointer<AgentConfigurationDialog> dlg = new AgentConfigurationDialog(agent, this); + dlg->exec(); + delete dlg; } } @@ -295,19 +310,17 @@ void AgentWidget::showChangeNotification void AgentWidget::synchronizeTree() { const AgentInstance::List list = ui.instanceWidget->selectedAgentInstances(); - if (!list.isEmpty()) - for (AgentInstance agent : list) { - agent.synchronizeCollectionTree(); - } + for (AgentInstance agent : list) { + agent.synchronizeCollectionTree(); + } } void AgentWidget::abortAgent() { const AgentInstance::List list = ui.instanceWidget->selectedAgentInstances(); - if (!list.isEmpty()) - for (const AgentInstance &agent : list) { - agent.abortCurrentTask(); - } + for (const AgentInstance &agent : list) { + agent.abortCurrentTask(); + } } void AgentWidget::restartAgent()
  25. Download patch src/jobtrackersearchwidget.cpp

    --- 4:18.08.3-3/src/jobtrackersearchwidget.cpp 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/jobtrackersearchwidget.cpp 2019-06-24 05:05:09.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2017-2019 Montel Laurent <montel@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as @@ -27,7 +27,7 @@ JobTrackerSearchWidget::JobTrackerSearch { QHBoxLayout *mainLayout = new QHBoxLayout(this); mainLayout->setObjectName(QStringLiteral("mainlayout")); - mainLayout->setMargin(0); + mainLayout->setContentsMargins(0, 0, 0, 0); mSearchLineEdit = new QLineEdit(this); mSearchLineEdit->setObjectName(QStringLiteral("searchline"));
  26. Download patch src/browserwidget.cpp

    --- 4:18.08.3-3/src/browserwidget.cpp 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/browserwidget.cpp 2019-06-24 05:05:09.000000000 +0000 @@ -45,10 +45,10 @@ #include <AkonadiWidgets/entitytreeview.h> #include <AkonadiWidgets/etmviewstatesaver.h> #include <AkonadiCore/favoritecollectionsmodel.h> -#include <AkonadiCore/quotacolorproxymodel.h> #include <AkonadiCore/tagmodel.h> #include <AkonadiCore/statisticsproxymodel.h> #include <AkonadiCore/tagdeletejob.h> +#include <AkonadiCore/TagFetchScope> #include <AkonadiXml/XmlWriteJob> #include <kviewstatemaintainer.h> @@ -166,11 +166,8 @@ BrowserWidget::BrowserWidget(KXmlGuiWind statisticsProxyModel->setToolTipEnabled(true); statisticsProxyModel->setSourceModel(collectionFilter); - Akonadi::QuotaColorProxyModel *quotaProxyModel = new Akonadi::QuotaColorProxyModel(this); - quotaProxyModel->setWarningThreshold(50.0); - quotaProxyModel->setSourceModel(statisticsProxyModel); - mCollectionView->setModel(quotaProxyModel); + mCollectionView->setModel(statisticsProxyModel); Akonadi::SelectionProxyModel *selectionProxyModel = new Akonadi::SelectionProxyModel(mCollectionView->selectionModel(), this); selectionProxyModel->setSourceModel(mBrowserModel); @@ -199,7 +196,6 @@ BrowserWidget::BrowserWidget(KXmlGuiWind itemUi.modelBox->addItem(QStringLiteral("Generic")); itemUi.modelBox->addItem(QStringLiteral("Mail")); itemUi.modelBox->addItem(QStringLiteral("Contacts")); - itemUi.modelBox->addItem(QStringLiteral("Calendar")); itemUi.modelBox->addItem(QStringLiteral("Calendar/Tasks")); connect(itemUi.modelBox, static_cast<void (KComboBox::*)(int)>(&KComboBox::activated), this, &BrowserWidget::modelChanged); QTimer::singleShot(0, this, &BrowserWidget::modelChanged); @@ -207,11 +203,10 @@ BrowserWidget::BrowserWidget(KXmlGuiWind itemUi.itemView->setXmlGuiClient(xmlGuiWindow); itemUi.itemView->setModel(sortModel); itemUi.itemView->setSelectionMode(QAbstractItemView::ExtendedSelection); - connect(itemUi.itemView, &Akonadi::EntityTreeView::activated, this, &BrowserWidget::itemActivated); - connect(itemUi.itemView, SIGNAL(clicked(QModelIndex)), SLOT(itemActivated(QModelIndex))); + connect(itemUi.itemView->selectionModel(), &QItemSelectionModel::currentChanged, this, &BrowserWidget::currentChanged); splitter3->addWidget(itemViewParent); - itemViewParent->layout()->setMargin(0); + itemViewParent->layout()->setContentsMargins(0, 0, 0, 0); QWidget *contentViewParent = new QWidget(this); contentUi.setupUi(contentViewParent); @@ -293,7 +288,7 @@ void BrowserWidget::clear() contentUi.attrView->setModel(nullptr); } -void BrowserWidget::itemActivated(const QModelIndex &index) +void BrowserWidget::currentChanged(const QModelIndex &index) { const Item item = index.sibling(index.row(), 0).data(EntityTreeModel::ItemRole).value< Item >(); if (!item.isValid()) { @@ -305,6 +300,9 @@ void BrowserWidget::itemActivated(const job->fetchScope().fetchFullPayload(); job->fetchScope().fetchAllAttributes(); job->fetchScope().setFetchTags(true); + auto &tfs = job->fetchScope().tagFetchScope(); + tfs.setFetchIdOnly(false); + tfs.fetchAllAttributes(); connect(job, &ItemFetchJob::result, this, &BrowserWidget::itemFetchDone); }
  27. Download patch debian/docs

    --- 4:18.08.3-3/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/docs 2019-07-23 17:53:25.000000000 +0000 @@ -0,0 +1 @@ +
  28. Download patch src/org.kde.akonadiconsole.desktop

    --- 4:18.08.3-3/src/org.kde.akonadiconsole.desktop 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/org.kde.akonadiconsole.desktop 2019-06-24 05:05:09.000000000 +0000 @@ -1,7 +1,6 @@ [Desktop Entry] Name=Akonadi Console Name[ar]=معراض أكونادي -Name[ast]=Consola d'Akonadi Name[ca]=Consola de l'Akonadi Name[ca@valencia]=Consola de l'Akonadi Name[cs]=Konzole Akonadi @@ -37,7 +36,6 @@ Icon=akonadiconsole Type=Application Comment=Akonadi Management and Debugging Console Comment[ar]=معراض لإدارة وتنقيح «أكونادي» -Comment[ast]=Consola de depuración y xestión d'Akonadi Comment[ca]=Consola de gestió i depuració per a l'Akonadi Comment[ca@valencia]=Consola de gestió i depuració per a l'Akonadi Comment[cs]=Správa Akonadi a ladicí konzole
  29. Download patch autotests/jobtrackersearchwidgettest.h

    --- 4:18.08.3-3/autotests/jobtrackersearchwidgettest.h 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/autotests/jobtrackersearchwidgettest.h 2019-06-24 05:05:09.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2017-2019 Montel Laurent <montel@kde.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as
  30. Download patch autotests/jobtrackermodeltest.h

    --- 4:18.08.3-3/autotests/jobtrackermodeltest.h 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/autotests/jobtrackermodeltest.h 2019-06-24 05:05:09.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2017-2019 Montel Laurent <montel@kde.org> Copyright (c) 2017 David Faure <faure@kde.org> This program is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ class JobTrackerModelTest : public QObje public: explicit JobTrackerModelTest(QObject *parent = nullptr); ~JobTrackerModelTest(); -private slots: +private Q_SLOTS: void initTestCase(); void shouldBeEmpty(); void shouldDisplayOneJob();
  31. Download patch src/connectionpage.cpp

    --- 4:18.08.3-3/src/connectionpage.cpp 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/connectionpage.cpp 2019-06-24 05:05:09.000000000 +0000 @@ -60,6 +60,7 @@ ConnectionPage::ConnectionPage(const QSt mDataView->setModel(mFilterModel); mDataView->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont)); mDataView->horizontalHeader()->setStretchLastSection(true); + mDataView->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); layout->addWidget(mDataView);
  32. Download patch src/notificationfiltermodel.cpp

    --- 4:18.08.3-3/src/notificationfiltermodel.cpp 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/notificationfiltermodel.cpp 2019-06-24 05:05:09.000000000 +0000 @@ -16,7 +16,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "notificationfiltermodel.h"
  33. Download patch src/CMakeLists.txt

    --- 4:18.08.3-3/src/CMakeLists.txt 2018-10-26 05:58:48.000000000 +0000 +++ 4:19.04.3-0ubuntu1/src/CMakeLists.txt 2019-06-24 05:05:09.000000000 +0000 @@ -1,9 +1,6 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) -add_definitions(-DQT_NO_CAST_FROM_ASCII) -add_definitions(-DQT_NO_CAST_TO_ASCII) - add_subdirectory(icons) add_subdirectory(kconf_update)
  34. Download patch debian/copyright
  1. akonadiconsole