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.12.3-0ubuntu1) focal; urgency=medium * Move qdebug categories files to new location. * Move KNewStuff rc file to new location. * New optional build depend on libqca-qt5-2-dev * New upstream release (19.12.3) * Update install files. * Update symbols from build logs. -- Rik Mills <rikmills@kde.org> Sat, 11 Apr 2020 14:00:13 +0100 kf5-messagelib (4:19.04.3-0ubuntu2) focal; urgency=medium * No-change rebuild for libgcc-s1 package name change. -- Matthias Klose <doko@ubuntu.com> Tue, 24 Mar 2020 15:17:54 +0100 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
  2. Download patch debian/libkf5messagelist5abi1.symbols
  3. Download patch debian/libkf5messageviewer5abi5.symbols
  4. Download patch messagecomposer/src/job/distributionlistexpandjob.cpp

    --- 4:19.08.3-1/messagecomposer/src/job/distributionlistexpandjob.cpp 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/job/distributionlistexpandjob.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -46,7 +46,7 @@ void DistributionListExpandJob::start() QString DistributionListExpandJob::addresses() const { - return mEmailAddresses.join(QStringLiteral(", ")); + return mEmailAddresses.join(QLatin1String(", ")); } bool DistributionListExpandJob::isEmpty() const
  5. Download patch messagecomposer/src/composer/composerlineedit.h

    --- 4:19.08.3-1/messagecomposer/src/composer/composerlineedit.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer/composerlineedit.h 2020-02-17 17:26:40.000000000 +0000 @@ -25,6 +25,9 @@ #include "messagecomposer_export.h" #include <LibkdepimAkonadi/AddresseeLineEdit> namespace MessageComposer { +/** + * @brief The ComposerLineEdit class + */ class MESSAGECOMPOSER_EXPORT ComposerLineEdit : public KPIM::AddresseeLineEdit { Q_OBJECT
  6. Download patch messagecomposer/src/attachment/attachmentmodel.cpp

    --- 4:19.08.3-1/messagecomposer/src/attachment/attachmentmodel.cpp 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/attachment/attachmentmodel.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -369,17 +369,23 @@ bool AttachmentModel::setData(const QMod return true; } -bool AttachmentModel::addAttachment(AttachmentPart::Ptr part) +void AttachmentModel::addAttachment(const AttachmentPart::Ptr &part) { Q_ASSERT(!d->parts.contains(part)); + if (!part->url().isEmpty()) { + for (const AttachmentPart::Ptr &partElement : qAsConst(d->parts)) { + if (partElement->url() == part->url()) { + return; + } + } + } beginInsertRows(QModelIndex(), rowCount(), rowCount()); d->parts.append(part); endInsertRows(); - return true; } -bool AttachmentModel::updateAttachment(AttachmentPart::Ptr part) +bool AttachmentModel::updateAttachment(const AttachmentPart::Ptr &part) { int idx = d->parts.indexOf(part); if (idx == -1) { @@ -391,7 +397,7 @@ bool AttachmentModel::updateAttachment(A return true; } -bool AttachmentModel::replaceAttachment(AttachmentPart::Ptr oldPart, AttachmentPart::Ptr newPart) +bool AttachmentModel::replaceAttachment(const AttachmentPart::Ptr &oldPart, const AttachmentPart::Ptr &newPart) { Q_ASSERT(oldPart != newPart);
  7. Download patch debian/kf5-messagelib-data.maintscript

    --- 4:19.08.3-1/debian/kf5-messagelib-data.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/kf5-messagelib-data.maintscript 2020-04-11 13:00:13.000000000 +0000 @@ -0,0 +1,3 @@ +rm_conffile /etc/xdg/messagelib.categories +rm_conffile /etc/xdg/messagelib.renamecategories +rm_conffile /etc/xdg/messageviewer_header_themes.knsrc
  8. Download patch messagecomposer/src/job/attachmentclipboardjob.h

    --- 4:19.08.3-1/messagecomposer/src/job/attachmentclipboardjob.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/job/attachmentclipboardjob.h 2020-02-17 17:26:40.000000000 +0000 @@ -22,6 +22,10 @@ #include "MessageCore/AttachmentLoadJob" #include "messagecomposer_export.h" namespace MessageComposer { +/** + * @brief The AttachmentClipBoardJob class + * @author Laurent Montel <montel@kde.org> + */ class MESSAGECOMPOSER_EXPORT AttachmentClipBoardJob : public MessageCore::AttachmentLoadJob { Q_OBJECT
  9. Download patch messagecomposer/src/composer/composerattachmentinterface.cpp

    --- 4:19.08.3-1/messagecomposer/src/composer/composerattachmentinterface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer/composerattachmentinterface.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -0,0 +1,68 @@ +/* + Copyright (C) 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 the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "composerattachmentinterface.h" +using namespace MessageComposer; +ComposerAttachmentInterface::ComposerAttachmentInterface() +{ +} + +ComposerAttachmentInterface::~ComposerAttachmentInterface() +{ +} + +QStringList ComposerAttachmentInterface::fileNames() const +{ + return mFileNames; +} + +void ComposerAttachmentInterface::setFileNames(const QStringList &fileName) +{ + mFileNames = fileName; +} + +int ComposerAttachmentInterface::count() const +{ + return mCount; +} + +void ComposerAttachmentInterface::setCount(int count) +{ + mCount = count; +} + +QStringList ComposerAttachmentInterface::namesAndSize() const +{ + return mNamesAndSize; +} + +void ComposerAttachmentInterface::setNamesAndSize(const QStringList &nameAndSize) +{ + mNamesAndSize = nameAndSize; +} + +QStringList ComposerAttachmentInterface::names() const +{ + return mNames; +} + +void ComposerAttachmentInterface::setNames(const QStringList &name) +{ + mNames = name; +}
  10. Download patch messagecomposer/src/helper/messagefactoryreplyjob.h

    --- 4:19.08.3-1/messagecomposer/src/helper/messagefactoryreplyjob.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/helper/messagefactoryreplyjob.h 2020-02-17 17:26:40.000000000 +0000 @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef MESSAGEFACTORYREPLYJOB_H -#define MESSAGEFACTORYREPLYJOB_H +#ifndef MESSAGECOMPOSER_MESSAGEFACTORYREPLYJOB_H +#define MESSAGECOMPOSER_MESSAGEFACTORYREPLYJOB_H #include <QObject> #include <KMime/Message> @@ -63,4 +63,4 @@ private: KIdentityManagement::IdentityManager *mIdentityManager = nullptr; }; } -#endif // MESSAGEFACTORYREPLYJOB_H +#endif
  11. Download patch debian/libkf5messageviewer-plugins.install

    --- 4:19.08.3-1/debian/libkf5messageviewer-plugins.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5messageviewer-plugins.install 2020-04-11 13:00:13.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
  12. Download patch debian/rules

    --- 4:19.08.3-1/debian/rules 2019-11-30 21:33:59.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/rules 2020-04-11 13:00:13.000000000 +0000 @@ -1,28 +1,10 @@ #!/usr/bin/make -f -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 -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))) +l10npkgs_firstversion_ok := 4:17.03.90-0~ -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 +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_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 + :
  13. Download patch debian/libkf5messageviewer5abi5.lintian-overrides

    --- 4:19.08.3-1/debian/libkf5messageviewer5abi5.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5messageviewer5abi5.lintian-overrides 2020-04-11 13:00:13.000000000 +0000 @@ -0,0 +1 @@ +libkf5messageviewer5abi5: symbols-declares-dependency-on-other-package libkf5messageviewer-plugins
  14. Download patch messagecomposer/src/followupreminder/followupreminderselectdatedialog.h

    --- 4:19.08.3-1/messagecomposer/src/followupreminder/followupreminderselectdatedialog.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/followupreminder/followupreminderselectdatedialog.h 2020-02-17 17:26:40.000000000 +0000 @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef FOLLOWUPREMINDERSELECTDATEDIALOG_H -#define FOLLOWUPREMINDERSELECTDATEDIALOG_H +#ifndef MESSAGECOMPOSER_FOLLOWUPREMINDERSELECTDATEDIALOG_H +#define MESSAGECOMPOSER_FOLLOWUPREMINDERSELECTDATEDIALOG_H #include <QDialog> #include <QPushButton> @@ -28,6 +28,10 @@ class QAbstractItemModel; namespace MessageComposer { class FollowUpReminderSelectDateDialogPrivate; +/** + * @brief The FollowUpReminderSelectDateDialog class + * @author Laurent Montel <montel@kde.org> + */ class MESSAGECOMPOSER_EXPORT FollowUpReminderSelectDateDialog : public QDialog { Q_OBJECT @@ -48,4 +52,4 @@ private: }; } -#endif // FOLLOWUPREMINDERSELECTDATEDIALOG_H +#endif
  15. Download patch messagecomposer/src/job/emailaddressresolvejob.h

    --- 4:19.08.3-1/messagecomposer/src/job/emailaddressresolvejob.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/job/emailaddressresolvejob.h 2020-02-17 17:26:40.000000000 +0000 @@ -33,10 +33,10 @@ namespace MessageComposer { class Composer; +class EmailAddressResolveJobPrivate; /** * @short A job to resolve nicknames, distribution lists and email addresses for queued emails. */ -class EmailAddressResolveJobPrivate; class MESSAGECOMPOSER_EXPORT EmailAddressResolveJob : public KJob { Q_OBJECT
  16. Download patch messagecomposer/src/composer/keyresolver.cpp

    --- 4:19.08.3-1/messagecomposer/src/composer/keyresolver.cpp 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer/keyresolver.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -1548,7 +1548,7 @@ void Kleo::KeyResolver::dump() const qCDebug(MESSAGECOMPOSER_LOG) << " " << kit->shortKeyID(); } qCDebug(MESSAGECOMPOSER_LOG) << " SplitInfo #" << i << " recipients: " - << qPrintable(sit->recipients.join(QStringLiteral(", "))); + << qPrintable(sit->recipients.join(QLatin1String(", "))); } } #endif @@ -1762,7 +1762,7 @@ std::vector<GpgME::Key> Kleo::KeyResolve if (!fingerprints.empty()) { qCDebug(MESSAGECOMPOSER_LOG) << "Using encryption keys 0x" - << fingerprints.join(QStringLiteral(", 0x")) + << fingerprints.join(QLatin1String(", 0x")) << "for" << person; std::vector<GpgME::Key> keys = lookup(fingerprints); if (!keys.empty()) { @@ -1845,7 +1845,7 @@ std::vector<GpgME::Key> Kleo::KeyResolve if (patterns.empty()) { return std::vector<GpgME::Key>(); } - qCDebug(MESSAGECOMPOSER_LOG) << "( \"" << patterns.join(QStringLiteral("\", \"")) << "\"," << secret << ")"; + qCDebug(MESSAGECOMPOSER_LOG) << "( \"" << patterns.join(QLatin1String("\", \"")) << "\"," << secret << ")"; std::vector<GpgME::Key> result; if (mCryptoMessageFormats & (InlineOpenPGPFormat | OpenPGPMIMEFormat)) { if (const QGpgME::Protocol *p = QGpgME::openpgp()) {
  17. Download patch messagecomposer/src/job/attachmentjob.h

    --- 4:19.08.3-1/messagecomposer/src/job/attachmentjob.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/job/attachmentjob.h 2020-02-17 17:26:40.000000000 +0000 @@ -29,7 +29,8 @@ namespace MessageComposer { class AttachmentJobPrivate; /** -*/ + * @brief The AttachmentJob class + */ class MESSAGECOMPOSER_EXPORT AttachmentJob : public ContentJobBase { Q_OBJECT
  18. Download patch messagecomposer/src/composer/composerviewbase.cpp

    --- 4:19.08.3-1/messagecomposer/src/composer/composerviewbase.cpp 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer/composerviewbase.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -474,16 +474,16 @@ void ComposerViewBase::slotEmailAddressR } } auto header = new KMime::Headers::Generic("X-KMail-UnExpanded-To"); - header->from7BitString(unExpandedTo.join(QStringLiteral(", ")).toLatin1()); + header->from7BitString(unExpandedTo.join(QLatin1String(", ")).toLatin1()); m_msg->setHeader(header); header = new KMime::Headers::Generic("X-KMail-UnExpanded-CC"); - header->from7BitString(unExpandedCc.join(QStringLiteral(", ")).toLatin1()); + header->from7BitString(unExpandedCc.join(QLatin1String(", ")).toLatin1()); m_msg->setHeader(header); header = new KMime::Headers::Generic("X-KMail-UnExpanded-BCC"); - header->from7BitString(unExpandedBcc.join(QStringLiteral(", ")).toLatin1()); + header->from7BitString(unExpandedBcc.join(QLatin1String(", ")).toLatin1()); m_msg->setHeader(header); header = new KMime::Headers::Generic("X-KMail-UnExpanded-Reply-To"); - header->from7BitString(unExpandedReplyTo.join(QStringLiteral(", ")).toLatin1()); + header->from7BitString(unExpandedReplyTo.join(QLatin1String(", ")).toLatin1()); m_msg->setHeader(header); autoresizeImage = false; } @@ -495,12 +495,12 @@ void ComposerViewBase::slotEmailAddressR // we first figure out if we need to create multiple messages with different crypto formats // if so, we create a composer per format // if we aren't signing or encrypting, this just returns a single empty message - bool wasCanceled = false; if (m_neverEncrypt && mSaveIn != MessageComposer::MessageSender::SaveInNone && !mSendLaterInfo) { MessageComposer::Composer *composer = new MessageComposer::Composer; composer->setNoCrypto(true); m_composers.append(composer); } else { + bool wasCanceled = false; m_composers = generateCryptoMessages(wasCanceled); if (wasCanceled) { return; @@ -531,6 +531,7 @@ void ComposerViewBase::slotEmailAddressR } } // Compose each message and prepare it for queueing, sending, or storing + foreach (MessageComposer::Composer *composer, m_composers) { fillGlobalPart(composer->globalPart()); m_editor->fillComposerTextPart(composer->textPart()); @@ -929,7 +930,7 @@ void ComposerViewBase::slotSendComposeRe qCDebug(MESSAGECOMPOSER_LOG) << "UserCancelledError."; Q_EMIT failed(i18n("Job cancelled by the user")); } else { - qCDebug(MESSAGECOMPOSER_LOG) << "other Error."; + qCDebug(MESSAGECOMPOSER_LOG) << "other Error." << composer->error(); QString msg; if (composer->error() == MessageComposer::Composer::BugError) { msg = i18n("Could not compose message: %1 \n Please report this bug.", job->errorString()); @@ -1021,7 +1022,7 @@ void ComposerViewBase::slotQueueResult(K if (m_pendingQueueJobs == 0) { addFollowupReminder(qjob->message()->messageID(false)->asUnicodeString()); - Q_EMIT sentSuccessfully(); + Q_EMIT sentSuccessfully(-1); } } @@ -1271,25 +1272,32 @@ void ComposerViewBase::saveMessage(const Akonadi::MessageFlags::copyMessageFlags(*message, item); if (!identity.isNull()) { // we have a valid identity - if (saveIn == MessageComposer::MessageSender::SaveInTemplates) { + switch(saveIn) { + case MessageComposer::MessageSender::SaveInTemplates: { if (!identity.templates().isEmpty()) { // the user has specified a custom templates collection target = Akonadi::Collection(identity.templates().toLongLong()); } - } else { //Draft + break; + } + case MessageComposer::MessageSender::SaveInDrafts: { if (!identity.drafts().isEmpty()) { // the user has specified a custom drafts collection target = Akonadi::Collection(identity.drafts().toLongLong()); } + break; } + case MessageComposer::MessageSender::SaveInOutbox: //We don't define save outbox in identity + target = Akonadi::SpecialMailCollections::self()->defaultCollection(Akonadi::SpecialMailCollections::Outbox); + break; + case MessageComposer::MessageSender::SaveInNone: + break; + } + Akonadi::CollectionFetchJob *saveMessageJob = new Akonadi::CollectionFetchJob(target, Akonadi::CollectionFetchJob::Base); saveMessageJob->setProperty("Akonadi::Item", QVariant::fromValue(item)); QObject::connect(saveMessageJob, &Akonadi::CollectionFetchJob::result, this, &ComposerViewBase::slotSaveMessage); } else { // preinitialize with the default collections - if (saveIn == MessageComposer::MessageSender::SaveInTemplates) { - target = Akonadi::SpecialMailCollections::self()->defaultCollection(Akonadi::SpecialMailCollections::Templates); - } else { //Draft - target = Akonadi::SpecialMailCollections::self()->defaultCollection(Akonadi::SpecialMailCollections::Drafts); - } + target = defaultSpecialTarget(); Akonadi::ItemCreateJob *create = new Akonadi::ItemCreateJob(item, target, this); connect(create, &Akonadi::ItemCreateJob::result, this, &ComposerViewBase::slotCreateItemResult); ++m_pendingQueueJobs; @@ -1318,11 +1326,20 @@ void ComposerViewBase::slotSaveMessage(K Akonadi::Collection ComposerViewBase::defaultSpecialTarget() const { Akonadi::Collection target; - if (mSaveIn == MessageComposer::MessageSender::SaveInTemplates) { - target = Akonadi::SpecialMailCollections::self()->defaultCollection(Akonadi::SpecialMailCollections::Templates); - } else { + switch(mSaveIn) { + case MessageComposer::MessageSender::SaveInNone: + break; + case MessageComposer::MessageSender::SaveInDrafts: target = Akonadi::SpecialMailCollections::self()->defaultCollection(Akonadi::SpecialMailCollections::Drafts); + break; + case MessageComposer::MessageSender::SaveInTemplates: + target = Akonadi::SpecialMailCollections::self()->defaultCollection(Akonadi::SpecialMailCollections::Templates); + break; + case MessageComposer::MessageSender::SaveInOutbox: + target = Akonadi::SpecialMailCollections::self()->defaultCollection(Akonadi::SpecialMailCollections::Outbox); + break; } + return target; } @@ -1338,11 +1355,13 @@ void ComposerViewBase::slotCreateItemRes return; } + Akonadi::Item::Id id = -1; if (mSendLaterInfo) { Akonadi::ItemCreateJob *createJob = static_cast<Akonadi::ItemCreateJob *>(job); const Akonadi::Item item = createJob->item(); if (item.isValid()) { - mSendLaterInfo->setItemId(item.id()); + id = item.id(); + mSendLaterInfo->setItemId(id); SendLater::SendLaterUtil::writeSendLaterInfo(SendLater::SendLaterUtil::defaultConfig(), mSendLaterInfo); delete mSendLaterInfo; mSendLaterInfo = nullptr; @@ -1350,7 +1369,7 @@ void ComposerViewBase::slotCreateItemRes } if (m_pendingQueueJobs == 0) { - Q_EMIT sentSuccessfully(); + Q_EMIT sentSuccessfully(id); } }
  19. Download patch messagecomposer/src/CMakeLists.txt

    --- 4:19.08.3-1/messagecomposer/src/CMakeLists.txt 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/CMakeLists.txt 2020-02-17 17:26:40.000000000 +0000 @@ -7,6 +7,10 @@ if(BUILD_TESTING) add_subdirectory( imagescaling/autotests ) add_subdirectory( imagescaling/tests ) add_subdirectory( composer-ng/autotests ) + add_subdirectory( statusbarwidget/autotests ) + add_subdirectory( plugineditor/autotests ) + add_subdirectory( composer/autotests ) + add_subdirectory( snippet/autotests ) endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR}/part) @@ -33,12 +37,18 @@ set( messagecomposer_job_src job/attachmentclipboardjob.cpp ) +set( messagecomposer_statusbarwidget_src + statusbarwidget/statusbarlabeltoggledstate.cpp + ) + set( messagecomposer_composer_src composer/composer.cpp composer/signaturecontroller.cpp composer/composerlineedit.cpp composer/composerviewbase.cpp composer/keyresolver.cpp + composer/composerviewinterface.cpp + composer/composerattachmentinterface.cpp ) set( messagecomposer_recipient_src @@ -49,8 +59,12 @@ set( messagecomposer_recipient_src recipient/recipientseditorsidewidget.cpp recipient/kwindowpositioner.cpp recipient/distributionlistdialog.cpp - recipient/recipientseditormanager.cpp - recipient/recipientspickerwidget.cpp + ) + +set( messagecomposer_snippet_src + snippet/convertsnippetvariablesjob.cpp + snippet/convertsnippetvariablesutil.cpp + snippet/convertsnippetvariablemenu.cpp ) set( messagecomposer_imagescaling_src @@ -98,6 +112,7 @@ set(messagecomposer_plugineditor_SRCS plugineditor/plugineditor.cpp plugineditor/plugineditorinterface.cpp plugineditor/pluginactiontype.cpp + plugineditor/plugincomposerinterface.cpp ) set(messagecomposer_plugineditorcheckbeforesend_SRCS @@ -129,6 +144,8 @@ set(messagecomposer_plugineditorgrammar_ ) set( messagecomposer_src + ${messagecomposer_snippet_src} + ${messagecomposer_statusbarwidget_src} ${messagecomposer_plugineditorconverttext_SRCS} ${messagecomposer_plugineditorinit_SRCS} ${messagecomposer_plugineditor_SRCS} @@ -216,12 +233,30 @@ install(TARGETS EXPORT KF5MessageComposerTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ${LIBRARY_NAMELINK} ) +ecm_generate_headers(MessageComposer_Camelstatusbarwidget_HEADERS + HEADER_NAMES + StatusBarLabelToggledState + REQUIRED_HEADERS MessageComposer_statusbarwidget_HEADERS + PREFIX MessageComposer + RELATIVE statusbarwidget + ) + +ecm_generate_headers(MessageComposer_Camelsnippet_HEADERS + HEADER_NAMES + ConvertSnippetVariablesJob + ConvertSnippetVariablesUtil + ConvertSnippetVariableMenu + REQUIRED_HEADERS MessageComposer_snippet_HEADERS + PREFIX MessageComposer + RELATIVE snippet + ) ecm_generate_headers(MessageComposer_Camelplugineditor_HEADERS HEADER_NAMES PluginEditor PluginActionType PluginEditorInterface + PluginComposerInterface PluginEditorManager REQUIRED_HEADERS MessageComposer_plugineditor_HEADERS PREFIX MessageComposer @@ -289,6 +324,8 @@ ecm_generate_headers(MessageComposer_Cam Composer ComposerLineEdit ComposerViewBase + ComposerViewInterface + ComposerAttachmentInterface SignatureController REQUIRED_HEADERS MessageComposer_composer_HEADERS PREFIX MessageComposer @@ -407,6 +444,7 @@ ecm_generate_pri_file(BASE_NAME MessageC install(FILES + ${MessageComposer_Camelsnippet_HEADERS} ${MessageComposer_Camelplugineditorconverttext_HEADERS} ${MessageComposer_Camelplugineditorinit_HEADERS} ${MessageComposer_Camelplugineditorcheckbeforesend_HEADERS} @@ -424,14 +462,17 @@ install(FILES ${MessageComposer_Camelcaseattachement_HEADERS} ${MessageComposer_Camelplugineditor_HEADERS} ${MessageComposer_Camelplugineditorgrammar_HEADERS} + ${MessageComposer_Camelstatusbarwidget_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/MessageComposer COMPONENT Devel ) install(FILES ${MessageComposer_HEADERS} + ${MessageComposer_snippet_HEADERS} ${MessageComposer_plugineditorconverttext_HEADERS} ${MessageComposer_plugineditorinit_HEADERS} + ${MessageComposer_statusbarwidget_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/messagecomposer_export.h ${CMAKE_CURRENT_BINARY_DIR}/messagecomposersettings_base.h ${CMAKE_CURRENT_BINARY_DIR}/messagecomposer_debug.h
  20. Download patch debian/libkf5templateparser5.install

    --- 4:19.08.3-1/debian/libkf5templateparser5.install 2018-03-08 23:09:38.000000000 +0000 +++ 4:19.12.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.*
  21. Download patch debian/compat

    --- 4:19.08.3-1/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/compat 2020-04-11 13:00:13.000000000 +0000 @@ -0,0 +1 @@ +9
  22. Download patch messagecomposer/src/attachment/attachmentmodel.h

    --- 4:19.08.3-1/messagecomposer/src/attachment/attachmentmodel.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/attachment/attachmentmodel.h 2020-02-17 17:26:40.000000000 +0000 @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KMAIL_ATTACHMENTMODEL_H -#define KMAIL_ATTACHMENTMODEL_H +#ifndef MESSAGECOMPOSER_ATTACHMENTMODEL_H +#define MESSAGECOMPOSER_ATTACHMENTMODEL_H #include "messagecomposer_export.h" @@ -31,15 +31,8 @@ namespace MessageComposer { /** - Columns: - name - size - encoding - mime type - compress - encrypt - sign -*/ + * @brief The AttachmentModel class + */ class MESSAGECOMPOSER_EXPORT AttachmentModel : public QAbstractItemModel { Q_OBJECT @@ -101,11 +94,11 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; Q_REQUIRED_RESULT bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; - Q_REQUIRED_RESULT bool addAttachment(MessageCore::AttachmentPart::Ptr part); - Q_REQUIRED_RESULT bool updateAttachment(MessageCore::AttachmentPart::Ptr part); - Q_REQUIRED_RESULT bool replaceAttachment(MessageCore::AttachmentPart::Ptr oldPart, MessageCore::AttachmentPart::Ptr newPart); + void addAttachment(const MessageCore::AttachmentPart::Ptr &part); + Q_REQUIRED_RESULT bool updateAttachment(const MessageCore::AttachmentPart::Ptr &part); + Q_REQUIRED_RESULT bool replaceAttachment(const MessageCore::AttachmentPart::Ptr &oldPart, const MessageCore::AttachmentPart::Ptr &newPart); Q_REQUIRED_RESULT bool removeAttachment(const MessageCore::AttachmentPart::Ptr &part); - MessageCore::AttachmentPart::List attachments() const; + Q_REQUIRED_RESULT MessageCore::AttachmentPart::List attachments() const; Q_REQUIRED_RESULT Qt::ItemFlags flags(const QModelIndex &index) const override; Q_REQUIRED_RESULT QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; @@ -130,4 +123,4 @@ private: }; } // -#endif // KMAIL_ATTACHMENTMODEL_H +#endif
  23. Download patch debian/libkf5mimetreeparser5abi1.install

    --- 4:19.08.3-1/debian/libkf5mimetreeparser5abi1.install 2018-09-13 10:27:12.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5mimetreeparser5abi1.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libKF5MimeTreeParser.so.5*
  24. Download patch messagecomposer/src/job/attachmentjob.cpp

    --- 4:19.08.3-1/messagecomposer/src/job/attachmentjob.cpp 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/job/attachmentjob.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -22,7 +22,6 @@ #include "job/attachmentjob.h" - #include "contentjobbase_p.h" #include "part/globalpart.h" #include "job/singlepartjob.h"
  25. Download patch messagecomposer/src/messagecomposer_private_export.h

    --- 4:19.08.3-1/messagecomposer/src/messagecomposer_private_export.h 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/messagecomposer_private_export.h 2020-02-17 17:26:40.000000000 +0000 @@ -0,0 +1,34 @@ +/* This file is part of the KDE project + Copyright (C) 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 the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef MESSAGECOMPOSERPRIVATE_EXPORT_H +#define MESSAGECOMPOSERPRIVATE_EXPORT_H + +#include "messagecomposer_export.h" + +/* Classes which are exported only for unit tests */ +#ifdef BUILD_TESTING +# ifndef MESSAGECOMPOSER_TESTS_EXPORT +# define MESSAGECOMPOSER_TESTS_EXPORT MESSAGECOMPOSER_EXPORT +# endif +#else /* not compiling tests */ +# define MESSAGECOMPOSER_TESTS_EXPORT +#endif + +#endif
  26. Download patch messagecomposer/src/composer-ng/richtextcomposersignatures.h

    --- 4:19.08.3-1/messagecomposer/src/composer-ng/richtextcomposersignatures.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer-ng/richtextcomposersignatures.h 2020-02-17 17:26:40.000000000 +0000 @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef RICHTEXTCOMPOSERSIGNATURES_H -#define RICHTEXTCOMPOSERSIGNATURES_H +#ifndef MESSAGECOMPOSER_RICHTEXTCOMPOSERSIGNATURES_H +#define MESSAGECOMPOSER_RICHTEXTCOMPOSERSIGNATURES_H #include <QObject> #include "messagecomposer_export.h" @@ -28,6 +28,10 @@ class Signature; namespace MessageComposer { class RichTextComposerNg; +/** + * @brief The RichTextComposerSignatures class + * @author Laurent Montel <montel@kde.org> + */ class MESSAGECOMPOSER_EXPORT RichTextComposerSignatures : public QObject { Q_OBJECT @@ -43,4 +47,4 @@ private: RichTextComposerSignaturesPrivate *const d; }; } -#endif // RICHTEXTCOMPOSERSIGNATURES_H +#endif
  27. Download patch messagecomposer/src/composer-ng/richtextcomposerng.h

    --- 4:19.08.3-1/messagecomposer/src/composer-ng/richtextcomposerng.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer-ng/richtextcomposerng.h 2020-02-17 17:26:40.000000000 +0000 @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef RICHTEXTCOMPOSERNG_H -#define RICHTEXTCOMPOSERNG_H +#ifndef MESSAGECOMPOSER_RICHTEXTCOMPOSERNG_H +#define MESSAGECOMPOSER_RICHTEXTCOMPOSERNG_H #include "messagecomposer_export.h" #include <kpimtextedit/richtextcomposer.h> @@ -33,6 +33,10 @@ namespace MessageComposer { class TextPart; class RichTextComposerSignatures; class RichTextComposerNgPrivate; +/** + * @brief The RichTextComposerNg class + * @author Laurent Montel <montel@kde.org> + */ class MESSAGECOMPOSER_EXPORT RichTextComposerNg : public KPIMTextEdit::RichTextComposer { Q_OBJECT @@ -54,9 +58,11 @@ public: Q_REQUIRED_RESULT virtual MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus convertPlainText(MessageComposer::TextPart *textPart); +protected: + bool processModifyText(QKeyEvent *event) override; + private: - bool processAutoCorrection(QKeyEvent *event) override; RichTextComposerNgPrivate *const d; }; } -#endif // RICHTEXTCOMPOSERNG_H +#endif
  28. Download patch debian/control
  29. Download patch debian/libkf5messagelist-dev.acc.in

    --- 4:19.08.3-1/debian/libkf5messagelist-dev.acc.in 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5messagelist-dev.acc.in 2020-04-11 13:00:13.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
  30. Download patch debian/libkf5messagelist5abi1.install

    --- 4:19.08.3-1/debian/libkf5messagelist5abi1.install 2018-09-13 10:27:12.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5messagelist5abi1.install 2020-04-11 13:00:13.000000000 +0000 @@ -1 +1,2 @@ -usr/lib/*/libKF5MessageList.so.5* +usr/lib/*/libKF5MessageList.so.5.* +usr/lib/*/libKF5MessageList.so.5abi1
  31. Download patch messagecomposer/src/composer/composerattachmentinterface.h

    --- 4:19.08.3-1/messagecomposer/src/composer/composerattachmentinterface.h 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer/composerattachmentinterface.h 2020-02-17 17:26:40.000000000 +0000 @@ -0,0 +1,57 @@ +/* + Copyright (C) 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 the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef MESSAGECOMPOSER_COMPOSERATTACHMENTINTERFACE_H +#define MESSAGECOMPOSER_COMPOSERATTACHMENTINTERFACE_H + +#include "messagecomposer_export.h" +#include <QObject> + +namespace MessageComposer { +class ComposerViewBase; +/** + * @brief The ComposerAttachmentInterface class + * @author Laurent Montel <montel@kde.org> + */ +class MESSAGECOMPOSER_EXPORT ComposerAttachmentInterface +{ +public: + ComposerAttachmentInterface(); + ~ComposerAttachmentInterface(); + + Q_REQUIRED_RESULT QStringList fileNames() const; + void setFileNames(const QStringList &fileName); + + Q_REQUIRED_RESULT int count() const; + void setCount(int count); + + Q_REQUIRED_RESULT QStringList namesAndSize() const; + void setNamesAndSize(const QStringList &nameAndSize); + + Q_REQUIRED_RESULT QStringList names() const; + void setNames(const QStringList &name); + +private: + QStringList mFileNames; + QStringList mNamesAndSize; + QStringList mNames; + int mCount = 0; +}; +} +#endif
  32. Download patch debian/libkf5messagecore5abi2.symbols
  33. Download patch debian/libkf5messageviewer5abi5.install

    --- 4:19.08.3-1/debian/libkf5messageviewer5abi5.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5messageviewer5abi5.install 2020-04-11 13:00:13.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libKF5MessageViewer.so.5.* +usr/lib/*/libKF5MessageViewer.so.5abi5
  34. Download patch messagecomposer/src/job/attachmentvcardfromaddressbookjob.h

    --- 4:19.08.3-1/messagecomposer/src/job/attachmentvcardfromaddressbookjob.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/job/attachmentvcardfromaddressbookjob.h 2020-02-17 17:26:40.000000000 +0000 @@ -24,6 +24,10 @@ #include "messagecomposer_export.h" namespace MessageComposer { class AttachmentVcardFromAddressBookJobPrivate; +/** + * @brief The AttachmentVcardFromAddressBookJob class + * @author Laurent Montel <montel@kde.org> + */ class MESSAGECOMPOSER_EXPORT AttachmentVcardFromAddressBookJob : public MessageCore::AttachmentLoadJob { Q_OBJECT
  35. Download patch debian/libkf5messageviewer5abi1.install

    --- 4:19.08.3-1/debian/libkf5messageviewer5abi1.install 2018-09-13 10:27:12.000000000 +0000 +++ 4:19.12.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
  36. Download patch messagecomposer/src/composer-ng/richtextcomposersignatures.cpp

    --- 4:19.08.3-1/messagecomposer/src/composer-ng/richtextcomposersignatures.cpp 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer-ng/richtextcomposersignatures.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -176,7 +176,7 @@ bool RichTextComposerSignatures::replace QTextCursor::MoveAnchor, 4); additionalMove = 4; } else if (newSig.rawText().isEmpty() - && text.mid(currentMatch - 1, 1) == QLatin1String("\n")) { + && text.mid(currentMatch - 1, 1) == QLatin1Char('\n')) { cursor.movePosition(QTextCursor::PreviousCharacter, QTextCursor::MoveAnchor, 1); additionalMove = 1;
  37. Download patch debian/libkf5webengineviewer5abi3.install

    --- 4:19.08.3-1/debian/libkf5webengineviewer5abi3.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5webengineviewer5abi3.install 2020-04-11 13:00:13.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libKF5WebEngineViewer.so.5.* +usr/lib/*/libKF5WebEngineViewer.so.5abi3
  38. Download patch debian/libkf5templateparser-dev.acc.in

    --- 4:19.08.3-1/debian/libkf5templateparser-dev.acc.in 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5templateparser-dev.acc.in 2020-04-11 13:00:13.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
  39. Download patch messagecomposer/src/job/inserttextfilejob.h

    --- 4:19.08.3-1/messagecomposer/src/job/inserttextfilejob.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/job/inserttextfilejob.h 2020-02-17 17:26:40.000000000 +0000 @@ -31,11 +31,11 @@ class Job; } namespace MessageComposer { +class InsertTextFileJobPrivate; /** * A job that downloads a given URL, interprets the result as a text file with the * given encoding and then inserts the text into the editor. */ -class InsertTextFileJobPrivate; class MESSAGECOMPOSER_EXPORT InsertTextFileJob : public KJob { Q_OBJECT
  40. Download patch messagecomposer/src/composer/composer.h

    --- 4:19.08.3-1/messagecomposer/src/composer/composer.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer/composer.h 2020-02-17 17:26:40.000000000 +0000 @@ -40,8 +40,8 @@ class InfoPart; class TextPart; /** - The message composer. -*/ + * @brief The Composer class + */ class MESSAGECOMPOSER_EXPORT Composer : public JobBase { Q_OBJECT
  41. Download patch CMakeLists.txt

    --- 4:19.08.3-1/CMakeLists.txt 2019-11-05 04:18:59.000000000 +0000 +++ 4:19.12.3-0ubuntu1/CMakeLists.txt 2020-03-03 00:41:32.000000000 +0000 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.12.3") +set(PIM_VERSION "5.13.3") if (POLICY CMP0053) cmake_policy(SET CMP0053 NEW) @@ -10,32 +10,30 @@ 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(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE) -option(DKIM_CHECKER_BUILD "DKIM CHECKER (experimental)" FALSE) -set(KF5_MIN_VERSION "5.60.0") +set(KF5_MIN_VERSION "5.63.0") set(MESSAGELIB_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.12.3") +set(AKONADIMIME_LIB_VERSION "5.13.3") set(QT_REQUIRED_VERSION "5.11.0") -set(AKONADI_VERSION "5.12.3") -set(GRANTLEETHEME_LIB_VERSION "5.12.3") -set(GRAVATAR_LIB_VERSION "5.12.3") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.12.3") -set(KCONTACTS_LIB_VERSION "5.12.3") -set(KDEPIM_APPS_LIB_VERSION "5.12.3") -set(KLDAP_LIB_VERSION "5.12.3") -set(KMAILTRANSPORT_LIB_VERSION "5.12.3") -set(KMBOX_LIB_VERSION "5.12.3") -set(KMIME_LIB_VERSION "5.12.3") -set(KPIMTEXTEDIT_LIB_VERSION "5.12.3") -set(LIBKDEPIM_LIB_VERSION "5.12.3") -set(LIBKLEO_LIB_VERSION "5.12.3") -set(PIMCOMMON_LIB_VERSION "5.12.3") +set(AKONADI_VERSION "5.13.3") +set(GRANTLEETHEME_LIB_VERSION "5.13.3") +set(GRAVATAR_LIB_VERSION "5.13.3") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.13.3") +set(KDEPIM_APPS_LIB_VERSION "5.13.3") +set(KLDAP_LIB_VERSION "5.13.3") +set(KMAILTRANSPORT_LIB_VERSION "5.13.3") +set(KMBOX_LIB_VERSION "5.13.3") +set(KMIME_LIB_VERSION "5.13.3") +set(KPIMTEXTEDIT_LIB_VERSION "5.13.3") +set(LIBKDEPIM_LIB_VERSION "5.13.3") +set(LIBKLEO_LIB_VERSION "5.13.3") +set(PIMCOMMON_LIB_VERSION "5.13.3") set(GPGME_LIB_VERSION "1.11.1") -set(AKONADI_CONTACT_VERSION "5.12.3") +set(AKONADI_CONTACT_VERSION "5.13.3") if (${MIMETREEPARSER_ONLY_BUILD}) set(ECM_VERSION "5.26.0") @@ -84,7 +82,6 @@ if (NOT ${MIMETREEPARSER_ONLY_BUILD}) 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) @@ -93,7 +90,7 @@ if (NOT ${MIMETREEPARSER_ONLY_BUILD}) find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiMime ${AKONADIMIME_LIB_VERSION} CONFIG REQUIRED) - find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED) + find_package(KF5Contacts ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED) find_package(KF5FollowupReminder ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED) find_package(KF5GrantleeTheme ${GRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED) @@ -109,14 +106,16 @@ 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.12.3" CONFIG REQUIRED) + find_package(KF5AkonadiSearch "5.13.3" CONFIG REQUIRED) set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://kde.org/" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi") endif() set(CMAKE_CXX_STANDARD 14) -#add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) - +if (EXISTS "${CMAKE_SOURCE_DIR}/.git") + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) +endif() if(BUILD_TESTING) add_definitions(-DBUILD_TESTING) endif()
  42. Download patch messagecomposer/src/composer/keyresolver.h

    --- 4:19.08.3-1/messagecomposer/src/composer/keyresolver.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer/keyresolver.h 2020-02-17 17:26:40.000000000 +0000 @@ -34,8 +34,8 @@ your version. */ -#ifndef KLEO_KEYRESOLVER_H -#define KLEO_KEYRESOLVER_H +#ifndef MESSAGECOMPOSER_KLEO_KEYRESOLVER_H +#define MESSAGECOMPOSER_KLEO_KEYRESOLVER_H #include "messagecomposer_export.h" #include <Libkleo/KeyApprovalDialog> @@ -129,7 +129,8 @@ 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(); @@ -311,4 +312,4 @@ private: }; } // namespace Kleo -#endif // KLEO_KEYRESOLVER_H +#endif
  43. Download patch messagecomposer/src/plugineditor/autotests/plugineditortest.h

    --- 4:19.08.3-1/messagecomposer/src/plugineditor/autotests/plugineditortest.h 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/plugineditor/autotests/plugineditortest.h 2020-02-17 17:26:40.000000000 +0000 @@ -0,0 +1,35 @@ +/* + Copyright (C) 2015-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 the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef PLUGINEDITORTEST_H +#define PLUGINEDITORTEST_H + +#include <QObject> + +class PluginEditorTest : public QObject +{ + Q_OBJECT +public: + explicit PluginEditorTest(QObject *parent = nullptr); + ~PluginEditorTest() = default; +private Q_SLOTS: + void shouldHaveDefaultValues(); +}; + +#endif // PLUGINEDITORTEST_H
  44. Download patch messagecomposer/autotests/cryptocomposertest.cpp

    --- 4:19.08.3-1/messagecomposer/autotests/cryptocomposertest.cpp 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/autotests/cryptocomposertest.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -433,7 +433,7 @@ void CryptoComposerTest::testOpenPGPInli composer = nullptr; if (sign && !encrypt) { - data += QLatin1String("\n"); + data += QLatin1Char('\n'); } //qDebug() << "message:" << message->encodedContent(); ComposerTestUtil::verify(sign, encrypt, message.data(), data.toUtf8(),
  45. Download patch debian/libkf5messagecomposer5abi2.symbols
  46. Download patch messagecomposer/src/plugineditor/autotests/CMakeLists.txt

    --- 4:19.08.3-1/messagecomposer/src/plugineditor/autotests/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/plugineditor/autotests/CMakeLists.txt 2020-02-17 17:26:40.000000000 +0000 @@ -0,0 +1,9 @@ +macro(add_plugineditor_unittest _source) + ecm_add_test(${_source} + NAME_PREFIX "messagecomposer-plugineditor-" + LINK_LIBRARIES Qt5::Test KF5::MessageComposer KF5::XmlGui + ) +endmacro() + +add_plugineditor_unittest(plugineditortest.cpp) +
  47. Download patch debian/libkf5mimetreeparser5abi3.symbols
  48. Download patch debian/libkf5templateparser5abi2.install

    --- 4:19.08.3-1/debian/libkf5templateparser5abi2.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5templateparser5abi2.install 2020-04-11 13:00:13.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libKF5TemplateParser.so.5.* +usr/lib/*/libKF5TemplateParser.so.5abi2
  49. Download patch messagecomposer/src/composer/composerviewinterface.cpp

    --- 4:19.08.3-1/messagecomposer/src/composer/composerviewinterface.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer/composerviewinterface.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -0,0 +1,112 @@ +/* + Copyright (C) 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 the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "composerviewinterface.h" +#include "composerviewbase.h" +#include <MessageComposer/AttachmentModel> +#include <KFormat> +using namespace MessageComposer; +ComposerViewInterface::ComposerViewInterface(ComposerViewBase *composerView) + : mComposerView(composerView) +{ +} + +ComposerViewInterface::~ComposerViewInterface() +{ +} + +QString ComposerViewInterface::subject() const +{ + if (mComposerView) { + return mComposerView->subject(); + } + return {}; +} + +QString ComposerViewInterface::to() const +{ + if (mComposerView) { + return mComposerView->to(); + } + return {}; +} + +QString ComposerViewInterface::cc() const +{ + if (mComposerView) { + return mComposerView->cc(); + } + return {}; +} + +QString ComposerViewInterface::from() const +{ + if (mComposerView) { + return mComposerView->from(); + } + return {}; +} + +MessageComposer::ComposerAttachmentInterface ComposerViewInterface::attachments() +{ + MessageComposer::ComposerAttachmentInterface attachmentInterface; + if (mComposerView) { + attachmentInterface.setCount(mComposerView->attachmentModel()->attachments().count()); + QStringList fileNames; + QStringList nameAndSize; + QStringList names; + + for (const MessageCore::AttachmentPart::Ptr &attachment : mComposerView->attachmentModel()->attachments()) { + fileNames.append(attachment->fileName()); + names.append(attachment->name()); + nameAndSize.append(QStringLiteral("%1 (%2)").arg(attachment->name()).arg(KFormat().formatByteSize(attachment->size()))); + } + attachmentInterface.setNames(names); + attachmentInterface.setNamesAndSize(nameAndSize); + attachmentInterface.setFileNames(fileNames); + } + return attachmentInterface; +} + +QString ComposerViewInterface::shortDate() const +{ + return QDate::currentDate().toString(Qt::SystemLocaleShortDate); +} + +QString ComposerViewInterface::longDate() const +{ + return QDate::currentDate().toString(Qt::SystemLocaleLongDate); +} + +QString ComposerViewInterface::shortTime() const +{ + return QTime::currentTime().toString(Qt::SystemLocaleShortDate); +} + +QString ComposerViewInterface::longTime() const +{ + return QTime::currentTime().toString(Qt::SystemLocaleLongDate); +} + +QString ComposerViewInterface::insertDayOfWeek() const +{ + const QDateTime date = QDateTime::currentDateTime().toLocalTime(); + const QString str = QLocale().dayName(date.date().dayOfWeek(), QLocale::LongFormat); + return str; +}
  50. Download patch messagecomposer/src/imagescaling/imagescalingwidget.h

    --- 4:19.08.3-1/messagecomposer/src/imagescaling/imagescalingwidget.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/imagescaling/imagescalingwidget.h 2020-02-17 17:26:40.000000000 +0000 @@ -29,6 +29,10 @@ class ImageScalingWidget; namespace MessageComposer { class ImageScalingWidgetPrivate; +/** + * @brief The ImageScalingWidget class + * @author Laurent Montel <montel@kde.org> + */ class MESSAGECOMPOSER_EXPORT ImageScalingWidget : public QWidget { Q_OBJECT
  51. Download patch messagecomposer/src/composer-ng/richtextcomposerng.cpp

    --- 4:19.08.3-1/messagecomposer/src/composer-ng/richtextcomposerng.cpp 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer-ng/richtextcomposerng.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -84,7 +84,7 @@ static bool isSpecial(const QTextCharFor || charFormat.isListFormat() || charFormat.isTableFormat() || charFormat.isTableCellFormat(); } -bool RichTextComposerNg::processAutoCorrection(QKeyEvent *e) +bool RichTextComposerNg::processModifyText(QKeyEvent *e) { if (d->autoCorrection && d->autoCorrection->isEnabledAutoCorrection()) { if ((e->key() == Qt::Key_Space) || (e->key() == Qt::Key_Enter) || (e->key() == Qt::Key_Return)) { @@ -161,8 +161,8 @@ MessageComposer::PluginEditorConvertText void RichTextComposerNg::fillComposerTextPart(MessageComposer::TextPart *textPart) { - bool wasConverted = - convertPlainText(textPart) == MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus::Converted; + bool wasConverted + = convertPlainText(textPart) == MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus::Converted; if (composerControler()->isFormattingUsed()) { if (!wasConverted) { if (MessageComposer::MessageComposerSettings::self()->improvePlainTextOfHtmlMessage()) {
  52. Download patch messagecomposer/autotests/CMakeLists.txt

    --- 4:19.08.3-1/messagecomposer/autotests/CMakeLists.txt 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/autotests/CMakeLists.txt 2020-02-17 17:26:40.000000000 +0000 @@ -58,6 +58,7 @@ endmacro() add_messagecomposer_test( utiltest.cpp ) add_messagecomposer_test( messagefactoryngtest.cpp ) add_messagecomposer_test( plugineditorcheckbeforesendparamstest.cpp ) +add_messagecomposer_test( replystrategytest.cpp ) # Non-content jobs. add_messagecomposer_test( skeletonmessagejobtest.cpp )
  53. Download patch debian/libkf5webengineviewer5abi1.install

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

    --- 4:19.08.3-1/debian/libkf5messagecore5abi2.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5messagecore5abi2.install 2020-04-11 13:00:13.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libKF5MessageCore.so.5.* +usr/lib/*/libKF5MessageCore.so.5abi2
  55. Download patch messagecomposer/src/plugineditor/autotests/plugineditortest.cpp

    --- 4:19.08.3-1/messagecomposer/src/plugineditor/autotests/plugineditortest.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/plugineditor/autotests/plugineditortest.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -0,0 +1,33 @@ +/* + Copyright (C) 2015-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 the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "plugineditortest.h" +#include "plugineditor/plugineditor.h" +#include <QTest> +QTEST_GUILESS_MAIN(PluginEditorTest) + +PluginEditorTest::PluginEditorTest(QObject *parent) + : QObject(parent) +{ +} + +void PluginEditorTest::shouldHaveDefaultValues() +{ + //TODO +}
  56. Download patch debian/libkf5messageviewer-dev.acc.in

    --- 4:19.08.3-1/debian/libkf5messageviewer-dev.acc.in 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5messageviewer-dev.acc.in 2020-04-11 13:00:13.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
  57. Download patch messagecomposer/src/composer/signaturecontroller.h

    --- 4:19.08.3-1/messagecomposer/src/composer/signaturecontroller.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer/signaturecontroller.h 2020-02-17 17:26:40.000000000 +0000 @@ -22,8 +22,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef MESSAGECOMPSER_SIGNATURECONTROLLER_H -#define MESSAGECOMPSER_SIGNATURECONTROLLER_H +#ifndef MESSAGECOMPOSER_SIGNATURECONTROLLER_H +#define MESSAGECOMPOSER_SIGNATURECONTROLLER_H #include "messagecomposer_export.h" #include <QObject> @@ -35,12 +35,13 @@ class IdentityCombo; namespace MessageComposer { class RichTextComposerNg; - -/** Controls signature (the footer thing, not the crypto thing) operations +class SignatureControllerPrivate; +/** + * @brief The SignatureController class + * Controls signature (the footer thing, not the crypto thing) operations * happening on a KMEditor triggered by identity selection or menu actions. * @since 4.5 */ -class SignatureControllerPrivate; class MESSAGECOMPOSER_EXPORT SignatureController : public QObject { Q_OBJECT
  58. Download patch messagecomposer/src/composer/autotests/CMakeLists.txt

    --- 4:19.08.3-1/messagecomposer/src/composer/autotests/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer/autotests/CMakeLists.txt 2020-02-17 17:26:40.000000000 +0000 @@ -0,0 +1,9 @@ +macro(add_composer_unittest _source) + ecm_add_test(${_source} + NAME_PREFIX "messagecomposer-composer-" + LINK_LIBRARIES Qt5::Test KF5::MessageComposer + ) +endmacro() + +add_composer_unittest(composerattachmentinterfacetest.cpp) +
  59. Download patch messagecomposer/src/attachment/attachmentcontrollerbase.cpp

    --- 4:19.08.3-1/messagecomposer/src/attachment/attachmentcontrollerbase.cpp 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/attachment/attachmentcontrollerbase.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -184,7 +184,6 @@ void AttachmentControllerBase::Private:: Q_ASSERT(dynamic_cast<AttachmentCompressJob *>(job)); AttachmentCompressJob *ajob = static_cast<AttachmentCompressJob *>(job); - //AttachmentPart *originalPart = const_cast<AttachmentPart*>( ajob->originalPart() ); AttachmentPart::Ptr originalPart = ajob->originalPart(); AttachmentPart::Ptr compressedPart = ajob->compressedPart();
  60. Download patch messagecomposer/src/composer/composerviewbase.h

    --- 4:19.08.3-1/messagecomposer/src/composer/composerviewbase.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer/composerviewbase.h 2020-02-17 17:26:40.000000000 +0000 @@ -18,13 +18,14 @@ 02110-1301, USA. */ -#ifndef COMPOSER_VIEW_BASE_H -#define COMPOSER_VIEW_BASE_H +#ifndef MESSAGECOMPOSER_COMPOSER_VIEW_BASE_H +#define MESSAGECOMPOSER_COMPOSER_VIEW_BASE_H #include "messagecomposer_export.h" #include "messagecomposer/messagesender.h" #include "MessageComposer/Recipient" #include <AkonadiCore/collection.h> +#include <AkonadiCore/Item> #include <KMime/Message> #include <QObject> @@ -72,7 +73,7 @@ class AttachmentControllerBase; class AttachmentModel; class SignatureController; /** - * + * @brief The ComposerViewBase class */ class MESSAGECOMPOSER_EXPORT ComposerViewBase : public QObject { @@ -245,7 +246,7 @@ Q_SIGNALS: /** * Message sending completed successfully. */ - void sentSuccessfully(); + void sentSuccessfully(Akonadi::Item::Id id); /** * Message sending failed with given error message. */
  61. Download patch messagecomposer/src/composer/autotests/composerattachmentinterfacetest.cpp

    --- 4:19.08.3-1/messagecomposer/src/composer/autotests/composerattachmentinterfacetest.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer/autotests/composerattachmentinterfacetest.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -0,0 +1,38 @@ +/* + Copyright (C) 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 the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "composerattachmentinterfacetest.h" +#include "composer/composerattachmentinterface.h" +#include <QTest> + +QTEST_GUILESS_MAIN(ComposerAttachmentInterfaceTest) + +ComposerAttachmentInterfaceTest::ComposerAttachmentInterfaceTest(QObject *parent) + : QObject(parent) +{ +} + +void ComposerAttachmentInterfaceTest::shouldHaveDefaultValues() +{ + MessageComposer::ComposerAttachmentInterface interface; + QCOMPARE(interface.count(), 0); + QVERIFY(interface.namesAndSize().isEmpty()); + QVERIFY(interface.fileNames().isEmpty()); + QVERIFY(interface.names().isEmpty()); +}
  62. Download patch messagecomposer/src/job/contentjobbase.h

    --- 4:19.08.3-1/messagecomposer/src/job/contentjobbase.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/job/contentjobbase.h 2020-02-17 17:26:40.000000000 +0000 @@ -31,7 +31,9 @@ class Content; namespace MessageComposer { class ContentJobBasePrivate; - +/** + * @brief The ContentJobBase class + */ class MESSAGECOMPOSER_EXPORT ContentJobBase : public JobBase { Q_OBJECT
  63. Download patch messagecomposer/src/plugineditor/pluginactiontype.h

    --- 4:19.08.3-1/messagecomposer/src/plugineditor/pluginactiontype.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/plugineditor/pluginactiontype.h 2020-02-17 17:26:40.000000000 +0000 @@ -25,6 +25,10 @@ class QAction; namespace MessageComposer { +/** + * @brief The PluginActionType class + * @author Laurent Montel <montel@kde.org> + */ class MESSAGECOMPOSER_EXPORT PluginActionType { public:
  64. Download patch messagecomposer/src/composer-ng/autotests/richtextcomposersignaturestest.cpp

    --- 4:19.08.3-1/messagecomposer/src/composer-ng/autotests/richtextcomposersignaturestest.cpp 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer-ng/autotests/richtextcomposersignaturestest.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -50,12 +50,12 @@ void RichTextComposerSignaturesTest::sho richtextComposerNg.insertSignature(signature1, KIdentityManagement::Signature::Start, KIdentityManagement::Signature::AddNewLines); composerSignature->cleanWhitespace(signature2); - composerSignature->replaceSignature(signature1, signature2); + QVERIFY( !composerSignature->replaceSignature(signature1, signature2)); QCOMPARE(richtextComposerNg.toPlainText(), QStringLiteral("\n\nbla Bla ")); for (int i = 0; i < 10; i++) { - composerSignature->replaceSignature(signature2, signature1); - composerSignature->replaceSignature(signature1, signature2); + QVERIFY( !composerSignature->replaceSignature(signature2, signature1)); + QVERIFY( !composerSignature->replaceSignature(signature1, signature2)); } QCOMPARE(richtextComposerNg.toPlainText(), QStringLiteral("\n\nbla Bla ")); } @@ -81,13 +81,13 @@ void RichTextComposerSignaturesTest::sho richtextComposerNg.insertSignature(signature1, KIdentityManagement::Signature::End, KIdentityManagement::Signature::AddSeparator); composerSignature->cleanWhitespace(signature2); - composerSignature->replaceSignature(signature1, signature2); + QVERIFY( !composerSignature->replaceSignature(signature1, signature2)); const QString result = QStringLiteral("foo\nbla\nfoo--\nbla Bla "); QCOMPARE(richtextComposerNg.toPlainText(), result); for (int i = 0; i < 10; i++) { - composerSignature->replaceSignature(signature2, signature1); - composerSignature->replaceSignature(signature1, signature2); + QVERIFY( !composerSignature->replaceSignature(signature2, signature1)); + QVERIFY( !composerSignature->replaceSignature(signature1, signature2)); } QCOMPARE(richtextComposerNg.toPlainText(), result); }
  65. Download patch debian/libkf5messagecore-dev.acc.in

    --- 4:19.08.3-1/debian/libkf5messagecore-dev.acc.in 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5messagecore-dev.acc.in 2020-04-11 13:00:13.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
  66. Download patch messagecomposer/src/helper/messagefactoryforwardjob.cpp

    --- 4:19.08.3-1/messagecomposer/src/helper/messagefactoryforwardjob.cpp 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/helper/messagefactoryforwardjob.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -26,9 +26,6 @@ using namespace MessageComposer; MessageFactoryForwardJob::MessageFactoryForwardJob(QObject *parent) : QObject(parent) - , mMsg(nullptr) - , mOrigMsg(nullptr) - , mIdentityManager(nullptr) { }
  67. Download patch debian/libkf5mimetreeparser-dev.install

    --- 4:19.08.3-1/debian/libkf5mimetreeparser-dev.install 2018-05-28 11:38:11.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5mimetreeparser-dev.install 2020-04-11 13:00:13.000000000 +0000 @@ -1,6 +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 -usr/lib/*/qt5/mkspecs/modules/qt_MimeTreeParser.pri
  68. Download patch debian/libkf5messagecomposer5abi2.install

    --- 4:19.08.3-1/debian/libkf5messagecomposer5abi2.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5messagecomposer5abi2.install 2020-04-11 13:00:13.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libKF5MessageComposer.so.5.* +usr/lib/*/libKF5MessageComposer.so.5abi2
  69. Download patch debian/libkf5mimetreeparser5abi3.install

    --- 4:19.08.3-1/debian/libkf5mimetreeparser5abi3.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5mimetreeparser5abi3.install 2020-04-11 13:00:13.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libKF5MimeTreeParser.so.5.* +usr/lib/*/libKF5MimeTreeParser.so.5abi3
  70. Download patch messagecomposer/src/part/textpart.h

    --- 4:19.08.3-1/messagecomposer/src/part/textpart.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/part/textpart.h 2020-02-17 17:26:40.000000000 +0000 @@ -27,6 +27,9 @@ #include "KPIMTextEdit/RichTextComposerImages" namespace MessageComposer { +/** + * @brief The TextPart class + */ class MESSAGECOMPOSER_EXPORT TextPart : public MessagePart { Q_OBJECT
  71. Download patch messagecomposer/src/composer/composerviewinterface.h

    --- 4:19.08.3-1/messagecomposer/src/composer/composerviewinterface.h 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer/composerviewinterface.h 2020-02-17 17:26:40.000000000 +0000 @@ -0,0 +1,55 @@ +/* + Copyright (C) 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 the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef MESSAGECOMPOSER_COMPOSERVIEWINTERFACE_H +#define MESSAGECOMPOSER_COMPOSERVIEWINTERFACE_H +#include "messagecomposer_export.h" +#include <MessageComposer/ComposerAttachmentInterface> +#include <QString> + +namespace MessageComposer { +class ComposerViewBase; +/** + * @brief The ComposerViewInterface class + * @author Laurent Montel <montel@kde.org> + */ +class MESSAGECOMPOSER_EXPORT ComposerViewInterface +{ +public: + explicit ComposerViewInterface(ComposerViewBase *composerView); + ~ComposerViewInterface(); + + Q_REQUIRED_RESULT QString subject() const; + Q_REQUIRED_RESULT QString to() const; + Q_REQUIRED_RESULT QString cc() const; + Q_REQUIRED_RESULT QString from() const; + + Q_REQUIRED_RESULT MessageComposer::ComposerAttachmentInterface attachments(); + + Q_REQUIRED_RESULT QString shortDate() const; + Q_REQUIRED_RESULT QString longDate() const; + Q_REQUIRED_RESULT QString shortTime() const; + Q_REQUIRED_RESULT QString longTime() const; + Q_REQUIRED_RESULT QString insertDayOfWeek() const; +private: + ComposerViewBase *mComposerView = nullptr; +}; +} + +#endif // COMPOSERVIEWINTERFACE_H
  72. Download patch messagecomposer/autotests/replystrategytest.h

    --- 4:19.08.3-1/messagecomposer/autotests/replystrategytest.h 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/autotests/replystrategytest.h 2020-02-17 17:26:40.000000000 +0000 @@ -0,0 +1,54 @@ +/* + Copyright (C) 2019 Glen Ditchfield <GJDitchfield@acm.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 + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef REPLYSTRATEGY_TEST_H +#define REPLYSTRATEGY_TEST_H + +#include <KMime/Message> + +#include <QObject> + +#include <MessageComposer/MessageFactoryNG> + +namespace KIdentityManagement { +class IdentityManager; +} + +class ReplyStrategyTest : public QObject +{ + Q_OBJECT + +public: + explicit ReplyStrategyTest(QObject *parent = nullptr); + ~ReplyStrategyTest(); + +private Q_SLOTS: + void initTestCase(); + void cleanupTestCase(); + + void testReply_data(); + void testReply(); + +private: + KMime::Message::Ptr makeReply(const KMime::Message::Ptr &original, const MessageComposer::ReplyStrategy strategy); + + KIdentityManagement::IdentityManager *mIdentityManager; +}; + +#endif
  73. Download patch messagecomposer/src/helper/messagefactoryreplyjob.cpp

    --- 4:19.08.3-1/messagecomposer/src/helper/messagefactoryreplyjob.cpp 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/helper/messagefactoryreplyjob.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -40,9 +40,11 @@ void MessageFactoryReplyJob::start() parser->setIdentityManager(mIdentityManager); parser->setCharsets(MessageComposerSettings::self()->preferredCharsets()); parser->setWordWrap(MessageComposerSettings::wordWrap(), MessageComposerSettings::lineWrapWidth()); +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) if (MessageComposer::MessageComposerSettings::quoteSelectionOnly()) { parser->setSelection(mSelection); } +#endif parser->setAllowDecryption(true); if (!mTemplate.isEmpty()) { parser->process(mTemplate, mOrigMsg);
  74. Download patch messagecomposer/src/attachment/attachmentcontrollerbase.h

    --- 4:19.08.3-1/messagecomposer/src/attachment/attachmentcontrollerbase.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/attachment/attachmentcontrollerbase.h 2020-02-17 17:26:40.000000000 +0000 @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KMAIL_ATTACHMENTCONTROLLERBASE_H -#define KMAIL_ATTACHMENTCONTROLLERBASE_H +#ifndef MESSAGECOMPOSER_ATTACHMENTCONTROLLERBASE_H +#define MESSAGECOMPOSER_ATTACHMENTCONTROLLERBASE_H #include <QObject> @@ -38,6 +38,9 @@ class QAction; namespace MessageComposer { class AttachmentModel; +/** + * @brief The AttachmentControllerBase class + */ class MESSAGECOMPOSER_EXPORT AttachmentControllerBase : public QObject { Q_OBJECT @@ -109,4 +112,4 @@ private: }; } // -#endif // KMAIL_ATTACHMENTCONTROLLERBASE_H +#endif
  75. Download patch debian/libkf5webengineviewer5abi3.symbols
  76. Download patch messagecomposer/src/followupreminder/followupremindercreatejob.h

    --- 4:19.08.3-1/messagecomposer/src/followupreminder/followupremindercreatejob.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/followupreminder/followupremindercreatejob.h 2020-02-17 17:26:40.000000000 +0000 @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef FOLLOWUPREMINDERCREATEJOB_H -#define FOLLOWUPREMINDERCREATEJOB_H +#ifndef MESSAGECOMPOSER_FOLLOWUPREMINDERCREATEJOB_H +#define MESSAGECOMPOSER_FOLLOWUPREMINDERCREATEJOB_H #include <QObject> #include <QDate> @@ -29,6 +29,10 @@ #include "messagecomposer_export.h" namespace MessageComposer { class FollowupReminderCreateJobPrivate; +/** + * @brief The FollowupReminderCreateJob class + * @author Laurent Montel <montel@kde.org> + */ class MESSAGECOMPOSER_EXPORT FollowupReminderCreateJob : public KJob { Q_OBJECT @@ -58,4 +62,4 @@ private: }; } -#endif // FOLLOWUPREMINDERCREATEJOB_H +#endif
  77. Download patch messagecomposer/autotests/replystrategytest.cpp
  78. Download patch debian/libkf5messagecore5abi1.install

    --- 4:19.08.3-1/debian/libkf5messagecore5abi1.install 2018-09-13 10:27:12.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5messagecore5abi1.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libKF5MessageCore.so.5*
  79. Download patch messagecomposer/src/imagescaling/imagescaling.h

    --- 4:19.08.3-1/messagecomposer/src/imagescaling/imagescaling.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/imagescaling/imagescaling.h 2020-02-17 17:26:40.000000000 +0000 @@ -25,6 +25,10 @@ namespace MessageComposer { class ImageScalingPrivate; +/** + * @brief The ImageScaling class + * @author Laurent Montel <montel@kde.org> + */ class MESSAGECOMPOSER_EXPORT ImageScaling { public:
  80. Download patch messagecomposer/src/helper/messagehelper.h

    --- 4:19.08.3-1/messagecomposer/src/helper/messagehelper.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/helper/messagehelper.h 2020-02-17 17:26:40.000000000 +0000 @@ -17,8 +17,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KMAIL_MESSAGE_HELPER_H -#define KMAIL_MESSAGE_HELPER_H +#ifndef MESSAGECOMPOSER_MESSAGE_HELPER_H +#define MESSAGECOMPOSER_MESSAGE_HELPER_H #include "messagecomposer_export.h"
  81. Download patch messagecomposer/autotests/messagefactoryngtest.h

    --- 4:19.08.3-1/messagecomposer/autotests/messagefactoryngtest.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/autotests/messagefactoryngtest.h 2020-02-17 17:26:40.000000000 +0000 @@ -30,6 +30,11 @@ class IdentityManager; class MessageFactoryTest : public QObject { Q_OBJECT + +public: + explicit MessageFactoryTest(QObject *parent = nullptr); + ~MessageFactoryTest(); + private Q_SLOTS: void initTestCase();
  82. Download patch debian/source/lintian-overrides

    --- 4:19.08.3-1/debian/source/lintian-overrides 2018-09-13 10:27:12.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/source/lintian-overrides 2020-04-11 13:00:13.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
  83. Download patch debian/libkf5messagecomposer-dev.acc.in

    --- 4:19.08.3-1/debian/libkf5messagecomposer-dev.acc.in 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5messagecomposer-dev.acc.in 2020-04-11 13:00:13.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
  84. Download patch messagecomposer/src/helper/messagefactoryforwardjob.h

    --- 4:19.08.3-1/messagecomposer/src/helper/messagefactoryforwardjob.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/helper/messagefactoryforwardjob.h 2020-02-17 17:26:40.000000000 +0000 @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef MESSAGEFACTORYFORWARDJOB_H -#define MESSAGEFACTORYFORWARDJOB_H +#ifndef MESSAGECOMPOSER_MESSAGEFACTORYFORWARDJOB_H +#define MESSAGECOMPOSER_MESSAGEFACTORYFORWARDJOB_H #include <QObject> #include <KMime/Message> @@ -55,11 +55,11 @@ private: QString mSelection; QString mTemplate; - KMime::Message::Ptr mMsg; - KMime::Message::Ptr mOrigMsg; + KMime::Message::Ptr mMsg = nullptr; + KMime::Message::Ptr mOrigMsg = nullptr; Akonadi::Collection mCollection; KIdentityManagement::IdentityManager *mIdentityManager = nullptr; }; } -#endif // MESSAGEFACTORYFORWARDJOB_H +#endif
  85. Download patch messagecomposer/src/part/infopart.h

    --- 4:19.08.3-1/messagecomposer/src/part/infopart.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/part/infopart.h 2020-02-17 17:26:40.000000000 +0000 @@ -27,6 +27,9 @@ #include <kmime/kmime_message.h> #include <kmime/kmime_headers.h> namespace MessageComposer { +/** + * @brief The InfoPart class + */ class MESSAGECOMPOSER_EXPORT InfoPart : public MessageComposer::MessagePart { Q_OBJECT
  86. Download patch messagecomposer/src/job/maintextjob.h

    --- 4:19.08.3-1/messagecomposer/src/job/maintextjob.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/job/maintextjob.h 2020-02-17 17:26:40.000000000 +0000 @@ -26,7 +26,9 @@ namespace MessageComposer { class MainTextJobPrivate; class TextPart; - +/** + * @brief The MainTextJob class + */ class MESSAGECOMPOSER_EXPORT MainTextJob : public ContentJobBase { Q_OBJECT
  87. Download patch messagecomposer/autotests/followupreminderselectdatedialogtest.cpp

    --- 4:19.08.3-1/messagecomposer/autotests/followupreminderselectdatedialogtest.cpp 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/autotests/followupreminderselectdatedialogtest.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -67,7 +67,7 @@ void FollowupReminderSelectDateDialogTes Akonadi::CollectionComboBox *combobox = dlg.findChild<Akonadi::CollectionComboBox *>(QStringLiteral("collectioncombobox")); QVERIFY(combobox); QDate currentDate = QDate::currentDate(); - QCOMPARE(datecombobox->date(), currentDate); + QCOMPARE(datecombobox->date(), currentDate.addDays(1)); QPushButton *okButton = dlg.findChild<QPushButton *>(QStringLiteral("ok_button")); QVERIFY(okButton);
  88. Download patch messagecomposer/src/part/messagepart.h

    --- 4:19.08.3-1/messagecomposer/src/part/messagepart.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/part/messagepart.h 2020-02-17 17:26:40.000000000 +0000 @@ -28,9 +28,9 @@ namespace MessageComposer { class MessagePartPrivate; - /** -*/ + * @brief The MessagePart class + */ class MESSAGECOMPOSER_EXPORT MessagePart : public QObject { Q_OBJECT
  89. Download patch messagecomposer/src/job/attachmentfrompublickeyjob.h

    --- 4:19.08.3-1/messagecomposer/src/job/attachmentfrompublickeyjob.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/job/attachmentfrompublickeyjob.h 2020-02-17 17:26:40.000000000 +0000 @@ -26,9 +26,10 @@ #include "messagecomposer_export.h" namespace MessageComposer { -/** -*/ // TODO I have no idea how to test this. Have a fake keyring??? +/** + * @brief The AttachmentFromPublicKeyJob class + */ class MESSAGECOMPOSER_EXPORT AttachmentFromPublicKeyJob : public MessageCore::AttachmentLoadJob { Q_OBJECT
  90. Download patch debian/patches/enable_debianabimanager.diff

    --- 4:19.08.3-1/debian/patches/enable_debianabimanager.diff 2019-11-30 21:33:59.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/patches/enable_debianabimanager.diff 2020-04-11 13:00:13.000000000 +0000 @@ -1,9 +1,8 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -134,3 +134,5 @@ endif() +@@ -132,3 +132,5 @@ install(FILES messagelib.renamecategories messagelib.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ki18n_install(po) + +include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake) -\ No newline at end of file
  91. Download patch messagecomposer/src/job/multipartjob.h

    --- 4:19.08.3-1/messagecomposer/src/job/multipartjob.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/job/multipartjob.h 2020-02-17 17:26:40.000000000 +0000 @@ -27,7 +27,8 @@ namespace MessageComposer { class MultipartJobPrivate; /** -*/ + * @brief The MultipartJob class + */ class MESSAGECOMPOSER_EXPORT MultipartJob : public ContentJobBase { Q_OBJECT
  92. Download patch messagecomposer/src/helper/messagefactoryng.cpp
  93. Download patch debian/libkf5templateparser5abi2.symbols
  94. Download patch debian/copyright
  95. Download patch messagecomposer/src/part/globalpart.h

    --- 4:19.08.3-1/messagecomposer/src/part/globalpart.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/part/globalpart.h 2020-02-17 17:26:40.000000000 +0000 @@ -26,6 +26,9 @@ #include <QList> namespace MessageComposer { +/** + * @brief The GlobalPart class + */ class MESSAGECOMPOSER_EXPORT GlobalPart : public MessageComposer::MessagePart { Q_OBJECT
  96. Download patch messagecomposer/src/job/singlepartjob.h

    --- 4:19.08.3-1/messagecomposer/src/job/singlepartjob.h 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/job/singlepartjob.h 2020-02-17 17:26:40.000000000 +0000 @@ -37,7 +37,8 @@ namespace MessageComposer { class SinglepartJobPrivate; /** -*/ + * @brief The SinglepartJob class + */ class MESSAGECOMPOSER_EXPORT SinglepartJob : public ContentJobBase { Q_OBJECT
  97. Download patch messagecomposer/src/composer/autotests/composerattachmentinterfacetest.h

    --- 4:19.08.3-1/messagecomposer/src/composer/autotests/composerattachmentinterfacetest.h 1970-01-01 00:00:00.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer/autotests/composerattachmentinterfacetest.h 2020-02-17 17:26:40.000000000 +0000 @@ -0,0 +1,35 @@ +/* + Copyright (C) 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 the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef COMPOSERATTACHMENTINTERFACETEST_H +#define COMPOSERATTACHMENTINTERFACETEST_H + +#include <QObject> + +class ComposerAttachmentInterfaceTest : public QObject +{ + Q_OBJECT +public: + explicit ComposerAttachmentInterfaceTest(QObject *parent = nullptr); + ~ComposerAttachmentInterfaceTest() = default; +private Q_SLOTS: + void shouldHaveDefaultValues(); +}; + +#endif // COMPOSERATTACHMENTINTERFACETEST_H
  98. Download patch debian/libkf5messagecomposer5abi1.install

    --- 4:19.08.3-1/debian/libkf5messagecomposer5abi1.install 2018-09-13 10:27:12.000000000 +0000 +++ 4:19.12.3-0ubuntu1/debian/libkf5messagecomposer5abi1.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libKF5MessageComposer.so.5*
  99. Download patch messagecomposer/src/job/emailaddressresolvejob.cpp

    --- 4:19.08.3-1/messagecomposer/src/job/emailaddressresolvejob.cpp 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/job/emailaddressresolvejob.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -95,27 +95,27 @@ void EmailAddressResolveJob::start() jobs << job; } if (containsAliases(d->mTo)) { - AliasesExpandJob *job = new AliasesExpandJob(d->mTo.join(QStringLiteral(", ")), d->mDefaultDomainName, this); + AliasesExpandJob *job = new AliasesExpandJob(d->mTo.join(QLatin1String(", ")), d->mDefaultDomainName, this); job->setProperty("id", QStringLiteral("infoPartTo")); connect(job, &AliasesExpandJob::result, this, &EmailAddressResolveJob::slotAliasExpansionDone); jobs << job; } if (containsAliases(d->mCc)) { - AliasesExpandJob *job = new AliasesExpandJob(d->mCc.join(QStringLiteral(", ")), d->mDefaultDomainName, this); + AliasesExpandJob *job = new AliasesExpandJob(d->mCc.join(QLatin1String(", ")), d->mDefaultDomainName, this); job->setProperty("id", QStringLiteral("infoPartCc")); connect(job, &AliasesExpandJob::result, this, &EmailAddressResolveJob::slotAliasExpansionDone); jobs << job; } if (containsAliases(d->mBcc)) { - AliasesExpandJob *job = new AliasesExpandJob(d->mBcc.join(QStringLiteral(", ")), d->mDefaultDomainName, this); + AliasesExpandJob *job = new AliasesExpandJob(d->mBcc.join(QLatin1String(", ")), d->mDefaultDomainName, this); job->setProperty("id", QStringLiteral("infoPartBcc")); connect(job, &AliasesExpandJob::result, this, &EmailAddressResolveJob::slotAliasExpansionDone); jobs << job; } if (containsAliases(d->mReplyTo)) { - AliasesExpandJob *job = new AliasesExpandJob(d->mReplyTo.join(QStringLiteral(", ")), d->mDefaultDomainName, this); + AliasesExpandJob *job = new AliasesExpandJob(d->mReplyTo.join(QLatin1String(", ")), d->mDefaultDomainName, this); job->setProperty("id", QStringLiteral("infoPartReplyTo")); connect(job, &AliasesExpandJob::result, this, &EmailAddressResolveJob::slotAliasExpansionDone); jobs << job; @@ -159,25 +159,25 @@ void EmailAddressResolveJob::setFrom(con void EmailAddressResolveJob::setTo(const QStringList &to) { d->mTo = to; - d->mResultMap.insert(QStringLiteral("infoPartTo"), to.join(QStringLiteral(", "))); + d->mResultMap.insert(QStringLiteral("infoPartTo"), to.join(QLatin1String(", "))); } void EmailAddressResolveJob::setCc(const QStringList &cc) { d->mCc = cc; - d->mResultMap.insert(QStringLiteral("infoPartCc"), cc.join(QStringLiteral(", "))); + d->mResultMap.insert(QStringLiteral("infoPartCc"), cc.join(QLatin1String(", "))); } void EmailAddressResolveJob::setBcc(const QStringList &bcc) { d->mBcc = bcc; - d->mResultMap.insert(QStringLiteral("infoPartBcc"), bcc.join(QStringLiteral(", "))); + d->mResultMap.insert(QStringLiteral("infoPartBcc"), bcc.join(QLatin1String(", "))); } void EmailAddressResolveJob::setReplyTo(const QStringList &replyTo) { d->mReplyTo = replyTo; - d->mResultMap.insert(QStringLiteral("infoPartReplyTo"), replyTo.join(QStringLiteral(", "))); + d->mResultMap.insert(QStringLiteral("infoPartReplyTo"), replyTo.join(QLatin1String(", "))); } QString EmailAddressResolveJob::expandedFrom() const
  100. Download patch messagecomposer/src/composer/composer.cpp

    --- 4:19.08.3-1/messagecomposer/src/composer/composer.cpp 2019-10-30 06:36:37.000000000 +0000 +++ 4:19.12.3-0ubuntu1/messagecomposer/src/composer/composer.cpp 2020-02-17 17:26:40.000000000 +0000 @@ -207,7 +207,7 @@ void ComposerPrivate::composeStep2() QMutableListIterator<AttachmentPart::Ptr> iter(attachmentParts); while (iter.hasNext()) { AttachmentPart::Ptr part = iter.next(); - qCDebug(MESSAGECOMPOSER_LOG) << "Checking attachment crypto policy..." << part->isSigned() << part->isEncrypted(); + qCDebug(MESSAGECOMPOSER_LOG) << "Checking attachment crypto policy... signed: " << part->isSigned() << " isEncrypted : " << part->isEncrypted(); if (!noCrypto && !autoSaving && (sign != part->isSigned() || encrypt != part->isEncrypted())) { // different policy qCDebug(MESSAGECOMPOSER_LOG) << "got attachment with different crypto policy!"; lateAttachmentParts.append(part); @@ -366,14 +366,14 @@ void ComposerPrivate::composeWithLateAtt multiJob->appendSubjob(tJob); multiJob->setExtraContent(headers); - qCDebug(MESSAGECOMPOSER_LOG) << "attachment encr key size:" << keys.size() << recipients; + qCDebug(MESSAGECOMPOSER_LOG) << "attachment encr key size:" << keys.size() << " recipients: " << recipients; // operate correctly on each attachment that has a different crypto policy than body. for (const AttachmentPart::Ptr &attachment : qAsConst(parts)) { AttachmentJob *attachJob = new AttachmentJob(attachment, q); qCDebug(MESSAGECOMPOSER_LOG) << "got a late attachment"; - if (attachment->isSigned()) { + if (attachment->isSigned() && format) { qCDebug(MESSAGECOMPOSER_LOG) << "adding signjob for late attachment"; SignJob *sJob = new SignJob(q); sJob->setContent(nullptr); @@ -395,7 +395,7 @@ void ComposerPrivate::composeWithLateAtt qCDebug(MESSAGECOMPOSER_LOG) << "Just signing late attachment"; multiJob->appendSubjob(sJob); } - } else if (attachment->isEncrypted()) { // only encryption + } else if (attachment->isEncrypted() && format) { // only encryption qCDebug(MESSAGECOMPOSER_LOG) << "just encrypting late attachment"; EncryptJob *eJob = new EncryptJob(q); eJob->setCryptoMessageFormat(format);
  101. ...
  1. kf5-messagelib