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: kf5-messagelib

kf5-messagelib (4:19.04.3-0ubuntu1) eoan; urgency=medium * New upstream release (19.04.3) * Update symbols from build logs. -- Rik Mills <rikmills@kubuntu.org> Tue, 23 Jul 2019 18:56:54 +0100 kf5-messagelib (4:18.12.3-0ubuntu3) eoan; urgency=medium * Make _ZN9QHashData9hasShrunkEv symbol optional to prevent build failures -- José Manuel Santamaría Lema <panfaust@gmail.com> Sun, 14 Jul 2019 12:46:03 +0100 kf5-messagelib (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:47:47 +0100 kf5-messagelib (4:18.12.3-0ubuntu1) disco; urgency=medium * Update symbols. * New upstream release (18.12.3) -- Rik Mills <rikmills@kubuntu.org> Sat, 16 Mar 2019 15:07:16 +0000 kf5-messagelib (4:18.04.3-0ubuntu4) disco; urgency=medium * Follow Debian dropping of autotests. -- Rik Mills <rikmills@kubuntu.org> Wed, 06 Feb 2019 19:50:04 +0000 kf5-messagelib (4:18.04.3-0ubuntu3) cosmic; urgency=medium * Sync some debian unstable changes: - Update watch file. - Update lintian overrides. - Update upstream metadata. - Update debian/copyright. -- Rik Mills <rikmills@kubuntu.org> Sun, 26 Aug 2018 13:21:48 +0100 kf5-messagelib (4:18.04.3-0ubuntu2) cosmic; urgency=medium * Skip autotests for now. Upstream release tars and CI tests are consistently broken, so running them here has little or no worth unless that changes. -- Rik Mills <rikmills@kubuntu.org> Sat, 25 Aug 2018 14:28:32 +0100 kf5-messagelib (4:18.04.3-0ubuntu1) cosmic; urgency=medium [ Walter Lapchynski ] * Removing MISSING symbols. [ Rik Mills ] * New upstream release (18.03.80) * debian/patches: Drop upstream applied patches * Update symbols * New upstream release (18.04.0) * New upstream release (18.04.1) * New upstream release (18.04.3) [ Simon Quigley ] * Bump sonames with the Debian ABI Manager due to binary incompatible changes: - libkf5mimetreeparser5abi2 -> libkf5mimetreeparser5abi3 - libkf5messageviewer5abi4 -> libkf5messageviewer5abi5 -- Rik Mills <rikmills@kubuntu.org> Tue, 21 Aug 2018 18:55:07 +0100 kf5-messagelib (4:17.12.3-0ubuntu5) cosmic; urgency=medium * Add upstream patrch to fix build with Qt 5.11 * Update symbols for Qt 5.11 -- Rik Mills <rikmills@kubuntu.org> Fri, 20 Jul 2018 05:58:08 +0100 kf5-messagelib (4:17.12.3-0ubuntu4) cosmic; urgency=medium * Skip tests on architectures we do not support -- Rik Mills <rikmills@kubuntu.org> Fri, 18 May 2018 18:21:06 +0100 kf5-messagelib (4:17.12.3-0ubuntu3) bionic; urgency=medium * Add upstream_fix_includes_*.diff in order to fix acc test * Add libgrantlee5-dev to libkf5messageviewer-dev depends, so we fix the acc autopkgtest -- José Manuel Santamaría Lema <panfaust@gmail.com> Tue, 27 Mar 2018 18:44:39 +0100 kf5-messagelib (4:17.12.3-0ubuntu2) bionic; urgency=medium * Disable unreliable acc header test -- Rik Mills <rikmills@kubuntu.org> Sat, 17 Mar 2018 07:56:59 +0000 kf5-messagelib (4:17.12.3-0ubuntu1) bionic; urgency=medium * New upstream release (17.12.3) -- Rik Mills <rikmills@kubuntu.org> Fri, 16 Mar 2018 13:33:44 +0000 kf5-messagelib (4:17.12.2-0ubuntu2) bionic; urgency=medium * Add unreliable showonlymimeparttest to kubuntu_disable_failing_tests patch -- Rik Mills <rikmills@kubuntu.org> Thu, 01 Mar 2018 15:01:11 +0000 kf5-messagelib (4:17.12.2-0ubuntu1) bionic; urgency=medium [ Rik Mills ] * Update symbols from build logs * Update install files * Refresh patches * New upstream release (17.11.80) * New upstream release (17.11.90) * New upstream release (17.12.0) * New upstream release (17.12.2) * Update symbols from build logs [ Clive Johnston ] * Refresh kubuntu_disable_failing_tests.diff patch [ Simon Quigley ] * Update symbols from build logs. * Bump sonames with the Debian ABI Manager due to binary incompatible changes: - libkf5mimetreeparser5abi1 -> libkf5mimetreeparser5abi2 [ Clive Johnston ] * Bump sonames with the Debian ABI Manager due to binary incompatible changes: - libkf5messageviewer5abi3 -> libkf5messageviewer5abi4 * Update symbols from amd64 buildlog following abi bump -- Rik Mills <rikmills@kubuntu.org> Wed, 28 Feb 2018 09:46:05 +0000 kf5-messagelib (4:17.08.3-0ubuntu2) bionic; urgency=medium * Rebuild against new qtbase ABI 5.9.3. -- Gianfranco Costamagna <locutusofborg@debian.org> Mon, 18 Dec 2017 19:44:38 +0100 kf5-messagelib (4:17.08.3-0ubuntu1) bionic; urgency=medium * Bump sonames with debianabimanager due to binary incompatible changes: - libkf5webengineviewer5abi2 -> libkf5webengineviewer5abi3 - libkf5messageviewer5abi2 -> libkf5messageviewer5abi3 - libkf5messagecore5abi1 -> libkf5messagecore5abi2 - libkf5templateparser5abi1 -> libkf5templateparser5abi2 * Update symbols from build logs * Refresh patches * New build depend on libkf5contacteditor-dev * Mark as optional a symbol gone with GCC 7 * New upstream release (17.08.3) -- Rik Mills <rikmills@kubuntu.org> Fri, 01 Dec 2017 15:13:18 +0000 kf5-messagelib (4:17.04.3-0ubuntu1) artful; urgency=medium [ Rik Mills ] * Bump sonames with debianabimanager due to binary incompatible changes: - libkf5messagecomposer5abi1 -> libkf5messagecomposer5abi2 - libkf5templateparser5 -> libkf5templateparser5abi1 - libkf5webengineviewer5abi1 -> libkf5webengineviewer5abi2 - libkf5mimetreeparser5 -> libkf5mimetreeparser5abi1 - libkf5messageviewer5abi1 -> libkf5messageviewer5abi2 * Refresh patches * Update symbols from build logs for GCC7 and Qt 5.9 [ José Manuel Santamaría Lema ] * New upstream release (17.04.1) * Refresh enable_debian_abi_manager.diff * Update symbols, removing some leaked private ones. * Install locale files (cherry-pick from Neon) * Add Breaks/Replaces against kde-l10n (cherry-pick from Neon) * Refresh and extend kubuntu_disable_gpgagent_tests.diff to cover the templateparser tests. * 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:33:10 +0100 kf5-messagelib (4:16.12.3-0ubuntu1) artful; urgency=medium [ José Manuel Santamaría Lema ] * Update Vcs-Git fields to use https:// instead of git:// * Pass '-fno-keep-inline-functions' to gcc in the acc test in order to avoid possible spurious test failures. * Handle ABI breaks: libkf5webengineviewer5 -> libkf5webengineviewer5abi1 libkf5messageviewer5 -> libkf5messageviewer5abi1 libkf5messagelist5 -> libkf5messagelist5abi1 libkf5messagecore5 -> libkf5messagecore5abi1 libkf5messagecomposer5 -> libkf5messagecomposer5abi1 * Update symbols files for new binary packages: - libkf5mimetreeparser5 * Add libkf5messageviewer-plugins package * Update -dev packages unsing the acc test, also add a couple of files to libkf5messagecomposer-dev.acc.in so the acc test won't fail. * Add kubuntu_disable_gpgagent_tests.diff * Replace oxygen5-icon-theme autopkgtest depend with breeze-icon- theme. * Add kubuntu_disable_failing_tests.diff * New upstream release (16.12.3) [ Rik Mills ] * New build depend on libkf5syntaxhighlighting-dev * Update install files * Multi-archify & update descriptions * Lintian overrides on source-is-missing webengineviewer * Update gpgme build depends * New upstream release (16.12.0) * Update QtWebEngine and QtWebChannel dependency dev package names to match debian packaging * New upstream release (16.12.1) [ Clive Johnston ] * New build depend on qtbase5-private-dev, thanks to Raymond at KDE Neon for pointing this out. [ Darin Miller ] * New upstream release (16.12.2) -- José Manuel Santamaría Lema <panfaust@gmail.com> Mon, 01 May 2017 20:27:51 +0100 kf5-messagelib (4:16.04.3-0ubuntu1) yakkety; urgency=medium ** SNAPSHOT build @755b204350bffafa7b03a314a3b7e616126ec9c7 ** [ Maximiliano Curia ] ** SNAPSHOT build @cbaf86e9e443a3ef0469738b91e61ba59e7c0789 ** * Initial release. * Update symbols files. * Add dependency needed to fulfill the message composer cmake file [ Automatic packaging ] * Update symbols files. * Update symbols files. [ Clive Johnston ] * New upstream release, bugfix 16.04.1 * Sync with Debian for initial packaging * Update VCS fields to point to Launchpad git repo * Adding breaks/replaces for libkf5messageviewer5 * Adding version to breaks and replaces mentioned above * New upstream release (16.04.2) * New upstream release (16.04.3) * Refreshing symbols and removing MISSING [ Rik Mills ] * Build deps on libqt5webchannel-dev & libqt5webengine5-dev * Add library packages for libkf5webengineviewer and libkf5mimetreeparser and generate symbols * Refresh existing symbols * Fix spelling error reported by lintian * Multi-archify libkf5templateparser5 * New build depend on qtpositioning5-dev * Fix & remove merge markers -- José Manuel Santamaría Lema <panfaust@gmail.com> Fri, 30 Sep 2016 06:32:13 +0200

Modifications :
  1. Download patch messagecomposer/autotests/messagefactoryngtest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/messagefactoryngtest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/messagefactoryngtest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2010 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com Copyright (c) 2010 Leo Franchi <lfranchi@kde.org> - Copyright (C) 2017-2018 Laurent Montel <montel@kde.org> + Copyright (C) 2017-2019 Laurent Montel <montel@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by @@ -643,7 +643,6 @@ void MessageFactoryTest::testCreateRedir // qDebug() << rdir->encodedContent(); - QRegExp rx(QString::fromLatin1("Resent-Message-ID: ([^\n]*)")); rx.indexIn(QString::fromLatin1(rdir->head())); @@ -841,7 +840,7 @@ void MessageFactoryTest::testCreateMDN() QString mdnContent = QString::fromLatin1("The message sent on %1 to %2 with subject \"%3\" has been displayed. " "This is no guarantee that the message has been read or understood."); - mdnContent = mdnContent.arg(KMime::DateFormatter::formatDate(KMime::DateFormatter::Localized, msg->date()->dateTime().toTime_t())) + mdnContent = mdnContent.arg(KMime::DateFormatter::formatDate(KMime::DateFormatter::Localized, msg->date()->dateTime().toSecsSinceEpoch())) .arg(msg->to()->asUnicodeString()).arg(msg->subject()->asUnicodeString()); //qDebug() << "comparing with:" << mdnContent; @@ -914,7 +913,8 @@ void MessageFactoryTest::test_multipartA QTest::addColumn<QString>("expected"); QDir dir(QStringLiteral(MAIL_DATA_DIR)); - foreach (const QString &file, dir.entryList(QStringList(QLatin1String("plain_message.mbox")), QDir::Files | QDir::Readable | QDir::NoSymLinks)) { + const QStringList lst = dir.entryList(QStringList(QLatin1String("plain_message.mbox")), QDir::Files | QDir::Readable | QDir::NoSymLinks); + for (const QString &file : lst) { QTest::newRow(file.toLatin1().constData()) << QString(dir.path() + QLatin1Char('/') + file) << 0 << "" <<"> This *is* the *message* text *from* Sudhendu Kumar<dontspamme@yoohoo.com>\n" "> \n"
  2. Download patch .krazy

    --- 4:18.08.3-3/.krazy 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/.krazy 2019-07-10 05:29:18.000000000 +0000 @@ -0,0 +1 @@ +SKIP /theme/
  3. Download patch debian/libkf5messagelist5abi1.symbols
  4. Download patch debian/kf5-messagelib-data.install

    --- 4:18.08.3-3/debian/kf5-messagelib-data.install 2018-05-28 11:38:11.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/kf5-messagelib-data.install 2019-07-23 17:56:54.000000000 +0000 @@ -1,7 +1,6 @@ etc/xdg/messagelib.categories etc/xdg/messagelib.renamecategories etc/xdg/messageviewer_header_themes.knsrc -usr/share/org.kde.syntax-highlighting/syntax/kmail-template.xml usr/share/config.kcfg/customtemplates_kfg.kcfg usr/share/config.kcfg/templatesconfiguration_kfg.kcfg usr/share/kconf_update/messageviewer.upd @@ -10,3 +9,4 @@ usr/share/libmessageviewer/ usr/share/locale/ usr/share/messagelist/ usr/share/messageviewer/ +usr/share/org.kde.syntax-highlighting/syntax/kmail-template.xml
  5. Download patch debian/libkf5messageviewer5abi5.symbols
  6. Download patch messagecomposer/src/attachment/attachmentmodel.cpp

    --- 4:18.08.3-3/messagecomposer/src/attachment/attachmentmodel.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/attachment/attachmentmodel.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -277,7 +277,7 @@ QVariant AttachmentModel::data(const QMo part->name().isEmpty() ? part->fileName() : part->name(), KFormat().formatByteSize(part->size()), KMime::nameForEncoding(part->encoding()), - QString::fromAscii(part->mimeType().data()))); + QString::fromLatin1(part->mimeType().data()))); } else if (role == Qt::CheckStateRole) { switch (index.column()) { case CompressColumn:
  7. Download patch messagecomposer/autotests/setupenv.h

    --- 4:18.08.3-3/messagecomposer/autotests/setupenv.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/setupenv.h 2019-07-10 05:29:18.000000000 +0000 @@ -18,8 +18,8 @@ 02110-1301, USA. */ -#ifndef MESSAGECORE_TESTS_UTIL_H -#define MESSAGECORE_TESTS_UTIL_H +#ifndef MESSAGECORE_TESTS_SETUPENV_H +#define MESSAGECORE_TESTS_SETUPENV_H #include <gpgme++/key.h>
  8. Download patch messagecomposer/src/helper/messagefactoryng.h

    --- 4:18.08.3-3/messagecomposer/src/helper/messagefactoryng.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/helper/messagefactoryng.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2010 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com Copyright (c) 2010 Leo Franchi <lfranchi@kde.org> - Copyright (C) 2017-2018 Laurent Montel <montel@kde.org> + Copyright (C) 2017-2019 Laurent Montel <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 as published by @@ -99,8 +99,7 @@ public: user, mail is not changed and the reply-to field is set to the email address of the original sender. */ - Q_REQUIRED_RESULT KMime::Message::Ptr createRedirect(const QString &toStr, const QString &ccStr = QString(), const QString &bccStr = QString(), int transportId = -1, - const QString &fcc = QString(), int identity = -1); + Q_REQUIRED_RESULT KMime::Message::Ptr createRedirect(const QString &toStr, const QString &ccStr = QString(), const QString &bccStr = QString(), int transportId = -1, const QString &fcc = QString(), int identity = -1); Q_REQUIRED_RESULT KMime::Message::Ptr createResend(); @@ -121,8 +120,7 @@ public: @return The notification message or 0, if none should be sent, as well as the state of the MDN operation. **/ - Q_REQUIRED_RESULT KMime::Message::Ptr createMDN(KMime::MDN::ActionMode a, KMime::MDN::DispositionType d, KMime::MDN::SendingMode s, int mdnQuoteOriginal = 0, - const QVector<KMime::MDN::DispositionModifier> &m = QVector<KMime::MDN::DispositionModifier>()); + Q_REQUIRED_RESULT KMime::Message::Ptr createMDN(KMime::MDN::ActionMode a, KMime::MDN::DispositionType d, KMime::MDN::SendingMode s, int mdnQuoteOriginal = 0, const QVector<KMime::MDN::DispositionModifier> &m = QVector<KMime::MDN::DispositionModifier>()); /** * Create a new forwarded MIME digest. If the user is trying to forward multiple messages
  9. Download patch messagecomposer/autotests/composerviewbasetest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/composerviewbasetest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/composerviewbasetest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2014-2018 Montel Laurent <montel@kde.org> + Copyright (c) 2014-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 @@ -16,7 +16,7 @@ */ #include "composerviewbasetest.h" -#include <qtest.h> +#include <QTest> #include "../src/composer/composerviewbase.h" ComposerViewBaseTest::ComposerViewBaseTest(QObject *parent)
  10. Download patch debian/libkf5messageviewer-plugins.install

    --- 4:18.08.3-3/debian/libkf5messageviewer-plugins.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5messageviewer-plugins.install 2019-07-23 17:56:54.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/qt5/plugins/messageviewer/grantlee/5.0/messageviewer_grantlee_extension.so +usr/lib/*/qt5/plugins/messageviewer/messageviewer_defaultgrantleeheaderstyleplugin.so
  11. Download patch messagecomposer/src/followupreminder/followupreminderselectdatedialog.cpp

    --- 4:18.08.3-3/messagecomposer/src/followupreminder/followupreminderselectdatedialog.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/followupreminder/followupreminderselectdatedialog.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2014-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 @@ -67,16 +67,16 @@ FollowUpReminderSelectDateDialog::Follow topLayout->addWidget(mainWidget); topLayout->addWidget(buttonBox); QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget); - mainLayout->setMargin(0); + mainLayout->setContentsMargins(0, 0, 0, 0); QFormLayout *formLayout = new QFormLayout; - formLayout->setMargin(0); + formLayout->setContentsMargins(0, 0, 0, 0); mainLayout->addLayout(formLayout); d->mDateComboBox = new KDateComboBox; + QDate currentDate = QDate::currentDate().addDays(1); d->mDateComboBox->setMinimumDate(QDate::currentDate()); d->mDateComboBox->setObjectName(QStringLiteral("datecombobox")); - QDate currentDate = QDate::currentDate(); d->mDateComboBox->setDate(currentDate); formLayout->addRow(i18n("Date:"), d->mDateComboBox); @@ -125,7 +125,7 @@ Akonadi::Collection FollowUpReminderSele void FollowUpReminderSelectDateDialog::accept() { const QDate date = selectedDate(); - if (date <= QDate::currentDate()) { + if (date < QDate::currentDate()) { KMessageBox::error(this, i18n("The selected date must be greater than the current date."), i18n("Invalid date")); return; }
  12. Download patch messagecomposer/autotests/utiltest.h

    --- 4:18.08.3-3/messagecomposer/autotests/utiltest.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/utiltest.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,6 +1,6 @@ /* Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com> - Copyright (C) 2017-2018 Laurent Montel <montel@kde.org> + Copyright (C) 2017-2019 Laurent Montel <montel@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by
  13. Download patch debian/rules

    --- 4:18.08.3-3/debian/rules 2019-10-06 20:43:54.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/rules 2019-07-23 17:56:54.000000000 +0000 @@ -1,31 +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/dpkg/pkg-info.mk -include /usr/share/dpkg/default.mk 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 -libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages) -include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk - -AbiVirtualPackageVersion = $(call dpkg_late_eval,AbiVirtualPackageVersion,echo '${DEB_VERSION_UPSTREAM}' | sed -e 's/\.[0-9]\+$$//') -pkgs_lib = $(filter-out %-dev %-doc %-dbg %-data %-bin %-plugins,$(filter lib%,$(shell dh_listpackages))) - -override_dh_makeshlibs: - for pkg in $(pkgs_lib); do \ - name=$$( echo "$${pkg}" | sed -e 's/abi[0-9]\+\s*//'); \ - echo "ABI:VirtualPackage=$${name}-${AbiVirtualPackageVersion}" >> debian/$${pkg}.substvars; \ - $(overridden_command) -p$${pkg} -V "$${pkg} (>= $(DEB_VERSION_EPOCH_UPSTREAM)), $${name}-${AbiVirtualPackageVersion}"; \ - done override_dh_auto_test: -# The tests do not run successfully on mipsel for buster and it seems, -# that it is a RAM issue as the tests are anyways flaky, -# disable the tests for now. (hefee - 20190301) -ifeq ($(DEB_HOST_ARCH), mipsel) - echo "tests disabled for mipsel" -else - - xvfb-run -a --server-args="-screen 0 1024x768x24 +extension GLX" --\ - dh_auto_test --no-parallel -endif + # Disable dh_auto_test at build time + :
  14. Download patch debian/libkf5messageviewer5abi5.lintian-overrides

    --- 4:18.08.3-3/debian/libkf5messageviewer5abi5.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5messageviewer5abi5.lintian-overrides 2019-07-23 17:56:54.000000000 +0000 @@ -0,0 +1 @@ +libkf5messageviewer5abi5: symbols-declares-dependency-on-other-package libkf5messageviewer-plugins
  15. Download patch messagecomposer/src/followupreminder/followupreminderselectdatedialog.h

    --- 4:18.08.3-3/messagecomposer/src/followupreminder/followupreminderselectdatedialog.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/followupreminder/followupreminderselectdatedialog.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2014-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
  16. Download patch messagecomposer/autotests/textparttest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/textparttest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/textparttest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2014-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 @@ -18,7 +18,7 @@ */ #include "textparttest.h" -#include <qtest.h> +#include <QTest> #include <../src/part/textpart.h> TextPartTest::TextPartTest(QObject *parent) : QObject(parent)
  17. Download patch messagecomposer/src/composer/signaturecontroller.cpp

    --- 4:18.08.3-3/messagecomposer/src/composer/signaturecontroller.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/composer/signaturecontroller.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -40,9 +40,9 @@ public: { } - MessageComposer::RichTextComposerNg *m_editor = nullptr; - KIdentityManagement::IdentityCombo *m_identityCombo = nullptr; uint m_currentIdentityId = 0; + KIdentityManagement::IdentityCombo *m_identityCombo = nullptr; + MessageComposer::RichTextComposerNg *m_editor = nullptr; }; SignatureController::SignatureController(QObject *parent)
  18. Download patch messagecomposer/src/composer/keyresolver.cpp

    --- 4:18.08.3-3/messagecomposer/src/composer/keyresolver.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/composer/keyresolver.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -55,7 +55,7 @@ #include <Akonadi/Contact/ContactSearchJob> #include <KLocalizedString> #include "messagecomposer_debug.h" -#include <qinputdialog.h> +#include <QInputDialog> #include <kmessagebox.h> #include <QStringList> @@ -646,8 +646,7 @@ struct Q_DECL_HIDDEN Kleo::KeyResolver:: ContactPreferencesMap mContactPreferencesMap; }; -Kleo::KeyResolver::KeyResolver(bool encToSelf, bool showApproval, bool oppEncryption, unsigned int f, int encrWarnThresholdKey, int signWarnThresholdKey, int encrWarnThresholdRootCert, - int signWarnThresholdRootCert, int encrWarnThresholdChainCert, int signWarnThresholdChainCert) +Kleo::KeyResolver::KeyResolver(bool encToSelf, bool showApproval, bool oppEncryption, unsigned int f, int encrWarnThresholdKey, int signWarnThresholdKey, int encrWarnThresholdRootCert, int signWarnThresholdRootCert, int encrWarnThresholdChainCert, int signWarnThresholdChainCert) : mEncryptToSelf(encToSelf) , mShowApprovalDialog(showApproval) , mOpportunisticEncyption(oppEncryption) @@ -1501,7 +1500,7 @@ void Kleo::KeyResolver::collapseAllSplit SplitInfo &si = v.front(); for (std::vector<SplitInfo>::const_iterator it = v.begin() + 1; it != v.end(); ++it) { si.keys.insert(si.keys.end(), it->keys.begin(), it->keys.end()); - qCopy(it->recipients.begin(), it->recipients.end(), std::back_inserter(si.recipients)); + std::copy(it->recipients.begin(), it->recipients.end(), std::back_inserter(si.recipients)); } v.resize(1); } @@ -1731,12 +1730,12 @@ std::vector<GpgME::Key> Kleo::KeyResolve QPointer<Kleo::KeySelectionDialog> dlg = new Kleo::KeySelectionDialog( - i18n("Encryption Key Selection"), - msg, KEmailAddress::extractEmailAddress(person), selectedKeys, - Kleo::KeySelectionDialog::ValidEncryptionKeys - & ~(opgp ? 0 : Kleo::KeySelectionDialog::OpenPGPKeys) - & ~(x509 ? 0 : Kleo::KeySelectionDialog::SMIMEKeys), - true, true); // multi-selection and "remember choice" box + i18n("Encryption Key Selection"), + msg, KEmailAddress::extractEmailAddress(person), selectedKeys, + Kleo::KeySelectionDialog::ValidEncryptionKeys + & ~(opgp ? 0 : Kleo::KeySelectionDialog::OpenPGPKeys) + & ~(x509 ? 0 : Kleo::KeySelectionDialog::SMIMEKeys), + true, true); // multi-selection and "remember choice" box if (dlg->exec() != QDialog::Accepted) { delete dlg;
  19. Download patch messagecomposer/src/composer/composerviewbase.cpp
  20. Download patch messagecomposer/autotests/attachmentjobtest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/attachmentjobtest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/attachmentjobtest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -21,7 +21,7 @@ #include "qtest_messagecomposer.h" #include <QDebug> -#include <qtest.h> +#include <QTest> #include <kmime/kmime_content.h> #include <kmime/kmime_headers.h> @@ -32,7 +32,7 @@ using namespace KMime; #include <MessageComposer/AttachmentJob> using namespace MessageComposer; -#include <MessageCore/AttachmentFromUrlJob> +//#include "messagecore/attachmentfromfolderjob.h" #include <MessageCore/AttachmentPart> using namespace MessageCore;
  21. Download patch messagecomposer/src/CMakeLists.txt

    --- 4:18.08.3-3/messagecomposer/src/CMakeLists.txt 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/CMakeLists.txt 2019-07-10 05:29:18.000000000 +0000 @@ -11,6 +11,8 @@ endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR}/part) +configure_file(config-messagecomposer.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-messagecomposer.h) + set( messagecomposer_job_src job/jobbase.cpp job/contentjobbase.cpp @@ -123,7 +125,10 @@ set(messagecomposer_plugineditorconvertt plugineditorconverttext/plugineditorconverterinitialdata.cpp plugineditorconverttext/plugineditorconverterbeforeconvertingdata.cpp ) - +set(messagecomposer_plugineditorgrammar_SRCS + plugineditorgrammar/plugineditorgrammarmanager.cpp + plugineditorgrammar/plugineditorgrammarcustomtoolsviewinterface.cpp + ) set( messagecomposer_src ${messagecomposer_plugineditorconverttext_SRCS} @@ -140,6 +145,7 @@ set( messagecomposer_src ${messagecomposer_sender_src} ${messagecomposer_followupreminder_SRCS} ${messagecomposer_plugineditorcheckbeforesend_SRCS} + ${messagecomposer_plugineditorgrammar_SRCS} utils/util.cpp settings/messagecomposersettings.cpp ) @@ -248,6 +254,15 @@ ecm_generate_headers(MessageComposer_Cam RELATIVE plugineditorconverttext ) +ecm_generate_headers(MessageComposer_Camelplugineditorgrammar_HEADERS + HEADER_NAMES + PluginEditorGrammarManager + PluginEditorGrammarCustomToolsViewInterface + REQUIRED_HEADERS MessageComposer_plugineditorgrammar_HEADERS + PREFIX MessageComposer + RELATIVE plugineditorgrammar + ) + ecm_generate_headers(MessageComposer_Camelplugineditorcheckbeforesend_HEADERS HEADER_NAMES @@ -350,7 +365,6 @@ ecm_generate_headers(MessageComposer_Cam HEADER_NAMES Recipient RecipientsEditor - DistributionListDialog RecipientLine REQUIRED_HEADERS MessageComposer_recipient_HEADERS PREFIX MessageComposer @@ -411,6 +425,7 @@ install(FILES ${MessageComposer_Camelcasejob_HEADERS} ${MessageComposer_Camelcaseattachement_HEADERS} ${MessageComposer_Camelplugineditor_HEADERS} + ${MessageComposer_Camelplugineditorgrammar_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/MessageComposer COMPONENT Devel ) @@ -436,6 +451,7 @@ install(FILES ${MessageComposer_job_HEADERS} ${MessageComposer_plugineditor_HEADERS} ${MessageComposer_plugineditorcheckbeforesend_HEADERS} + ${MessageComposer_plugineditorgrammar_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/messagecomposer COMPONENT Devel
  22. Download patch debian/libkf5templateparser5.install

    --- 4:18.08.3-3/debian/libkf5templateparser5.install 2018-03-08 23:09:38.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5templateparser5.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/*/libKF5TemplateParser.so.5 -usr/lib/*/libKF5TemplateParser.so.5.*
  23. 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:56:54.000000000 +0000 @@ -0,0 +1 @@ +9
  24. Download patch messagecomposer/autotests/maintextjobtest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/maintextjobtest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/maintextjobtest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -23,7 +23,7 @@ #include <QStandardPaths> #include <QDebug> -#include <qtest.h> +#include <QTest> #include <kmime/kmime_content.h> using namespace KMime;
  25. Download patch debian/libkf5mimetreeparser5abi1.install

    --- 4:18.08.3-3/debian/libkf5mimetreeparser5abi1.install 2018-09-13 10:27:12.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5mimetreeparser5abi1.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libKF5MimeTreeParser.so.5*
  26. Download patch messagecomposer/autotests/infoparttest.h

    --- 4:18.08.3-3/messagecomposer/autotests/infoparttest.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/infoparttest.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2014-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
  27. Download patch messagecomposer/src/followupreminder/followupremindercreatejob.cpp

    --- 4:18.08.3-3/messagecomposer/src/followupreminder/followupremindercreatejob.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/followupreminder/followupremindercreatejob.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2014-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 @@ -89,7 +89,7 @@ void FollowupReminderCreateJob::start() if (d->mCollection.isValid()) { KCalCore::Todo::Ptr todo(new KCalCore::Todo); todo->setSummary(i18n("Wait answer from \"%1\" send to \"%2\"", d->mInfo->subject(), d->mInfo->to())); - todo->setDtDue(QDateTime(d->mInfo->followUpReminderDate(), QTime(0,0,0))); + todo->setDtDue(QDateTime(d->mInfo->followUpReminderDate(), QTime(0, 0, 0))); Akonadi::Item newTodoItem; newTodoItem.setMimeType(KCalCore::Todo::todoMimeType()); newTodoItem.setPayload<KCalCore::Todo::Ptr>(todo);
  28. Download patch messagecomposer/src/composer-ng/richtextcomposersignatures.h

    --- 4:18.08.3-3/messagecomposer/src/composer-ng/richtextcomposersignatures.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/composer-ng/richtextcomposersignatures.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2015-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
  29. Download patch messagecomposer/src/composer-ng/richtextcomposerng.h

    --- 4:18.08.3-3/messagecomposer/src/composer-ng/richtextcomposerng.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/composer-ng/richtextcomposerng.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2015-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 @@ -22,6 +22,7 @@ #include "messagecomposer_export.h" #include <kpimtextedit/richtextcomposer.h> +#include <MessageComposer/PluginEditorConvertTextInterface> #include <KIdentityManagement/Signature> namespace PimCommon { @@ -51,7 +52,7 @@ public: void forceAutoCorrection(bool selectedText = false) override; - Q_REQUIRED_RESULT virtual bool convertPlainText(MessageComposer::TextPart *textPart); + Q_REQUIRED_RESULT virtual MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus convertPlainText(MessageComposer::TextPart *textPart); private: bool processAutoCorrection(QKeyEvent *event) override;
  30. Download patch messagecomposer/autotests/globalparttest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/globalparttest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/globalparttest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2014-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 @@ -18,7 +18,7 @@ */ #include "globalparttest.h" -#include <qtest.h> +#include <QTest> #include <../src/part/globalpart.h> GlobalPartTest::GlobalPartTest(QObject *parent) : QObject(parent) @@ -37,6 +37,7 @@ void GlobalPartTest::shouldHaveDefaultVa QVERIFY(!globalpart.isFallbackCharsetEnabled()); QVERIFY(!globalpart.is8BitAllowed()); QVERIFY(!globalpart.MDNRequested()); + QVERIFY(!globalpart.requestDeleveryConfirmation()); } QTEST_MAIN(GlobalPartTest)
  31. Download patch debian/control
  32. Download patch debian/libkf5messagelist-dev.acc.in

    --- 4:18.08.3-3/debian/libkf5messagelist-dev.acc.in 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5messagelist-dev.acc.in 2019-07-23 17:56:54.000000000 +0000 @@ -0,0 +1,24 @@ +<?xml version='1.0' encoding='utf-8'?> +<descriptor> + +<version> + 16.04.0 +</version> + +<headers> + /usr/include/KF5/MessageList/ + /usr/include/KF5/messagelist/ + /usr/include/KF5/messagelist_version.h +</headers> + +<libs> + /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5MessageList.so +</libs> + +<gcc_options> + -fPIC + -std=c++11 + -fno-keep-inline-functions +</gcc_options> + +</descriptor> \ No newline at end of file
  33. Download patch debian/libkf5messagelist5abi1.install

    --- 4:18.08.3-3/debian/libkf5messagelist5abi1.install 2018-09-13 10:27:12.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5messagelist5abi1.install 2019-07-23 17:56:54.000000000 +0000 @@ -1 +1,2 @@ -usr/lib/*/libKF5MessageList.so.5* +usr/lib/*/libKF5MessageList.so.5.* +usr/lib/*/libKF5MessageList.so.5abi1
  34. Download patch debian/libkf5messagecore5abi2.symbols
  35. Download patch debian/libkf5messageviewer5abi5.install

    --- 4:18.08.3-3/debian/libkf5messageviewer5abi5.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5messageviewer5abi5.install 2019-07-23 17:56:54.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libKF5MessageViewer.so.5.* +usr/lib/*/libKF5MessageViewer.so.5abi5
  36. Download patch debian/libkf5messageviewer5abi1.install

    --- 4:18.08.3-3/debian/libkf5messageviewer5abi1.install 2018-09-13 10:27:12.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5messageviewer5abi1.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/lib/*/libKF5MessageViewer.so.5* -usr/lib/*/qt5/plugins/messageviewer/messageviewer_defaultgrantleeheaderstyleplugin.so -usr/lib/*/qt5/plugins/messageviewer/grantlee/5.0/messageviewer_grantlee_extension.so
  37. Download patch messagecomposer/src/composer-ng/richtextcomposersignatures.cpp

    --- 4:18.08.3-3/messagecomposer/src/composer-ng/richtextcomposersignatures.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/composer-ng/richtextcomposersignatures.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2015-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
  38. Download patch messagecomposer/autotests/composerviewbasetest.h

    --- 4:18.08.3-3/messagecomposer/autotests/composerviewbasetest.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/composerviewbasetest.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2014-2018 Montel Laurent <montel@kde.org> + Copyright (c) 2014-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
  39. Download patch debian/libkf5webengineviewer5abi3.install

    --- 4:18.08.3-3/debian/libkf5webengineviewer5abi3.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5webengineviewer5abi3.install 2019-07-23 17:56:54.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libKF5WebEngineViewer.so.5.* +usr/lib/*/libKF5WebEngineViewer.so.5abi3
  40. Download patch debian/libkf5templateparser-dev.acc.in

    --- 4:18.08.3-3/debian/libkf5templateparser-dev.acc.in 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5templateparser-dev.acc.in 2019-07-23 17:56:54.000000000 +0000 @@ -0,0 +1,24 @@ +<?xml version='1.0' encoding='utf-8'?> +<descriptor> + +<version> + 16.04.0 +</version> + +<headers> + /usr/include/KF5/TemplateParser/ + /usr/include/KF5/templateparser/ + /usr/include/KF5/templateparser_version.h +</headers> + +<libs> + /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5TemplateParser.so +</libs> + +<gcc_options> + -fPIC + -std=c++11 + -fno-keep-inline-functions +</gcc_options> + +</descriptor> \ No newline at end of file
  41. Download patch CMakeLists.txt

    --- 4:18.08.3-3/CMakeLists.txt 2018-11-06 00:22:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/CMakeLists.txt 2019-07-10 13:57:38.000000000 +0000 @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.9.3") +cmake_minimum_required(VERSION 3.5) +set(PIM_VERSION "5.11.3") if (POLICY CMP0053) cmake_policy(SET CMP0053 NEW) @@ -10,37 +10,38 @@ project(Messagelib VERSION ${PIM_VERSION option(MIMETREEPARSER_ONLY_BUILD "Build only mimetreeparser" FALSE) option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE) +option(DKIM_CHECKER_BUILD "DKIM CHECKER (experimental)" FALSE) -set(KF5_VERSION "5.47.0") +set(KF5_MIN_VERSION "5.56.0") set(MESSAGELIB_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.9.3") +set(AKONADIMIME_LIB_VERSION "5.11.3") -set(QT_REQUIRED_VERSION "5.9.0") +set(QT_REQUIRED_VERSION "5.10.0") -set(AKONADI_VERSION "5.9.3") -set(GRANTLEETHEME_LIB_VERSION "5.9.3") -set(GRAVATAR_LIB_VERSION "5.9.3") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.9.3") -set(KCONTACTS_LIB_VERSION "5.9.3") -set(KDEPIM_APPS_LIB_VERSION "5.9.3") -set(KLDAP_LIB_VERSION "5.9.3") -set(KMAILTRANSPORT_LIB_VERSION "5.9.3") -set(KMBOX_LIB_VERSION "5.9.3") -set(KMIME_LIB_VERSION "5.9.3") -set(KPIMTEXTEDIT_LIB_VERSION "5.9.3") -set(LIBKDEPIM_LIB_VERSION "5.9.3") -set(LIBKLEO_LIB_VERSION "5.9.3") -set(PIMCOMMON_LIB_VERSION "5.9.3") +set(AKONADI_VERSION "5.11.3") +set(GRANTLEETHEME_LIB_VERSION "5.11.3") +set(GRAVATAR_LIB_VERSION "5.11.3") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.11.3") +set(KCONTACTS_LIB_VERSION "5.11.3") +set(KDEPIM_APPS_LIB_VERSION "5.11.3") +set(KLDAP_LIB_VERSION "5.11.3") +set(KMAILTRANSPORT_LIB_VERSION "5.11.3") +set(KMBOX_LIB_VERSION "5.11.3") +set(KMIME_LIB_VERSION "5.11.3") +set(KPIMTEXTEDIT_LIB_VERSION "5.11.3") +set(LIBKDEPIM_LIB_VERSION "5.11.3") +set(LIBKLEO_LIB_VERSION "5.11.3") +set(PIMCOMMON_LIB_VERSION "5.11.3") set(GPGME_LIB_VERSION "1.8.0") -set(AKONADI_CONTACT_VERSION "5.9.3") +set(AKONADI_CONTACT_VERSION "5.11.3") if (${MIMETREEPARSER_ONLY_BUILD}) set(ECM_VERSION "5.26.0") set(KMIME_LIB_VERSION "5.1.40") else() - set(ECM_VERSION ${KF5_VERSION}) + set(ECM_VERSION ${KF5_MIN_VERSION}) endif() find_package(ECM ${ECM_VERSION} CONFIG REQUIRED) @@ -50,41 +51,41 @@ include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMGeneratePriFile) -include(CMakePackageConfigHelpers) + include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) include(ECMAddTests) -include(ECMCoverageOption) + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Gui Test) -find_package(KF5Codecs ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) +find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) find_package(QGpgme ${GPGME_LIB_VERSION} CONFIG REQUIRED) if (NOT ${MIMETREEPARSER_ONLY_BUILD}) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Network PrintSupport WebEngine WebEngineWidgets) - find_package(KF5Archive ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5ConfigWidgets ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5JobWidgets ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5Service ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5Sonnet ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5TextWidgets ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5WindowSystem ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5SyntaxHighlighting ${KF5_VERSION} CONFIG REQUIRED) - find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED) + find_package(KF5Archive ${KF5_MIN_VERSION} CONFIG 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(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED) + find_package(KF5ItemViews ${KF5_MIN_VERSION} CONFIG REQUIRED) + find_package(KF5JobWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) + find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED) + find_package(KF5Service ${KF5_MIN_VERSION} CONFIG REQUIRED) + find_package(KF5Sonnet ${KF5_MIN_VERSION} CONFIG REQUIRED) + find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) + find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) + find_package(KF5WindowSystem ${KF5_MIN_VERSION} CONFIG REQUIRED) + find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED) + find_package(KF5SyntaxHighlighting ${KF5_MIN_VERSION} CONFIG REQUIRED) + find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(Grantlee5 "5.1" CONFIG REQUIRED) @@ -106,36 +107,18 @@ if (NOT ${MIMETREEPARSER_ONLY_BUILD}) find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5SendLater ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED) - find_package(KF5AkonadiSearch "5.9.3" CONFIG REQUIRED) + find_package(KF5AkonadiSearch "5.11.3" CONFIG REQUIRED) set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi") endif() -# Support for the GIT revision number in messagecomposer-version.h -if(EXISTS "${Messagelib_SOURCE_DIR}/.git") - find_package(Git) - if(GIT_FOUND) - execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD - WORKING_DIRECTORY ${Messagelib_SOURCE_DIR} - OUTPUT_VARIABLE messagelib_git_revision) - string(REGEX REPLACE "\n" "" messagelib_git_revision "${messagelib_git_revision}") - set(messagelib_git_revision "git-${messagelib_git_revision}") - - execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --oneline --format=%ci - WORKING_DIRECTORY ${Messagelib_SOURCE_DIR} - OUTPUT_VARIABLE messagelib_git_last_change) - string(REGEX REPLACE " [-0-9:+ ]*\n" "" messagelib_git_last_change "${messagelib_git_last_change}") - endif() -endif () - -add_definitions(-DQT_NO_URL_CAST_FROM_STRING) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x000000) +#add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) if(BUILD_TESTING) add_definitions(-DBUILD_TESTING) endif() -add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) + add_subdirectory(mimetreeparser) if (NOT ${MIMETREEPARSER_ONLY_BUILD}) add_subdirectory(messageviewer)
  42. Download patch messagecomposer/src/composer/keyresolver.h

    --- 4:18.08.3-3/messagecomposer/src/composer/keyresolver.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/composer/keyresolver.h 2019-07-10 05:29:18.000000000 +0000 @@ -68,7 +68,7 @@ enum Result { \section Step 2: Lookup and check per-recipient crypto preferences / Opportunistic Encryption First, \c checkSigningPreferences() goes through all recipient's - signing perferences, to determine whether or not to sign. It also + signing preferences, to determine whether or not to sign. It also takes into account the available signing keys and whether or not the user explicitly requested signing. @@ -107,7 +107,7 @@ enum Result { iterating over the available message formats and retrieving the set of signing keys to use with a call to \c signingKeys(). - \section Step 5: Get encrytion key sets. + \section Step 5: Get encryption key sets. If after key resolving, encryption is still requested and apparently possible, you can get the result of all this by @@ -129,8 +129,7 @@ enum Result { class KeyResolver { public: - KeyResolver(bool encToSelf, bool showApproval, bool oppEncryption, unsigned int format, int encrKeyNearExpiryThresholdDays, int signKeyNearExpiryThresholdDays, - int encrRootCertNearExpiryThresholdDays, int signRootCertNearExpiryThresholdDays, int encrChainCertNearExpiryThresholdDays, int signChainCertNearExpiryThresholdDays); + KeyResolver(bool encToSelf, bool showApproval, bool oppEncryption, unsigned int format, int encrKeyNearExpiryThresholdDays, int signKeyNearExpiryThresholdDays, int encrRootCertNearExpiryThresholdDays, int signRootCertNearExpiryThresholdDays, int encrChainCertNearExpiryThresholdDays, int signChainCertNearExpiryThresholdDays); ~KeyResolver(); @@ -256,8 +255,7 @@ private: Kleo::Result resolveEncryptionKeys(bool signingRequested, bool &finalySendUnencrypted); Kleo::Result resolveSigningKeysForEncryption(); Kleo::Result resolveSigningKeysForSigningOnly(); - Kleo::Result checkKeyNearExpiry(const GpgME::Key &key, const char *dontAskAgainName, bool mine, bool sign, bool ca = false, int recurse_limit = 100, - const GpgME::Key &orig_key = GpgME::Key::null) const; + Kleo::Result checkKeyNearExpiry(const GpgME::Key &key, const char *dontAskAgainName, bool mine, bool sign, bool ca = false, int recurse_limit = 100, const GpgME::Key &orig_key = GpgME::Key::null) const; void collapseAllSplitInfos(); void addToAllSplitInfos(const std::vector<GpgME::Key> &keys, unsigned int formats); void addKeys(const std::vector<Item> &items, CryptoMessageFormat f);
  43. Download patch messagecomposer/autotests/signjobtest.h

    --- 4:18.08.3-3/messagecomposer/autotests/signjobtest.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/signjobtest.h 2019-07-10 05:29:18.000000000 +0000 @@ -18,8 +18,8 @@ 02110-1301, USA. */ -#ifndef SIGNJOBJOBTEST_H -#define SIGNJOBJOBTEST_H +#ifndef SIGNJOBTEST_H +#define SIGNJOBTEST_H #include <QObject>
  44. Download patch messagecomposer/autotests/signjobtest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/signjobtest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/signjobtest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -21,7 +21,7 @@ #include "signjobtest.h" #include <QDebug> -#include <qtest.h> +#include <QTest> #include "qtest_messagecomposer.h" #include "cryptofunctions.h"
  45. Download patch messagecomposer/autotests/cryptocomposertest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/cryptocomposertest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/cryptocomposertest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -332,7 +332,7 @@ void CryptoComposerTest::testSignEncrypt QCOMPARE(message->to()->asUnicodeString(), QString::fromLocal8Bit("you@you.you")); // now check the attachment separately - QCOMPARE(QString::fromAscii(MessageCore::NodeHelper::nextSibling(b)->body()), QString::fromAscii("abc")); + QCOMPARE(QString::fromLatin1(MessageCore::NodeHelper::nextSibling(b)->body()), QString::fromLatin1("abc")); } void CryptoComposerTest::testBCCEncrypt_data()
  46. Download patch .gitignore

    --- 4:18.08.3-3/.gitignore 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/.gitignore 2019-07-10 05:29:18.000000000 +0000 @@ -16,6 +16,6 @@ Doxyfile Makefile avail random_seed -/build/ +/build*/ CMakeLists.txt.user* *.unc-backup*
  47. Download patch debian/libkf5messagecomposer5abi2.symbols
  48. Download patch debian/libkf5mimetreeparser5abi3.symbols
  49. Download patch messagecomposer/autotests/singlepartjobtest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/singlepartjobtest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/singlepartjobtest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -20,7 +20,7 @@ #include "singlepartjobtest.h" #include <QDebug> -#include <qtest.h> +#include <QTest> #include <kmime/kmime_content.h> using namespace KMime;
  50. Download patch messagecomposer/autotests/plugineditorcheckbeforesendparamstest.h

    --- 4:18.08.3-3/messagecomposer/autotests/plugineditorcheckbeforesendparamstest.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/plugineditorcheckbeforesendparamstest.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2018 Laurent Montel <montel@kde.org> + Copyright (C) 2016-2019 Laurent Montel <montel@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public
  51. Download patch debian/libkf5templateparser5abi2.install

    --- 4:18.08.3-3/debian/libkf5templateparser5abi2.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5templateparser5abi2.install 2019-07-23 17:56:54.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libKF5TemplateParser.so.5.* +usr/lib/*/libKF5TemplateParser.so.5abi2
  52. Download patch messagecomposer/autotests/infoparttest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/infoparttest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/infoparttest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2014-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 @@ -19,7 +19,7 @@ #include "infoparttest.h" #include "../src/part/infopart.h" -#include <qtest.h> +#include <QTest> InfoPartTest::InfoPartTest(QObject *parent) : QObject(parent) {
  53. Download patch messagecomposer/autotests/multipartjobtest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/multipartjobtest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/multipartjobtest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -20,7 +20,7 @@ #include "multipartjobtest.h" #include <QDebug> -#include <qtest.h> +#include <QTest> #include <kmime/kmime_content.h> using namespace KMime;
  54. Download patch messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.cpp

    --- 4:18.08.3-3/messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2016-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
  55. Download patch messagecomposer/autotests/encryptjobtest.h

    --- 4:18.08.3-3/messagecomposer/autotests/encryptjobtest.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/encryptjobtest.h 2019-07-10 05:29:18.000000000 +0000 @@ -18,8 +18,8 @@ 02110-1301, USA. */ -#ifndef ENCRYPTJOBJOBTEST_H -#define ENCRYPTJOBJOBTEST_H +#ifndef ENCRYPTJOBTEST_H +#define ENCRYPTJOBTEST_H #include <QObject>
  56. Download patch messagecomposer/src/composer-ng/richtextcomposerng.cpp

    --- 4:18.08.3-3/messagecomposer/src/composer-ng/richtextcomposerng.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/composer-ng/richtextcomposerng.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2015-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 @@ -22,7 +22,7 @@ #include <kpimtextedit/richtextcomposerimages.h> #include "richtextcomposersignatures.h" #include <pimcommon/autocorrection.h> - +#include <QDebug> #include <part/textpart.h> #include "settings/messagecomposersettings.h" #include <grantlee/markupdirector.h> @@ -34,8 +34,7 @@ class MessageComposer::RichTextComposerN { public: RichTextComposerNgPrivate(RichTextComposerNg *q) - : autoCorrection(nullptr) - , richtextComposer(q) + : richtextComposer(q) { richTextComposerSignatures = new MessageComposer::RichTextComposerSignatures(richtextComposer, richtextComposer); } @@ -155,40 +154,58 @@ void RichTextComposerNgPrivate::fixHtmlF } } -bool RichTextComposerNg::convertPlainText(MessageComposer::TextPart *textPart) +MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus RichTextComposerNg::convertPlainText(MessageComposer::TextPart *textPart) { - return false; + Q_UNUSED(textPart); + return MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus::NotConverted; } +#define USE_CONVERTER_PLUGIN 1 void RichTextComposerNg::fillComposerTextPart(MessageComposer::TextPart *textPart) { + bool wasConverted = +#ifdef USE_CONVERTER_PLUGIN + convertPlainText(textPart) == MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus::Converted; +#else + false; +#endif if (composerControler()->isFormattingUsed()) { - if (!convertPlainText(textPart)) { - if (MessageComposer::MessageComposerSettings::self()->improvePlainTextOfHtmlMessage()) { - Grantlee::PlainTextMarkupBuilder *pb = new Grantlee::PlainTextMarkupBuilder(); - - Grantlee::MarkupDirector *pmd = new Grantlee::MarkupDirector(pb); - pmd->processDocument(document()); - const QString plainText = pb->getResult(); - textPart->setCleanPlainText(composerControler()->toCleanPlainText(plainText)); - QTextDocument *doc = new QTextDocument(plainText); - doc->adjustSize(); - - textPart->setWrappedPlainText(composerControler()->toWrappedPlainText(doc)); - delete doc; - delete pmd; - delete pb; - } else { - textPart->setCleanPlainText(composerControler()->toCleanPlainText()); - textPart->setWrappedPlainText(composerControler()->toWrappedPlainText()); - } +#ifdef USE_CONVERTER_PLUGIN + if (!wasConverted) { +#endif + if (MessageComposer::MessageComposerSettings::self()->improvePlainTextOfHtmlMessage()) { + Grantlee::PlainTextMarkupBuilder *pb = new Grantlee::PlainTextMarkupBuilder(); + + Grantlee::MarkupDirector *pmd = new Grantlee::MarkupDirector(pb); + pmd->processDocument(document()); + const QString plainText = pb->getResult(); + textPart->setCleanPlainText(composerControler()->toCleanPlainText(plainText)); + QTextDocument *doc = new QTextDocument(plainText); + doc->adjustSize(); + + textPart->setWrappedPlainText(composerControler()->toWrappedPlainText(doc)); + delete doc; + delete pmd; + delete pb; + } else { + textPart->setCleanPlainText(composerControler()->toCleanPlainText()); + textPart->setWrappedPlainText(composerControler()->toWrappedPlainText()); } +#ifdef USE_CONVERTER_PLUGIN + } +#endif } else { +#ifdef USE_CONVERTER_PLUGIN + if (!wasConverted) { +#endif textPart->setCleanPlainText(composerControler()->toCleanPlainText()); textPart->setWrappedPlainText(composerControler()->toWrappedPlainText()); +#ifdef USE_CONVERTER_PLUGIN + } +#endif } textPart->setWordWrappingEnabled(lineWrapMode() == QTextEdit::FixedColumnWidth); - if (composerControler()->isFormattingUsed()) { + if (composerControler()->isFormattingUsed() && !wasConverted) { QString cleanHtml = d->toCleanHtml(); d->fixHtmlFontSize(cleanHtml); textPart->setCleanHtml(cleanHtml); @@ -358,7 +375,7 @@ void RichTextComposerNg::insertSignature // We added the text of the signature above, now it is time to add the images as well. if (signature.isInlinedHtml()) { - foreach (const KIdentityManagement::Signature::EmbeddedImagePtr &image, signature.embeddedImages()) { + for (const KIdentityManagement::Signature::EmbeddedImagePtr &image : signature.embeddedImages()) { composerControler()->composerImages()->loadImage(image->image, image->name, image->name); } }
  57. Download patch debian/libkf5webengineviewer5abi1.install

    --- 4:18.08.3-3/debian/libkf5webengineviewer5abi1.install 2018-09-13 10:27:12.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5webengineviewer5abi1.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libKF5WebEngineViewer.so.5*
  58. Download patch debian/libkf5messagecore5abi2.install

    --- 4:18.08.3-3/debian/libkf5messagecore5abi2.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5messagecore5abi2.install 2019-07-23 17:56:54.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libKF5MessageCore.so.5.* +usr/lib/*/libKF5MessageCore.so.5abi2
  59. Download patch debian/libkf5messageviewer-dev.acc.in

    --- 4:18.08.3-3/debian/libkf5messageviewer-dev.acc.in 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5messageviewer-dev.acc.in 2019-07-23 17:56:54.000000000 +0000 @@ -0,0 +1,24 @@ +<?xml version='1.0' encoding='utf-8'?> +<descriptor> + +<version> + 16.04.0 +</version> + +<headers> + /usr/include/KF5/MessageViewer/ + /usr/include/KF5/messageviewer/ + /usr/include/KF5/messageviewer_version.h +</headers> + +<libs> + /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5MessageViewer.so +</libs> + +<gcc_options> + -fPIC + -std=c++11 + -fno-keep-inline-functions +</gcc_options> + +</descriptor> \ No newline at end of file
  60. Download patch messagecomposer/src/config-messagecomposer.h.cmake

    --- 4:18.08.3-3/messagecomposer/src/config-messagecomposer.h.cmake 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/config-messagecomposer.h.cmake 2019-07-10 05:29:18.000000000 +0000 @@ -1 +0,0 @@ -#cmakedefine KDEPIM_TEMPLATEPARSER_ASYNC_BUILD 1
  61. Download patch messagecomposer/src/composer/signaturecontroller.h

    --- 4:18.08.3-3/messagecomposer/src/composer/signaturecontroller.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/composer/signaturecontroller.h 2019-07-10 05:29:18.000000000 +0000 @@ -37,7 +37,7 @@ namespace MessageComposer { class RichTextComposerNg; /** Controls signature (the footer thing, not the crypto thing) operations - * happening on a KMEditor triggerd by identity selection or menu actions. + * happening on a KMEditor triggered by identity selection or menu actions. * @since 4.5 */ class SignatureControllerPrivate;
  62. Download patch messagecomposer/src/attachment/attachmentcontrollerbase.cpp
  63. Download patch debian/patches/series

    --- 4:18.08.3-3/debian/patches/series 2019-03-01 23:36:51.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/patches/series 2019-07-23 17:56:54.000000000 +0000 @@ -1,2 +1 @@ enable_debianabimanager.diff -exclude_refresh_from_metadata.patch
  64. Download patch messagecomposer/src/composer/composerviewbase.h

    --- 4:18.08.3-3/messagecomposer/src/composer/composerviewbase.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/composer/composerviewbase.h 2019-07-10 05:29:18.000000000 +0000 @@ -24,7 +24,6 @@ #include "messagecomposer_export.h" #include "messagecomposer/messagesender.h" #include "MessageComposer/Recipient" - #include <AkonadiCore/collection.h> #include <KMime/Message> @@ -170,7 +169,6 @@ public: * values are set before sending. */ void setFrom(const QString &from); - void setReplyTo(const QString &replyTo); void setSubject(const QString &subject); /** @@ -232,6 +230,9 @@ public: Q_REQUIRED_RESULT KMime::Message::Ptr msg() const; + bool requestDeleveryConfirmation() const; + void setRequestDeleveryConfirmation(bool requestDeleveryConfirmation); + public Q_SLOTS: void identityChanged(const KIdentityManagement::Identity &ident, const KIdentityManagement::Identity &oldIdent, bool msgCleared = false); @@ -348,9 +349,12 @@ private: bool m_neverEncrypt = false; bool m_mdnRequested = false; bool m_urgent = false; + bool m_requestDeleveryConfirmation = false; Kleo::CryptoMessageFormat m_cryptoMessageFormat; - QString mExpandedFrom, m_from, m_replyTo, m_subject; - QStringList mExpandedTo, mExpandedCc, mExpandedBcc; + QString mExpandedFrom; + QString m_from; + QString m_subject; + QStringList mExpandedTo, mExpandedCc, mExpandedBcc, mExpandedReplyTo; QList< QByteArray > m_charsets; QMap<QByteArray, QString> m_customHeader;
  65. Download patch messagecomposer/src/composer-ng/autotests/richtextcomposersignaturestest.cpp

    --- 4:18.08.3-3/messagecomposer/src/composer-ng/autotests/richtextcomposersignaturestest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/composer-ng/autotests/richtextcomposersignaturestest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2018 Montel Laurent <montel@kde.org> + Copyright (C) 2018-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 @@ -17,7 +17,6 @@ Boston, MA 02110-1301, USA. */ - #include "richtextcomposersignaturestest.h" #include "../richtextcomposerng.h" #include "../richtextcomposersignatures.h" @@ -29,7 +28,6 @@ QTEST_MAIN(RichTextComposerSignaturesTes RichTextComposerSignaturesTest::RichTextComposerSignaturesTest(QObject *parent) : QObject(parent) { - } void RichTextComposerSignaturesTest::shouldCleanSignature() @@ -52,7 +50,6 @@ void RichTextComposerSignaturesTest::sho richtextComposerNg.insertSignature(signature1, KIdentityManagement::Signature::Start, KIdentityManagement::Signature::AddNewLines); composerSignature->cleanWhitespace(signature2); - composerSignature->replaceSignature(signature1, signature2); QCOMPARE(richtextComposerNg.toPlainText(), QStringLiteral("\n\nbla Bla ")); @@ -61,7 +58,6 @@ void RichTextComposerSignaturesTest::sho composerSignature->replaceSignature(signature1, signature2); } QCOMPARE(richtextComposerNg.toPlainText(), QStringLiteral("\n\nbla Bla ")); - } void RichTextComposerSignaturesTest::shouldReplaceSignatureWhenText() @@ -85,7 +81,6 @@ void RichTextComposerSignaturesTest::sho richtextComposerNg.insertSignature(signature1, KIdentityManagement::Signature::End, KIdentityManagement::Signature::AddSeparator); composerSignature->cleanWhitespace(signature2); - composerSignature->replaceSignature(signature1, signature2); const QString result = QStringLiteral("foo\nbla\nfoo--\nbla Bla "); QCOMPARE(richtextComposerNg.toPlainText(), result); @@ -95,5 +90,4 @@ void RichTextComposerSignaturesTest::sho composerSignature->replaceSignature(signature1, signature2); } QCOMPARE(richtextComposerNg.toPlainText(), result); - }
  66. Download patch messagecomposer/autotests/followupreminderselectdatedialogtest.h

    --- 4:18.08.3-3/messagecomposer/autotests/followupreminderselectdatedialogtest.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/followupreminderselectdatedialogtest.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2014-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
  67. Download patch debian/libkf5messagecore-dev.acc.in

    --- 4:18.08.3-3/debian/libkf5messagecore-dev.acc.in 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5messagecore-dev.acc.in 2019-07-23 17:56:54.000000000 +0000 @@ -0,0 +1,24 @@ +<?xml version='1.0' encoding='utf-8'?> +<descriptor> + +<version> + 16.04.0 +</version> + +<headers> + /usr/include/KF5/MessageCore/ + /usr/include/KF5/messagecore/ + /usr/include/KF5/messagecore_version.h +</headers> + +<libs> + /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5MessageCore.so +</libs> + +<gcc_options> + -fPIC + -std=c++11 + -fno-keep-inline-functions +</gcc_options> + +</descriptor> \ No newline at end of file
  68. Download patch messagecomposer/src/helper/messagefactoryforwardjob.cpp

    --- 4:18.08.3-3/messagecomposer/src/helper/messagefactoryforwardjob.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/helper/messagefactoryforwardjob.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Laurent Montel <montel@kde.org> + Copyright (C) 2017-2019 Laurent Montel <montel@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -38,7 +38,7 @@ MessageFactoryForwardJob::~MessageFactor void MessageFactoryForwardJob::start() { - TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::Forward); + TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::Forward, this); connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &MessageFactoryForwardJob::slotParsingDone); parser->setIdentityManager(mIdentityManager); parser->setCharsets(MessageComposerSettings::self()->preferredCharsets());
  69. Download patch messagecomposer/src/composer-ng/autotests/richtextcomposersignaturestest.h

    --- 4:18.08.3-3/messagecomposer/src/composer-ng/autotests/richtextcomposersignaturestest.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/composer-ng/autotests/richtextcomposersignaturestest.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2018 Montel Laurent <montel@kde.org> + Copyright (C) 2018-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
  70. Download patch debian/libkf5mimetreeparser-dev.install

    --- 4:18.08.3-3/debian/libkf5mimetreeparser-dev.install 2018-05-28 11:38:11.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5mimetreeparser-dev.install 2019-07-23 17:56:54.000000000 +0000 @@ -1,5 +1,5 @@ usr/include/KF5/MimeTreeParser/ -usr/include/KF5/mimetreeparser +usr/include/KF5/mimetreeparser/ usr/include/KF5/mimetreeparser_version.h usr/lib/*/cmake/KF5MimeTreeParser/ usr/lib/*/libKF5MimeTreeParser.so
  71. Download patch debian/libkf5messagecomposer5abi2.install

    --- 4:18.08.3-3/debian/libkf5messagecomposer5abi2.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5messagecomposer5abi2.install 2019-07-23 17:56:54.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libKF5MessageComposer.so.5.* +usr/lib/*/libKF5MessageComposer.so.5abi2
  72. Download patch debian/libkf5mimetreeparser5abi3.install

    --- 4:18.08.3-3/debian/libkf5mimetreeparser5abi3.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5mimetreeparser5abi3.install 2019-07-23 17:56:54.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libKF5MimeTreeParser.so.5.* +usr/lib/*/libKF5MimeTreeParser.so.5abi3
  73. Download patch messagecomposer/autotests/textparttest.h

    --- 4:18.08.3-3/messagecomposer/autotests/textparttest.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/textparttest.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2014-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
  74. Download patch messagecomposer/src/helper/messagefactoryreplyjob.cpp

    --- 4:18.08.3-3/messagecomposer/src/helper/messagefactoryreplyjob.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/helper/messagefactoryreplyjob.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Laurent Montel <montel@kde.org> + Copyright (C) 2017-2019 Laurent Montel <montel@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -26,10 +26,6 @@ using namespace MessageComposer; MessageFactoryReplyJob::MessageFactoryReplyJob(QObject *parent) : QObject(parent) - , mMsg(nullptr) - , mOrigMsg(nullptr) - , mReplyAll(false) - , mIdentityManager(nullptr) { } @@ -39,7 +35,7 @@ MessageFactoryReplyJob::~MessageFactoryR void MessageFactoryReplyJob::start() { - TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, (mReplyAll ? TemplateParser::TemplateParserJob::ReplyAll : TemplateParser::TemplateParserJob::Reply)); + TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, (mReplyAll ? TemplateParser::TemplateParserJob::ReplyAll : TemplateParser::TemplateParserJob::Reply), this); connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &MessageFactoryReplyJob::slotReplyDone); parser->setIdentityManager(mIdentityManager); parser->setCharsets(MessageComposerSettings::self()->preferredCharsets());
  75. Download patch messagecomposer/autotests/utiltest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/utiltest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/utiltest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,6 +1,6 @@ /* Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com> - Copyright (C) 2017-2018 Laurent Montel <montel@kde.org> + Copyright (C) 2017-2019 Laurent Montel <montel@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by @@ -21,13 +21,13 @@ #include "utiltest.h" #include <QTextDocument> -#include <qtest.h> +#include <QTest> #include <QStandardPaths> #include <MessageComposer/Util> using namespace MessageComposer; -QTEST_APPLESS_MAIN(UtilTest) +QTEST_MAIN(UtilTest) UtilTest::UtilTest(QObject *parent) : QObject(parent)
  76. Download patch debian/libkf5webengineviewer5abi3.symbols
  77. Download patch messagecomposer/autotests/composertest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/composertest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/composertest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -22,7 +22,7 @@ #include "qtest_messagecomposer.h" -#include <qtest.h> +#include <QTest> #include <kmime/kmime_headers.h> using namespace KMime; @@ -107,7 +107,7 @@ void ComposerTest::testNonAsciiHeaders() const QString to = toDisplayName + mailbox; const QString cc = ccDisplayName + mailbox; const QString bcc = bccDisplayName + mailbox; - const QString replyto = replyToDisplayName + mailbox; + const QStringList replyto = QStringList{replyToDisplayName + mailbox}; composer->infoPart()->setFrom(from); composer->infoPart()->setTo(QStringList() << to);
  78. Download patch messagecomposer/src/followupreminder/followupremindercreatejob.h

    --- 4:18.08.3-3/messagecomposer/src/followupreminder/followupremindercreatejob.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/followupreminder/followupremindercreatejob.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2014-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
  79. Download patch messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.h

    --- 4:18.08.3-3/messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/composer-ng/autotests/richtextcomposerngtest.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2016-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
  80. Download patch debian/libkf5messagecore5abi1.install

    --- 4:18.08.3-3/debian/libkf5messagecore5abi1.install 2018-09-13 10:27:12.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5messagecore5abi1.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libKF5MessageCore.so.5*
  81. Download patch messagecomposer/autotests/messagefactoryngtest.h

    --- 4:18.08.3-3/messagecomposer/autotests/messagefactoryngtest.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/messagefactoryngtest.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2010 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com Copyright (c) 2010 Leo Franchi <lfranchi@kde.org> - Copyright (C) 2017-2018 Laurent Montel <montel@kde.org> + Copyright (C) 2017-2019 Laurent Montel <montel@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by
  82. Download patch messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.h

    --- 4:18.08.3-3/messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2015-2018 Montel Laurent <montel@kde.org> + Copyright (c) 2015-2019 Montel Laurent <montel@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by
  83. Download patch debian/source/lintian-overrides

    --- 4:18.08.3-3/debian/source/lintian-overrides 2018-09-13 10:27:12.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/source/lintian-overrides 2019-07-23 17:56:54.000000000 +0000 @@ -1,4 +1 @@ kf5-messagelib source: source-is-missing webengineviewer/src/data/jquery-ui.js line length is 516 characters (>512) -kf5-messagelib source: insane-line-length-in-source-file webengineviewer/src/data/jquery-ui.js line length is 516 characters (>512) -kf5-messagelib source: source-contains-prebuilt-javascript-object webengineviewer/src/data/jquery-ui.js line length is 516 characters (>512) -kf5-messagelib source: source-contains-prebuilt-javascript-object webengineviewer/src/data/jquery.min.js
  84. Download patch debian/libkf5messagecomposer-dev.acc.in

    --- 4:18.08.3-3/debian/libkf5messagecomposer-dev.acc.in 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5messagecomposer-dev.acc.in 2019-07-23 17:56:54.000000000 +0000 @@ -0,0 +1,29 @@ +<?xml version='1.0' encoding='utf-8'?> +<descriptor> + +<version> + 16.04.0 +</version> + +<headers> + /usr/include/KF5/MessageComposer/ + /usr/include/KF5/messagecomposer/ + /usr/include/KF5/messagecomposer_version.h +</headers> + +<skip_headers> + /usr/include/KF5/messagecomposer/encryptjob.h + /usr/include/KF5/MessageComposer/EncryptJob +</skip_headers> + +<libs> + /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5MessageComposer.so +</libs> + +<gcc_options> + -fPIC + -std=c++11 + -fno-keep-inline-functions +</gcc_options> + +</descriptor> \ No newline at end of file
  85. Download patch messagecomposer/src/helper/messagefactoryforwardjob.h

    --- 4:18.08.3-3/messagecomposer/src/helper/messagefactoryforwardjob.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/helper/messagefactoryforwardjob.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017-2018 Laurent Montel <montel@kde.org> + Copyright (C) 2017-2019 Laurent Montel <montel@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public
  86. Download patch messagecomposer/autotests/globalparttest.h

    --- 4:18.08.3-3/messagecomposer/autotests/globalparttest.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/globalparttest.h 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2014-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
  87. Download patch messagecomposer/autotests/signencrypttest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/signencrypttest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/signencrypttest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -21,7 +21,7 @@ #include "signencrypttest.h" #include <QDebug> -#include <qtest.h> +#include <QTest> #include "qtest_messagecomposer.h" #include "cryptofunctions.h"
  88. Download patch messagecomposer/autotests/plugineditorcheckbeforesendparamstest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/plugineditorcheckbeforesendparamstest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/plugineditorcheckbeforesendparamstest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2018 Laurent Montel <montel@kde.org> + Copyright (C) 2016-2019 Laurent Montel <montel@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public
  89. Download patch messagecomposer/autotests/followupreminderselectdatedialogtest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/followupreminderselectdatedialogtest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/followupreminderselectdatedialogtest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Montel Laurent <montel@kde.org> + Copyright (C) 2014-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 @@ -19,7 +19,7 @@ #include "followupreminderselectdatedialogtest.h" #include "../src/followupreminder/followupreminderselectdatedialog.h" -#include <qtest.h> +#include <QTest> #include <KDateComboBox> #include <AkonadiWidgets/CollectionComboBox>
  90. Download patch messagecomposer/CMakeLists.txt

    --- 4:18.08.3-3/messagecomposer/CMakeLists.txt 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/CMakeLists.txt 2019-07-10 05:29:18.000000000 +0000 @@ -5,9 +5,6 @@ ecm_setup_version(PROJECT VARIABLE_PREFI ) configure_file(src/messagecomposer-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/messagecomposer-version.h @ONLY) -########### Targets ########### - -add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") ########### CMake Config Files ########### set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MessageComposer")
  91. Download patch debian/patches/enable_debianabimanager.diff

    --- 4:18.08.3-3/debian/patches/enable_debianabimanager.diff 2018-09-13 10:27:12.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/patches/enable_debianabimanager.diff 2019-07-23 17:56:54.000000000 +0000 @@ -6,4 +6,3 @@ ki18n_install(po) + +include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake) -\ No newline at end of file
  92. Download patch messagecomposer/src/helper/messagefactoryng.cpp

    --- 4:18.08.3-3/messagecomposer/src/helper/messagefactoryng.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/helper/messagefactoryng.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,7 +1,7 @@ /* Copyright (C) 2010 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com Copyright (c) 2010 Leo Franchi <lfranchi@kde.org> - Copyright (C) 2017-2018 Laurent Montel <montel@kde.org> + Copyright (C) 2017-2019 Laurent Montel <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 as published by @@ -344,7 +344,7 @@ void MessageFactoryNG::createReplyAsync( //In-Reply-To = original msg-id msg->inReplyTo()->from7BitString(m_origMsg->messageID()->as7BitString(false)); - msg->subject()->fromUnicodeString(MessageHelper::replySubject(m_origMsg), "utf-8"); + msg->subject()->fromUnicodeString(MessageCore::StringUtil::replySubject(m_origMsg.data()), "utf-8"); // If the reply shouldn't be blank, apply the template to the message if (m_quote) { @@ -421,7 +421,7 @@ void MessageFactoryNG::createForwardAsyn msg->assemble(); } - msg->subject()->fromUnicodeString(MessageHelper::forwardSubject(m_origMsg), "utf-8"); + msg->subject()->fromUnicodeString(MessageCore::StringUtil::forwardSubject(m_origMsg.data()), "utf-8"); MessageFactoryForwardJob *job = new MessageFactoryForwardJob; connect(job, &MessageFactoryForwardJob::forwardDone, this, &MessageFactoryNG::slotCreateForwardDone); job->setIdentityManager(m_identityManager); @@ -449,7 +449,7 @@ QPair< KMime::Message::Ptr, QList< KMime KMime::Message::Ptr firstMsg = MessageComposer::Util::message(items.first()); const uint originalIdentity = identityUoid(firstMsg); MessageHelper::initFromMessage(msg, firstMsg, m_identityManager, originalIdentity); - msg->subject()->fromUnicodeString(MessageHelper::forwardSubject(firstMsg), "utf-8"); + msg->subject()->fromUnicodeString(MessageCore::StringUtil::forwardSubject(firstMsg.data()), "utf-8"); } MessageHelper::setAutomaticFields(msg, true); @@ -657,8 +657,7 @@ KMime::Message::Ptr MessageFactoryNG::cr return receipt; } -KMime::Message::Ptr MessageFactoryNG::createMDN(KMime::MDN::ActionMode a, KMime::MDN::DispositionType d, KMime::MDN::SendingMode s, int mdnQuoteOriginal, - const QVector<KMime::MDN::DispositionModifier> &m) +KMime::Message::Ptr MessageFactoryNG::createMDN(KMime::MDN::ActionMode a, KMime::MDN::DispositionType d, KMime::MDN::SendingMode s, int mdnQuoteOriginal, const QVector<KMime::MDN::DispositionModifier> &m) { // extract where to send to: QString receiptTo; @@ -976,8 +975,8 @@ QString MessageFactoryNG::replaceHeaders Q_ASSERT(rxDate.isValid()); const QString sDate = KMime::DateFormatter::formatDate( - KMime::DateFormatter::Localized, msg->date()->dateTime().toTime_t()); - qCDebug(MESSAGECOMPOSER_LOG) << "creating mdn date:" << msg->date()->dateTime().toTime_t() << sDate; + KMime::DateFormatter::Localized, msg->date()->dateTime().toSecsSinceEpoch()); + qCDebug(MESSAGECOMPOSER_LOG) << "creating mdn date:" << msg->date()->dateTime().toSecsSinceEpoch() << sDate; int idx = 0; if ((idx = rxDate.indexIn(result, idx)) != -1) {
  93. Download patch messagecomposer/autotests/signencrypttest.h

    --- 4:18.08.3-3/messagecomposer/autotests/signencrypttest.h 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/signencrypttest.h 2019-07-10 05:29:18.000000000 +0000 @@ -18,8 +18,8 @@ 02110-1301, USA. */ -#ifndef SIGNENCRYPTJOBJOBTEST_H -#define SIGNENCRYPTJOBJOBTEST_H +#ifndef SIGNENCRYPTTEST_H +#define SIGNENCRYPTTEST_H #include <QObject>
  94. Download patch debian/libkf5templateparser5abi2.symbols
  95. Download patch debian/copyright
  96. Download patch messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/attachmentvcardfromaddressbookjobtest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2015-2018 Montel Laurent <montel@kde.org> + Copyright (c) 2015-2019 Montel Laurent <montel@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by @@ -20,7 +20,7 @@ #include "attachmentvcardfromaddressbookjobtest.h" #include "MessageComposer/AttachmentVcardFromAddressBookJob" -#include <qtest.h> +#include <QTest> #include <KContacts/Addressee> AttachmentVcardFromAddressBookJobTest::AttachmentVcardFromAddressBookJobTest(QObject *parent)
  97. Download patch debian/libkf5messagecomposer5abi1.install

    --- 4:18.08.3-3/debian/libkf5messagecomposer5abi1.install 2018-09-13 10:27:12.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/libkf5messagecomposer5abi1.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libKF5MessageComposer.so.5*
  98. Download patch messagecomposer/autotests/skeletonmessagejobtest.cpp

    --- 4:18.08.3-3/messagecomposer/autotests/skeletonmessagejobtest.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/autotests/skeletonmessagejobtest.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -20,7 +20,7 @@ #include "skeletonmessagejobtest.h" #include <QDebug> -#include <qtest.h> +#include <QTest> #include <kmime/kmime_message.h> @@ -63,7 +63,7 @@ void SkeletonMessageJobTest::testSubject void SkeletonMessageJobTest::testAddresses_data() { QTest::addColumn<QString>("from"); - QTest::addColumn<QString>("replyto"); + QTest::addColumn<QStringList>("replyto"); QTest::addColumn<QStringList>("to"); QTest::addColumn<QStringList>("cc"); QTest::addColumn<QStringList>("bcc"); @@ -78,7 +78,7 @@ void SkeletonMessageJobTest::testAddress bcc << QStringLiteral("four@example.com"); QString replyto = QStringLiteral("five@example.com"); - QTest::newRow("simple single address") << from << replyto << to << cc << bcc; + QTest::newRow("simple single address") << from << QStringList{replyto} << to << cc << bcc; } { @@ -94,7 +94,7 @@ void SkeletonMessageJobTest::testAddress bcc << QStringLiteral("four.four@example.com"); QString replyto = QStringLiteral("five@example.com"); - QTest::newRow("simple multi address") << from << replyto << to << cc << bcc; + QTest::newRow("simple multi address") << from << QStringList{replyto} << to << cc << bcc; } { @@ -110,7 +110,7 @@ void SkeletonMessageJobTest::testAddress bcc << QStringLiteral("four.four@example.com"); QString replyto = QStringLiteral("You over there <five@example.com>"); - QTest::newRow("named multi address") << from << replyto << to << cc << bcc; + QTest::newRow("named multi address") << from << QStringList{replyto} << to << cc << bcc; } { @@ -126,7 +126,7 @@ void SkeletonMessageJobTest::testAddress bcc << QStringLiteral("four.four@example.com"); QString replyto = QStringLiteral("Şîşzbură <five@example.com>"); - QTest::newRow("non-ascii named multi address") << from << replyto << to << cc << bcc; + QTest::newRow("non-ascii named multi address") << from << QStringList{replyto} << to << cc << bcc; } } @@ -139,7 +139,7 @@ void SkeletonMessageJobTest::testAddress Q_ASSERT(infoPart); QFETCH(QString, from); - QFETCH(QString, replyto); + QFETCH(QStringList, replyto); QFETCH(QStringList, to); QFETCH(QStringList, cc); QFETCH(QStringList, bcc); @@ -161,7 +161,7 @@ void SkeletonMessageJobTest::testAddress { QVERIFY(message->replyTo(false)); qDebug() << "Reply-To:" << message->replyTo()->asUnicodeString(); - QCOMPARE(replyto, message->replyTo()->asUnicodeString()); + QCOMPARE(replyto.join(QLatin1Char(',')), message->replyTo()->asUnicodeString()); } {
  99. Download patch debian/patches/exclude_refresh_from_metadata.patch

    --- 4:18.08.3-3/debian/patches/exclude_refresh_from_metadata.patch 2019-03-01 23:40:19.000000000 +0000 +++ 4:19.04.3-0ubuntu1/debian/patches/exclude_refresh_from_metadata.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -From 34765909cdf8e55402a8567b48fb288839c61612 Mon Sep 17 00:00:00 2001 -From: Laurent Montel <montel@kde.org> -Date: Fri, 23 Nov 2018 07:37:02 +0100 -Subject: Exclude Refresh from MetaData (Not necessary) - ---- - messageviewer/src/messagepartthemes/default/defaultrenderer.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp -+++ b/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp -@@ -308,6 +308,11 @@ QString processHtml(const QString &htmlS - return htmlSource; - } - extraHead = s.mid(startIndex + 6 , endIndex - startIndex - 6); -+ //Don't authorize to refresh content. -+ if (s.contains(QStringLiteral("http-equiv=\"REFRESH\""), Qt::CaseInsensitive)) { -+ extraHead.clear(); -+ } -+ - s = s.mid(endIndex + 7).trimmed(); - } -
  100. Download patch messagecomposer/src/composer/composer.cpp

    --- 4:18.08.3-3/messagecomposer/src/composer/composer.cpp 2018-10-31 06:56:07.000000000 +0000 +++ 4:19.04.3-0ubuntu1/messagecomposer/src/composer/composer.cpp 2019-07-10 05:29:18.000000000 +0000 @@ -80,7 +80,6 @@ public: // Stuff that we play with. KMime::Message *skeletonMessage = nullptr; - KMime::Content *resultContent = nullptr; bool started = false; bool finished = false; @@ -354,8 +353,7 @@ void ComposerPrivate::contentJobFinished } } -void ComposerPrivate::composeWithLateAttachments(KMime::Message *headers, KMime::Content *content, const AttachmentPart::List &parts, const std::vector<GpgME::Key> &keys, - const QStringList &recipients) +void ComposerPrivate::composeWithLateAttachments(KMime::Message *headers, KMime::Content *content, const AttachmentPart::List &parts, const std::vector<GpgME::Key> &keys, const QStringList &recipients) { Q_Q(Composer); @@ -572,7 +570,7 @@ bool Composer::finished() const { Q_D(const Composer); - return d->autoSaving; + return d->finished; } bool Composer::autoSave() const
  101. ...
  1. kf5-messagelib