[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/kmail/files/
commit: 8a8382264b06c181b312b99ba422fffa4a93a797
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jan 28 21:24:42 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jan 28 22:32:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a838226
kde-apps/kmail: Backport various fixes to 22.08.3 and 22.12.1
In 22.08.3-r2 and 22.12.3-r2:
- Crash on attempting to replay a message with a user template
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=463935
In 22.08.3-r2:
- Opening the detailed progress window does nothing
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=460289
- Kontact Crashes Upon Start
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=460747
- ShowUserAgent=true does not show x-mailer
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=448348
- Random text in kmail's message list configuration settings
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=459399
Bug: https://bugs.gentoo.org/891509
Signed-off-by: Andreas Sturmlechner gentoo.org>
...3-fix-crash-on-replay-msg-w-user-template.patch | 38 +++
.../files/kmail-22.08.3-fix-crash-on-startup.patch | 47
...il-22.08.3-fix-open-detailed-progress-bar.patch | 52 +
...2.08.3-fix-random-text-in-config-settings.patch | 29 +
...mail-22.08.3-remove-removed-ShowUserAgent.patch | 41 +++
kde-apps/kmail/kmail-22.08.3-r2.ebuild | 123 +
kde-apps/kmail/kmail-22.12.1-r2.ebuild | 119
7 files changed, 449 insertions(+)
diff --git
a/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-replay-msg-w-user-template.patch
b/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-replay-msg-w-user-template.patch
new file mode 100644
index ..5692a4916129
--- /dev/null
+++
b/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-replay-msg-w-user-template.patch
@@ -0,0 +1,38 @@
+From 94e28559c96b71721b02393a23cbfeefa93a607b Mon Sep 17 00:00:00 2001
+From: Laurent Montel
+Date: Sat, 7 Jan 2023 00:31:18 +0100
+Subject: [PATCH] Fix bug 463935: Crash on attempting to replay a message with
+ an user template
+
+BUG: 463935
+FIXED-IN: 5.22.2
+---
+ src/kmmainwidget.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
+index b00db6f53..3ab6a18af 100644
+--- a/src/kmmainwidget.cpp
b/src/kmmainwidget.cpp
+@@ -2096,8 +2096,7 @@ void KMMainWidget::slotCustomReplyAllToMsg(const QString
&tmpl)
+ qCDebug(KMAIL_LOG) << "Reply to All with template:" << tmpl;
+
+ auto command = new KMReplyCommand(this, msg, MessageComposer::ReplyAll,
text, false, tmpl);
+-command->setReplyAsHtml(messageView()->htmlMail());
+-
++command->setReplyAsHtml(messageView() ? messageView()->htmlMail() :
false);
+ command->start();
+ }
+
+@@ -4745,7 +4744,7 @@ void KMMainWidget::slotRedirectCurrentMessage()
+ void KMMainWidget::replyMessageTo(const Akonadi::Item &item, bool replyToAll)
+ {
+ auto command = new KMReplyCommand(this, item, replyToAll ?
MessageComposer::ReplyAll : MessageComposer::ReplyAuthor);
+-command->setReplyAsHtml(messageView()->htmlMail());
++command->setReplyAsHtml(messageView() ? messageView()->htmlMail() :
false);
+ command->start();
+ }
+
+--
+GitLab
+
diff --git a/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-startup.patch
b/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-startup.patch
new file mode 100644
index ..a798f1afe567
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-22.08.3-fix-crash-on-startup.patch
@@ -0,0 +1,47 @@
+From 9d37b837eca35bd7976709a9d25d3700c70e321e Mon Sep 17 00:00:00 2001
+From: Laurent Montel
+Date: Sat, 31 Dec 2022 10:55:34 +0100
+Subject: [PATCH] Fix bug 460747: Kontact Crashes Upon Start
+
+BUG: 460747
+FIXED-IN: 5.22.1
+---
+ src/kmmainwidget.cpp | 15 ---
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
+index 8d332b36b..8c7013f8b 100644
+--- a/src/kmmainwidget.cpp
b/src/kmmainwidget.cpp
+@@ -3403,6 +3403,14 @@ void KMMainWidget::setupActions()
+ QAction *act = actionCollection()->addAction(KStandardAction::Undo,
QStringLiteral("kmail_undo"));
+ connect(act, &QAction::triggered, this, &KMMainWidget::slotUndo);
+
++mAccountSettings = new
QAction(QIcon::fromTheme(QStringLiteral("configure")), i18n("Account
&Settings"), this);
++actionCollection()->addAction(QStringLiteral("resource_settings"),
mAccountSettings);
++connect(mAccountSettings, &QAction::triggered, this,
&KMMainWidget::slotAccountSettings);
++
++mRestartAccountSettings = new
QAction(QIcon::fromTheme(QStringLiteral("view-refresh")), i18n("Restart
Account"), this);
++actionCollection()->addAction(QStringLiteral("resource_restart"),
mRestartAccountSettings);
++connect(mRestartAccountSettings, &QAction::triggered, this,
&KMMainWidget::slotRestartAccount);
++
+ menutimer = new QTimer(thi
[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/kmail/files/
commit: 889b7cb2cd6dd320ff513d407b6a67dbef0a1172
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Aug 14 08:46:42 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Aug 14 08:47:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=889b7cb2
kde-apps/kmail: Fix missing header with Frameworks 5.61
Closes: https://bugs.gentoo.org/692116
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../kmail/files/kmail-19.04.3-missing-header.patch | 24 ++
kde-apps/kmail/kmail-19.04.3.ebuild| 2 ++
2 files changed, 26 insertions(+)
diff --git a/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch
b/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch
new file mode 100644
index 000..6c6cc309213
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch
@@ -0,0 +1,24 @@
+From 201eac97eba591e16f0108e2605b9977e2db9a03 Mon Sep 17 00:00:00 2001
+From: Allen Winter
+Date: Thu, 18 Jul 2019 15:35:24 -0400
+Subject: summaryview_part.h - fix build by including QMap
+
+---
+ src/kontactplugin/summary/summaryview_part.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kontactplugin/summary/summaryview_part.h
b/src/kontactplugin/summary/summaryview_part.h
+index 542335d..b116e23 100644
+--- a/src/kontactplugin/summary/summaryview_part.h
b/src/kontactplugin/summary/summaryview_part.h
+@@ -25,7 +25,7 @@
+ #define SUMMARYVIEW_PART_H
+
+ #include
+-#include
++#include
+
+ class DropWidget;
+
+--
+cgit v1.1
diff --git a/kde-apps/kmail/kmail-19.04.3.ebuild
b/kde-apps/kmail/kmail-19.04.3.ebuild
index 0b70de2bd9b..3fb1fb73c9a 100644
--- a/kde-apps/kmail/kmail-19.04.3.ebuild
+++ b/kde-apps/kmail/kmail-19.04.3.ebuild
@@ -83,6 +83,8 @@ RDEPEND="${COMMON_DEPEND}
$(add_kdeapps_dep kmail-account-wizard)
"
+PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
+
RESTRICT+=" test" # bug 616878
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/kmail/files/
commit: dee2a816907f66000aa963d3f088008ebcda6b71
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jun 6 19:08:40 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 6 20:33:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dee2a816
kde-apps/kmail: Fix crash on exit
See also: https://mail.kde.org/pipermail/release-team/2019-June/011386.html
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=404881
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../kmail/files/kmail-19.04.2-crash-on-exit.patch | 74 +
kde-apps/kmail/kmail-19.04.2-r1.ebuild | 117 +
2 files changed, 191 insertions(+)
diff --git a/kde-apps/kmail/files/kmail-19.04.2-crash-on-exit.patch
b/kde-apps/kmail/files/kmail-19.04.2-crash-on-exit.patch
new file mode 100644
index 000..5817694013a
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-19.04.2-crash-on-exit.patch
@@ -0,0 +1,74 @@
+From 97e165dcf5a851ee10526631d24f9af7736da2e6 Mon Sep 17 00:00:00 2001
+From: David Faure
+Date: Thu, 6 Jun 2019 18:10:42 +0200
+Subject: Fix kontact crash on logout.
+
+Summary:
+KMail was creating new Akonadi jobs during mainwindow destruction,
+due to not testing the bool in GuiActivateEvent.
+
+Same bt in bug 404881, apparently quitting from the akregator tray icon
+[which quits all of kontact... separate issue...] gave the same crash.
+
+BUG: 404881
+FIXED-IN: 19.04.2
+
+Test Plan: Run kontact, logout. Hello Drkonqi.
+
+Reviewers: mlaurent, winterz
+
+Reviewed By: mlaurent, winterz
+
+Subscribers: kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D21626
+---
+ src/kmail_part.cpp | 23 ---
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/src/kmail_part.cpp b/src/kmail_part.cpp
+index 703a1ee..96c4c07 100644
+--- a/src/kmail_part.cpp
b/src/kmail_part.cpp
+@@ -33,6 +33,7 @@
+
+ #include
+
++#include
+ #include
+ #include
+ #include
+@@ -129,18 +130,18 @@ bool KMailPart::openFile()
+ void KMailPart::guiActivateEvent(KParts::GUIActivateEvent *e)
+ {
+ KParts::ReadOnlyPart::guiActivateEvent(e);
+-mainWidget->initializeFilterActions();
+-mainWidget->tagActionManager()->createActions();
+-mainWidget->folderShortcutActionManager()->createActions();
+-mainWidget->populateMessageListStatusFilterCombo();
+-mainWidget->initializePluginActions();
+-/*
+-FIXME it doesn't work when we switch component.
+-const QString title = mainWidget->fullCollectionPath();
+-if (!title.isEmpty()) {
+-Q_EMIT setWindowCaption(title);
++if (e->activated()) {
++mainWidget->initializeFilterActions();
++mainWidget->tagActionManager()->createActions();
++mainWidget->folderShortcutActionManager()->createActions();
++mainWidget->populateMessageListStatusFilterCombo();
++mainWidget->initializePluginActions();
++
++const QString title = mainWidget->fullCollectionPath();
++if (!title.isEmpty()) {
++Q_EMIT setWindowCaption(title);
++}
+ }
+-*/
+ }
+
+ void KMailPart::exit()
+--
+cgit v1.1
diff --git a/kde-apps/kmail/kmail-19.04.2-r1.ebuild
b/kde-apps/kmail/kmail-19.04.2-r1.ebuild
new file mode 100644
index 000..dd0a95a3f0d
--- /dev/null
+++ b/kde-apps/kmail/kmail-19.04.2-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+HOMEPAGE="https://kde.org/applications/internet/kmail/";
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+ dev-libs/libxslt
+ test? ( $(add_kdeapps_dep akonadi 'tools') )
+"
+COMMON_DEPEND="
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ $(add_kdeapps_dep akonadi)
+
[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/kmail/files/
commit: 65807b8c2383023f7db69dea885c2f25a5abfeab
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Oct 19 19:19:49 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Oct 19 19:20:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65807b8c
kde-apps/kmail: Fix main/status toolbar option persistence
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=396339
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=395988
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../files/kmail-18.04.3-no-sync-after-save.patch | 90
.../files/kmail-18.04.3-setAutoSaveSettings.patch | 52 ++
kde-apps/kmail/kmail-18.04.3-r1.ebuild | 115 +
3 files changed, 257 insertions(+)
diff --git a/kde-apps/kmail/files/kmail-18.04.3-no-sync-after-save.patch
b/kde-apps/kmail/files/kmail-18.04.3-no-sync-after-save.patch
new file mode 100644
index 000..c770dac239b
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-18.04.3-no-sync-after-save.patch
@@ -0,0 +1,90 @@
+From fcd21f9712143afb956dca2f67fb930fffc074fd Mon Sep 17 00:00:00 2001
+From: David Faure
+Date: Tue, 31 Jul 2018 11:59:24 +0200
+Subject: KMail: don't sync after save, don't reload after last sync
+
+Summary:
+* save() takes care of sync() already, if anything changed.
+* When quitting there's no reason to reload the configuration.
+
+Test Plan: None yet
+
+Reviewers: mlaurent
+
+Reviewed By: mlaurent
+
+Subscribers: kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D14509
+---
+ src/kmkernel.cpp | 26 +++---
+ src/kmkernel.h | 1 +
+ 2 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp
+index aafb9ee..7af593d 100644
+--- a/src/kmkernel.cpp
b/src/kmkernel.cpp
+@@ -231,7 +231,7 @@ KMKernel::~KMKernel()
+ mMailService = nullptr;
+
+ stopAgentInstance();
+-slotSyncConfig();
++saveConfig();
+
+ delete mAutoCorrection;
+ delete mMailCommonSettings;
+@@ -1172,16 +1172,7 @@ void KMKernel::slotRequestConfigSync()
+
+ void KMKernel::slotSyncConfig()
+ {
+-PimCommon::PimCommonSettings::self()->save();
+-MessageCore::MessageCoreSettings::self()->save();
+-MessageViewer::MessageViewerSettings::self()->save();
+-MessageComposer::MessageComposerSettings::self()->save();
+-TemplateParser::TemplateParserSettings::self()->save();
+-MessageList::MessageListSettings::self()->save();
+-mMailCommonSettings->save();
+-Gravatar::GravatarSettings::self()->save();
+-KMailSettings::self()->save();
+-KMKernel::config()->sync();
++saveConfig();
+ //Laurent investigate why we need to reload them.
+ PimCommon::PimCommonSettings::self()->load();
+ MessageCore::MessageCoreSettings::self()->load();
+@@ -1195,6 +1186,19 @@ void KMKernel::slotSyncConfig()
+ KMKernel::config()->reparseConfiguration();
+ }
+
++void KMKernel::saveConfig()
++{
++PimCommon::PimCommonSettings::self()->save();
++MessageCore::MessageCoreSettings::self()->save();
++MessageViewer::MessageViewerSettings::self()->save();
++MessageComposer::MessageComposerSettings::self()->save();
++TemplateParser::TemplateParserSettings::self()->save();
++MessageList::MessageListSettings::self()->save();
++mMailCommonSettings->save();
++Gravatar::GravatarSettings::self()->save();
++KMailSettings::self()->save();
++}
++
+ void KMKernel::updateConfig()
+ {
+ slotConfigChanged();
+diff --git a/src/kmkernel.h b/src/kmkernel.h
+index e7fc071..f5da22d 100644
+--- a/src/kmkernel.h
b/src/kmkernel.h
+@@ -487,6 +487,7 @@ private:
+ void resourceGoOnLine();
+ void openReader(bool onlyCheck);
+ QSharedPointer currentFolderCollection();
++void saveConfig();
+
+ KMail::UndoStack *the_undoStack = nullptr;
+ MessageComposer::AkonadiSender *the_msgSender = nullptr;
+--
+cgit v0.11.2
diff --git a/kde-apps/kmail/files/kmail-18.04.3-setAutoSaveSettings.patch
b/kde-apps/kmail/files/kmail-18.04.3-setAutoSaveSettings.patch
new file mode 100644
index 000..a7377b61f19
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-18.04.3-setAutoSaveSettings.patch
@@ -0,0 +1,52 @@
+From 814f0db2a1ae5b15bf91909ce80a5d6792f9aeed Mon Sep 17 00:00:00 2001
+From: David Faure
+Date: Sun, 29 Jul 2018 13:05:38 +0200
+Subject: Port to setAutoSaveSettings so that saving happens before hiding.
+
+Summary:
+See d35a882895 in kxmlgui for more complete explanation.
+
+BUG: 396339
+CCBUG: 395988
+
+Test Plan: kmail ; Alt+F4 ; kmail -> now the statusbar and toolbar are visible
again
+
+Reviewers: ngraham, elvisangelaccio, broulik, cfeck, mlaurent
+
+Reviewed By: mlaurent
+
+Subscribers: kde-pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D14454
+---
+ src/kmmainwin.cpp | 6 +-
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/
[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/kmail/files/
commit: 80002efdca465743e00019d448e184467c4284ae
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jan 16 11:25:16 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jan 16 11:27:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80002efd
kde-apps/kmail: Fix apply filters
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../kmail/files/kmail-17.12.1-applyfilters.patch | 36 +++
kde-apps/kmail/kmail-17.12.1-r1.ebuild | 113 +
2 files changed, 149 insertions(+)
diff --git a/kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch
b/kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch
new file mode 100644
index 000..4952628ecc6
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch
@@ -0,0 +1,36 @@
+From e0c1bf6570537086628d455cab22c802d663344d Mon Sep 17 00:00:00 2001
+From: Laurent Montel
+Date: Mon, 15 Jan 2018 13:50:15 +0100
+Subject: Fix Bug 388953 - Apply filters on folder doesn't work anymore
+
+FIXED-IN: 5.7.2
+BUG: 388953
+---
+ src/kmmainwidget.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
+index d0edc48..ab0996e 100644
+--- a/src/kmmainwidget.cpp
b/src/kmmainwidget.cpp
+@@ -3310,7 +3310,7 @@ void KMMainWidget::setupActions()
+ {
+ mApplyAllFiltersFolderAction = new
QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All
Filters"), this);
+ actionCollection()->addAction(QStringLiteral("apply_filters_folder"),
mApplyAllFiltersFolderAction);
+-connect(mServerSideSubscription, &QAction::triggered,
++connect(mApplyAllFiltersFolderAction, &QAction::triggered,
+ this, [this] { slotApplyFiltersOnFolder(/* recursive */
false);
+ });
+ }
+@@ -3318,7 +3318,7 @@ void KMMainWidget::setupActions()
+ {
+ mApplyAllFiltersFolderRecursiveAction = new
QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All
Filters"), this);
+
actionCollection()->addAction(QStringLiteral("apply_filters_folder_recursive"),
mApplyAllFiltersFolderRecursiveAction);
+-connect(mServerSideSubscription, &QAction::triggered,
++connect(mApplyAllFiltersFolderRecursiveAction, &QAction::triggered,
+ this, [this] { slotApplyFiltersOnFolder(/* recursive */ true);
+ });
+ }
+--
+cgit v0.11.2
+
diff --git a/kde-apps/kmail/kmail-17.12.1-r1.ebuild
b/kde-apps/kmail/kmail-17.12.1-r1.ebuild
new file mode 100644
index 000..86fcd8766e4
--- /dev/null
+++ b/kde-apps/kmail/kmail-17.12.1-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+HOMEPAGE="https://www.kde.org/applications/internet/kmail/";
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ $(add_kdeapps_dep akonadi)
+ $(add_kdeapps_dep akonadi-contacts)
+ $(add_kdeapps_dep akonadi-mime)
+ $(add_kdeapps_dep akonadi-search)
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcontacts)
+ $(add_kdeapps_dep kdepim-apps-libs)
+ $(add_kdeapps_dep kidentitymanagement)
+ $(add_kdeapps_dep kmailtransport)
+ $(add_kdeapps_dep kmime)
+ $(add_kdeapps_dep kontactinterface)
+ $(add_kdeapps_dep kpimtextedit)
+ $(add_kdeapps_dep libgravatar)
+ $(add_kdeapps_dep libkdepim)
+ $(add_kdeapps_dep libkleo)
+ $(add_kdeapps_dep libksieve)
+ $(add_kdeapps_dep libktnef)
+ $(add_kdeapps_dep mailcommon)
+ $(add_kdeapps_dep messagelib)
+ $(add_kdeapps_dep pimcommon)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+
[gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/kmail/files/
commit: 9d80a4784aa48c29ad39ed1c39ab0ed45b8867ea
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jun 15 11:48:10 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 15 11:48:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d80a478
kde-apps/kmail: Fix CVE-2017-9604
Gentoo-bug: 621828
Package-Manager: Portage-2.3.5, Repoman-2.3.1
.../kmail-4.14.11_pre20160611-CVE-2017-9604.patch | 89 +
kde-apps/kmail/kmail-4.14.11_pre20160611-r1.ebuild | 107 +
2 files changed, 196 insertions(+)
diff --git a/kde-apps/kmail/files/kmail-4.14.11_pre20160611-CVE-2017-9604.patch
b/kde-apps/kmail/files/kmail-4.14.11_pre20160611-CVE-2017-9604.patch
new file mode 100644
index 000..e36e074e0b2
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-4.14.11_pre20160611-CVE-2017-9604.patch
@@ -0,0 +1,89 @@
+From c54706e990bbd6498e7b1597ec7900bc809e8197 Mon Sep 17 00:00:00 2001
+From: Montel Laurent
+Date: Fri, 2 Jun 2017 13:56:41 +0200
+Subject: Make sure to sign/encrypt message when we send later
+
+(cherry picked from commit 4048f5e46d0a7d62d93d74fd2861dd70fb2ad660)
+---
+ messagecomposer/composer/composerviewbase.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: kdepim-4.14.10/messagecomposer/composer/composerviewbase.cpp
+===
+--- kdepim-4.14.10.orig/messagecomposer/composer/composerviewbase.cpp
kdepim-4.14.10/messagecomposer/composer/composerviewbase.cpp
+@@ -435,7 +435,7 @@ void MessageComposer::ComposerViewBase::
+ // 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 ) {
++if( m_neverEncrypt && mSaveIn !=
MessageComposer::MessageSender::SaveInNone && !mSendLaterInfo) {
+ MessageComposer::Composer* composer = new MessageComposer::Composer;
+ composer->setNoCrypto( true );
+ m_composers.append( composer );
+From 78c5552be2f00a4ac25bd77ca39386522fca70a8 Mon Sep 17 00:00:00 2001
+From: Montel Laurent
+Date: Fri, 2 Jun 2017 13:59:02 +0200
+Subject: Make sure that we use plugin when we use sendlater feature
+
+---
+ src/editor/kmcomposewin.cpp | 9 +
+ src/editor/kmcomposewin.h | 3 ++-
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+Index: kdepim-4.14.10/kmail/editor/kmcomposewin.cpp
+===
+--- kdepim-4.14.10.orig/kmail/editor/kmcomposewin.cpp
kdepim-4.14.10/kmail/editor/kmcomposewin.cpp
+@@ -2533,7 +2533,7 @@ void KMComposeWin::printComposeResult( K
+
+
+ void KMComposeWin::doSend( MessageComposer::MessageSender::SendMethod method,
+- MessageComposer::MessageSender::SaveIn saveIn )
++ MessageComposer::MessageSender::SaveIn saveIn,
bool willSendItWithoutReediting )
+ {
+ if ( mStorageService->numProgressUpdateFile() > 0) {
+ KMessageBox::sorry( this, i18np( "There is %1 file upload in
progress.",
+@@ -2549,7 +2549,7 @@ void KMComposeWin::doSend( MessageCompos
+ }
+
+
+-if ( saveIn == MessageComposer::MessageSender::SaveInNone ) { // don't
save as draft or template, send immediately
++if ( saveIn == MessageComposer::MessageSender::SaveInNone ||
willSendItWithoutReediting ) { // don't save as draft or template, send
immediately
+ if ( KPIMUtils::firstEmailAddress( from() ).isEmpty() ) {
+ if ( !( mShowHeaders & HDR_FROM ) ) {
+ mShowHeaders |= HDR_FROM;
+@@ -2716,6 +2716,7 @@ void KMComposeWin::slotSendLater()
+ return;
+ if ( !checkRecipientNumber() )
+ return;
++mComposerBase->setSendLaterInfo(NULL);
+ if ( mComposerBase->editor()->checkExternalEditorFinished() ) {
+ const bool wasRegistered =
(SendLater::SendLaterUtil::sentLaterAgentWasRegistered() &&
SendLater::SendLaterUtil::sentLaterAgentEnabled());
+ if (wasRegistered) {
+@@ -2739,9 +2740,9 @@ void KMComposeWin::slotSendLater()
+ {
+ mComposerBase->setSendLaterInfo(info);
+ if (info->isRecurrence()) {
+-doSend( MessageComposer::MessageSender::SendLater,
MessageComposer::MessageSender::SaveInTemplates );
++doSend( MessageComposer::MessageSender::SendLater,
MessageComposer::MessageSender::SaveInTemplates, true );
+ } else {
+-doSend( MessageComposer::MessageSender::SendLater,
MessageComposer::MessageSender::SaveInDrafts );
++doSend( MessageComposer::MessageSender::SendLater,
MessageComposer::MessageSender::SaveInDrafts, true );
+ }
+ break;
+ }
+Index: kdepim-4.14.10/kmail/editor/km
