* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/kmail/files/
@ 2017-06-15 11:49 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-06-15 11:49 UTC (permalink / raw
To: gentoo-commits
commit: 9d80a4784aa48c29ad39ed1c39ab0ed45b8867ea
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 11:48:10 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 11:48:50 2017 +0000
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 00000000000..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 <montel@kde.org>
+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 <montel@kde.org>
+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/kmcomposewin.h
+===================================================================
+--- kdepim-4.14.10.orig/kmail/editor/kmcomposewin.h
++++ kdepim-4.14.10/kmail/editor/kmcomposewin.h
+@@ -549,7 +549,8 @@ private:
+ * Send the message.
+ */
+ void doSend( MessageComposer::MessageSender::SendMethod method=MessageComposer::MessageSender::SendDefault,
+- MessageComposer::MessageSender::SaveIn saveIn = MessageComposer::MessageSender::SaveInNone );
++ MessageComposer::MessageSender::SaveIn saveIn = MessageComposer::MessageSender::SaveInNone,
++ bool willSendItWithoutReediting = false);
+
+ void doDelayedSend( MessageComposer::MessageSender::SendMethod method, MessageComposer::MessageSender::SaveIn saveIn );
+
diff --git a/kde-apps/kmail/kmail-4.14.11_pre20160611-r1.ebuild b/kde-apps/kmail/kmail-4.14.11_pre20160611-r1.ebuild
new file mode 100644
index 00000000000..0a6b95d051c
--- /dev/null
+++ b/kde-apps/kmail/kmail-4.14.11_pre20160611-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+VIRTUALX_REQUIRED="test"
+WEBKIT_REQUIRED="always"
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+ $(add_kdeapps_dep kdepim-common-libs '' 4.14.11_pre20160611)
+ $(add_kdeapps_dep kdepimlibs '' 4.14.11_pre20160611)
+ $(add_kdeapps_dep korganizer)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+# bug 393147
+
+KMEXTRACTONLY="
+ agents/folderarchiveagent.desktop
+ agents/sendlateragent/
+ akonadi_next/
+ calendarviews/
+ grantleeeditor/grantleethemeeditor/
+ kdgantt2/
+ korganizer/
+ kresources/
+ libkdepimdbusinterfaces/
+ libkleo/
+ libkpgp/
+"
+KMCOMPILEONLY="
+ calendarsupport/
+ grantleetheme/
+ incidenceeditor-ng/
+ kaddressbookgrantlee/
+ mailcommon/
+ mailimporter/
+ messagecomposer/
+ messagecore/
+ messagelist/
+ messageviewer/
+ mailcommon/
+ mailimporter/
+ noteshared/
+ pimcommon/
+ templateparser/
+"
+KMEXTRA="
+ agents/archivemailagent/
+ agents/followupreminderagent/
+ agents/mailfilteragent/
+ grantleeeditor/headerthemeeditor/
+ importwizard/
+ kmailcvt/
+ ksendemail/
+ libksieve/
+ mboximporter/
+ pimsettingexporter/
+ plugins/messageviewer/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2017-9604.patch" )
+
+src_compile() {
+ kde4-meta_src_compile kmail_xml
+ kde4-meta_src_compile
+}
+
+pkg_postinst() {
+ kde4-meta_pkg_postinst
+
+ if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
+ echo
+ elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
+ echo
+ fi
+ if ! has_version kde-apps/kleopatra:${SLOT}; then
+ echo
+ elog "For certificate management and the gnupg log viewer, please install kde-apps/kleopatra:${SLOT}"
+ echo
+ fi
+
+ if has_version "kde-apps/akonadi[sqlite]"; then
+ ewarn
+ ewarn "We strongly recommend you set your Akonadi database backend to QMYSQL in your"
+ ewarn "user configuration. This is the backend recommended by KDE upstream."
+ ewarn "Reports indicate that kde-apps/kmail-4.10 does not work properly with the sqlite"
+ ewarn "backend anymore."
+ if has_version "kde-apps/akonadi[-mysql]"; then
+ ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD kde-apps/akonadi WITH mysql USEFLAG ENABLED."
+ fi
+ ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+ ewarn
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/kmail/files/
@ 2018-01-16 11:28 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-01-16 11:28 UTC (permalink / raw
To: gentoo-commits
commit: 80002efdca465743e00019d448e184467c4284ae
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 11:25:16 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 11:27:59 2018 +0000
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 00000000000..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 <montel@kde.org>
+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 00000000000..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)
+ $(add_qt_dep qtwebengine 'widgets')
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ >=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_kdeapps_dep kcalutils)
+ $(add_kdeapps_dep kldap)
+ dev-libs/libxslt
+ test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+ !kde-apps/kdepim-common-libs:4
+ !kde-apps/kdepim-l10n
+ !kde-apps/ktnef
+ $(add_kdeapps_dep kdepim-runtime)
+ $(add_kdeapps_dep kmail-account-wizard)
+"
+
+RESTRICT+=" test" # bug 616878
+
+PATCHES=( "${FILESDIR}/${P}-applyfilters.patch" )
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ if ! use handbook; then
+ sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
+ fi
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ pkg_is_installed() {
+ echo "${1} ($(has_version ${1} || echo "not ")installed)"
+ }
+
+ elog "KMail supports the following runtime dependencies:"
+ elog " Virus detection:"
+ elog " $(pkg_is_installed app-antivirus/clamav)"
+ elog " Spam filtering:"
+ elog " $(pkg_is_installed mail-filter/bogofilter)"
+ elog " $(pkg_is_installed mail-filter/spamassassin)"
+ elog " Fancy e-mail headers and various useful plugins:"
+ elog " $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
+ elog " Crypto config and certificate details GUI:"
+ elog " $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/kmail/files/
@ 2018-10-19 19:20 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-10-19 19:20 UTC (permalink / raw
To: gentoo-commits
commit: 65807b8c2383023f7db69dea885c2f25a5abfeab
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 19 19:19:49 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 19 19:20:11 2018 +0000
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 <asturm <AT> 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 00000000000..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 <faure@kde.org>
+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<MailCommon::FolderSettings> 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 00000000000..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 <faure@kde.org>
+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/src/kmmainwin.cpp b/src/kmmainwin.cpp
+index ce3b042..f3550ba 100644
+--- a/src/kmmainwin.cpp
++++ b/src/kmmainwin.cpp
+@@ -76,7 +76,7 @@ KMMainWin::KMMainWin(QWidget *)
+ createGUI(QStringLiteral("kmmainwin.rc"));
+
+ //must be after createGUI, otherwise e.g toolbar settings are not loaded
+- applyMainWindowSettings(KMKernel::self()->config()->group("Main Window"));
++ setAutoSaveSettings(KMKernel::self()->config()->group("Main Window"));
+
+ connect(KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::statusMsg,
+ this, &KMMainWin::displayStatusMessage);
+@@ -94,10 +94,6 @@ KMMainWin::~KMMainWin()
+ // Avoids a crash if there are any Akonadi jobs running, which may
+ // attempt to display a status message when they are killed.
+ disconnect(KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::statusMsg, this, nullptr);
+-
+- KConfigGroup grp(KMKernel::self()->config()->group("Main Window"));
+- saveMainWindowSettings(grp);
+- KMKernel::self()->config()->sync();
+ }
+
+ KMMainWidget *KMMainWin::mainKMWidget() const
+--
+cgit v0.11.2
diff --git a/kde-apps/kmail/kmail-18.04.3-r1.ebuild b/kde-apps/kmail/kmail-18.04.3-r1.ebuild
new file mode 100644
index 00000000000..80a2769dd4a
--- /dev/null
+++ b/kde-apps/kmail/kmail-18.04.3-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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)
+ $(add_qt_dep qtwebengine 'widgets')
+ $(add_qt_dep qtwidgets)
+ >=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_kdeapps_dep kcalutils)
+ $(add_kdeapps_dep kldap)
+ dev-libs/libxslt
+ test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+ !kde-apps/kdepim-common-libs:4
+ !kde-apps/kdepim-l10n
+ !kde-apps/ktnef
+ $(add_kdeapps_dep kdepim-runtime)
+ $(add_kdeapps_dep kmail-account-wizard)
+"
+
+RESTRICT+=" test" # bug 616878
+
+PATCHES=(
+ "${FILESDIR}/${P}-no-sync-after-save.patch"
+ "${FILESDIR}/${P}-setAutoSaveSettings.patch"
+)
+
+src_prepare() {
+ kde5_src_prepare
+
+ if ! use handbook; then
+ sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
+ fi
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ pkg_is_installed() {
+ echo "${1} ($(has_version ${1} || echo "not ")installed)"
+ }
+
+ elog "KMail supports the following runtime dependencies:"
+ elog " Virus detection:"
+ elog " $(pkg_is_installed app-antivirus/clamav)"
+ elog " Spam filtering:"
+ elog " $(pkg_is_installed mail-filter/bogofilter)"
+ elog " $(pkg_is_installed mail-filter/spamassassin)"
+ elog " Fancy e-mail headers and various useful plugins:"
+ elog " $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
+ elog " Crypto config and certificate details GUI:"
+ elog " $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/kmail/files/
@ 2019-06-06 20:33 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-06-06 20:33 UTC (permalink / raw
To: gentoo-commits
commit: dee2a816907f66000aa963d3f088008ebcda6b71
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 6 19:08:40 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 20:33:15 2019 +0000
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 <asturm <AT> 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 00000000000..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 <faure@kde.org>
+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 <QVBoxLayout>
+
++#include <KParts/GUIActivateEvent>
+ #include <kparts/statusbarextension.h>
+ #include <kparts/mainwindow.h>
+ #include <kpluginfactory.h>
+@@ -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 00000000000..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)
+ $(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)
+ $(add_qt_dep qtwebengine 'widgets')
+ $(add_qt_dep qtwidgets)
+ >=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_kdeapps_dep kcalutils)
+ $(add_kdeapps_dep kldap)
+ test? ( $(add_kdeapps_dep akonadi 'sqlite') )
+"
+RDEPEND="${COMMON_DEPEND}
+ !kde-apps/kdepim-common-libs:4
+ !kde-apps/kdepim-l10n
+ !kde-apps/ktnef
+ $(add_kdeapps_dep kdepim-runtime)
+ $(add_kdeapps_dep kmail-account-wizard)
+"
+
+PATCHES=( "${FILESDIR}/${P}-crash-on-exit.patch" )
+
+RESTRICT+=" test" # bug 616878
+
+src_prepare() {
+ kde5_src_prepare
+
+ if ! use handbook; then
+ sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
+ fi
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ pkg_is_installed() {
+ echo "${1} ($(has_version ${1} || echo "not ")installed)"
+ }
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "KMail supports the following runtime dependencies:"
+ elog " Virus detection:"
+ elog " $(pkg_is_installed app-antivirus/clamav)"
+ elog " Spam filtering:"
+ elog " $(pkg_is_installed mail-filter/bogofilter)"
+ elog " $(pkg_is_installed mail-filter/spamassassin)"
+ elog " Fancy e-mail headers and various useful plugins:"
+ elog " $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
+ elog " Crypto config and certificate details GUI:"
+ elog " $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/kmail/files/
@ 2019-08-14 8:47 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-08-14 8:47 UTC (permalink / raw
To: gentoo-commits
commit: 889b7cb2cd6dd320ff513d407b6a67dbef0a1172
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 08:46:42 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 08:47:09 2019 +0000
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 <asturm <AT> gentoo.org>
| 24 ++++++++++++++++++++++
kde-apps/kmail/kmail-19.04.3.ebuild | 2 ++
2 files changed, 26 insertions(+)
--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 00000000000..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 <winter@kde.org>
+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 <KParts/ReadOnlyPart>
+-#include <kparts/readonlypart.h>
++#include <QMap>
+
+ 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() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/kmail/files/
@ 2023-01-28 22:48 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2023-01-28 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 8a8382264b06c181b312b99ba422fffa4a93a797
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 21:24:42 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 22:32:25 2023 +0000
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 <asturm <AT> 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 000000000000..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 <montel@kde.org>
+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 000000000000..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 <montel@kde.org>
+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(this);
+ menutimer->setObjectName(QStringLiteral("menutimer"));
+ menutimer->setSingleShot(true);
+@@ -3535,13 +3543,6 @@ void KMMainWidget::setupActions()
+ actionCollection()->addAction(QStringLiteral("remove_duplicate_recursive"), mRemoveDuplicateRecursiveAction);
+ connect(mRemoveDuplicateRecursiveAction, &KToggleAction::triggered, this, &KMMainWidget::slotRemoveDuplicateRecursive);
+
+- 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);
+ {
+ QList<QAction *> listActions;
+ auto act = new QAction(i18n("Previous Selected Folder"), this); // TODO fix me i18n
+--
+GitLab
+
diff --git a/kde-apps/kmail/files/kmail-22.08.3-fix-open-detailed-progress-bar.patch b/kde-apps/kmail/files/kmail-22.08.3-fix-open-detailed-progress-bar.patch
new file mode 100644
index 000000000000..1ff35b388dc7
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-22.08.3-fix-open-detailed-progress-bar.patch
@@ -0,0 +1,52 @@
+From 437295a534eca2907e749f18d8d895da50d343b9 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Sat, 10 Dec 2022 19:55:33 +0100
+Subject: [PATCH] Fix bug 460289: Opening the detailed progress window does
+ nothing
+
+BUG: 460289
+FIXED-IN: 5.22.1
+---
+ src/kmmainwin.cpp | 5 ++++-
+ src/kmmainwin.h | 2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/kmmainwin.cpp b/src/kmmainwin.cpp
+index 5900bf309..9952667fe 100644
+--- a/src/kmmainwin.cpp
++++ b/src/kmmainwin.cpp
+@@ -36,7 +36,6 @@ using namespace std::chrono_literals;
+
+ KMMainWin::KMMainWin(QWidget *)
+ : KXmlGuiWindow(nullptr)
+- , mProgressBar(new KPIM::ProgressStatusBarWidget(statusBar(), this))
+ , mMessageLabel(new QLabel(i18n("Starting...")))
+
+ {
+@@ -51,6 +50,10 @@ KMMainWin::KMMainWin(QWidget *)
+ resize(700, 500); // The default size
+
+ mKMMainWidget = new KMMainWidget(this, this, actionCollection());
++
++ // Don't initialize in constructor. We need this statusbar created
++ // Bug 460289
++ mProgressBar = new KPIM::ProgressStatusBarWidget(statusBar(), this);
+ connect(mKMMainWidget, &KMMainWidget::recreateGui, this, &KMMainWin::slotUpdateGui);
+ setCentralWidget(mKMMainWidget);
+ setupStatusBar();
+diff --git a/src/kmmainwin.h b/src/kmmainwin.h
+index 314f14d47..377f6818b 100644
+--- a/src/kmmainwin.h
++++ b/src/kmmainwin.h
+@@ -57,7 +57,7 @@ private:
+ void updateHamburgerMenu();
+ void slotShortcutSaved();
+ void slotFullScreen(bool t);
+- KPIM::ProgressStatusBarWidget *const mProgressBar;
++ KPIM::ProgressStatusBarWidget *mProgressBar = nullptr;
+ KMMainWidget *mKMMainWidget = nullptr;
+ KToggleAction *mShowMenuBarAction = nullptr;
+ QLabel *const mMessageLabel;
+--
+GitLab
+
diff --git a/kde-apps/kmail/files/kmail-22.08.3-fix-random-text-in-config-settings.patch b/kde-apps/kmail/files/kmail-22.08.3-fix-random-text-in-config-settings.patch
new file mode 100644
index 000000000000..282fb6109acc
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-22.08.3-fix-random-text-in-config-settings.patch
@@ -0,0 +1,29 @@
+From 6618f8f80ccadff908d11db7506b3af8d15ad032 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Fri, 16 Dec 2022 06:59:17 +0100
+Subject: [PATCH] BUG: 459399 Fix Random text in kmail's message list
+ configuration settings
+
+Apply patch from Yaroslav Sidlovsky (thanks)
+BUG: 459399
+FIXED-IN: 5.22.1
+---
+ src/configuredialog/configureappearancepage.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/configuredialog/configureappearancepage.cpp b/src/configuredialog/configureappearancepage.cpp
+index 085179f05..0909db227 100644
+--- a/src/configuredialog/configureappearancepage.cpp
++++ b/src/configuredialog/configureappearancepage.cpp
+@@ -622,7 +622,7 @@ AppearancePageHeadersTab::AppearancePageHeadersTab(QWidget *parent)
+ .subs(DateFormatter::formatCurrentDate(dateDisplayConfig[i].dateDisplay))
+ .toString(); // i18n(label, DateFormatter::formatCurrentDate(dateDisplayConfig[i].dateDisplay));
+ } else {
+- buttonLabel = i18n(label);
++ buttonLabel = KLocalizedString(dateDisplayConfig[i].displayName).toString();
+ }
+ if (dateDisplayConfig[i].dateDisplay == DateFormatter::Custom) {
+ auto hbox = new QWidget(this);
+--
+GitLab
+
diff --git a/kde-apps/kmail/files/kmail-22.08.3-remove-removed-ShowUserAgent.patch b/kde-apps/kmail/files/kmail-22.08.3-remove-removed-ShowUserAgent.patch
new file mode 100644
index 000000000000..a6484b11ae50
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-22.08.3-remove-removed-ShowUserAgent.patch
@@ -0,0 +1,41 @@
+From fc0b487d3f3ac9c9ca0650aa635795b5478de85b Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Fri, 16 Dec 2022 07:28:28 +0100
+Subject: [PATCH] Remove info about removed feature (ShowUserAgent)
+
+CCBUG: 448348
+---
+ doc/kmail2/configure.docbook | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/doc/kmail2/configure.docbook b/doc/kmail2/configure.docbook
+index 4916acd8b..bb2648370 100644
+--- a/doc/kmail2/configure.docbook
++++ b/doc/kmail2/configure.docbook
+@@ -4167,23 +4167,6 @@ behavior, add to the [OutOfOffice] section:</para>
+ </itemizedlist>
+ </listitem>
+ </varlistentry>
+-<varlistentry>
+-<term><guilabel>ShowUserAgent</guilabel></term>
+-<listitem>
+-<para>
+-Starting in version 1.9, &kmail; can show the User-Agent or X-Mailer value
+-from the message header when using Fancy Headers (see <menuchoice><guimenu>View</guimenu>
+-<guisubmenu>Headers</guisubmenu></menuchoice> menu).
+-To enable this feature, add to the <quote>[Reader]</quote> section:</para>
+-<itemizedlist>
+-<listitem><para>Configuration file:</para>
+-<programlisting>ShowUserAgent=true</programlisting></listitem>
+-<listitem><para><command>kwriteconfig</command></para>
+-<para><prompt>%</prompt> <userinput><command>kwriteconfig</command> <option>--file <replaceable>/path/to/kmail2rc</replaceable> --group Reader --key ShowUserAgent true</option></userinput>
+-</para></listitem>
+-</itemizedlist>
+-</listitem>
+-</varlistentry>
+ </variablelist>
+ </sect1>
+
+--
+GitLab
+
diff --git a/kde-apps/kmail/kmail-22.08.3-r2.ebuild b/kde-apps/kmail/kmail-22.08.3-r2.ebuild
new file mode 100644
index 000000000000..1bbe4c685f7c
--- /dev/null
+++ b/kde-apps/kmail/kmail-22.08.3-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.96.0
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes"
+HOMEPAGE="https://apps.kde.org/kmail2/
+https://kontact.kde.org/components/kmail/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
+IUSE="pch speech telemetry"
+
+RESTRICT="test" # bug 616878
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+COMMON_DEPEND="
+ >=app-crypt/gpgme-1.16.0:=[cxx,qt5]
+ >=dev-qt/qtcore-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/akonadi-search-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/kontactinterface-${PVCUT}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5[speech=]
+ >=kde-apps/libgravatar-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/libkleo-${PVCUT}:5
+ >=kde-apps/libksieve-${PVCUT}:5
+ >=kde-apps/libktnef-${PVCUT}:5
+ >=kde-apps/mailcommon-${PVCUT}:5
+ >=kde-apps/messagelib-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcalendarcore-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcontacts-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/sonnet-${KFMIN}:5
+ telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=kde-apps/kcalutils-${PVCUT}:5
+ >=kde-apps/kldap-${PVCUT}:5
+ test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=kde-apps/kdepim-runtime-${PVCUT}:5
+ >=kde-apps/kmail-account-wizard-${PVCUT}:5
+"
+BDEPEND="
+ dev-libs/libxslt
+ test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-open-detailed-progress-bar.patch" # bug 891509
+ "${FILESDIR}/${P}-fix-random-text-in-config-settings.patch"
+ "${FILESDIR}/${P}-remove-removed-ShowUserAgent.patch"
+ "${FILESDIR}/${P}-fix-crash-on-startup.patch"
+ "${FILESDIR}/${P}-fix-crash-on-replay-msg-w-user-template.patch"
+)
+
+src_prepare() {
+ ecm_src_prepare
+ use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_PRECOMPILED_HEADERS=$(usex pch)
+ $(cmake_use_find_package telemetry KUserFeedback)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "virus detection" app-antivirus/clamav
+ optfeature "spam filtering" mail-filter/bogofilter mail-filter/spamassassin
+ optfeature "fancy e-mail headers and useful plugins" kde-apps/kdepim-addons:${SLOT}
+ optfeature "crypto config and certificate details GUI" kde-apps/kleopatra:${SLOT}
+ optfeature "import PIM data from other applications" kde-apps/akonadi-import-wizard:${SLOT}
+ fi
+ ecm_pkg_postinst
+}
diff --git a/kde-apps/kmail/kmail-22.12.1-r2.ebuild b/kde-apps/kmail/kmail-22.12.1-r2.ebuild
new file mode 100644
index 000000000000..4130f4de525d
--- /dev/null
+++ b/kde-apps/kmail/kmail-22.12.1-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.101.0
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm gear.kde.org optfeature
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes"
+HOMEPAGE="https://apps.kde.org/kmail2/
+https://kontact.kde.org/components/kmail/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="pch speech telemetry"
+
+RESTRICT="test" # bug 616878
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+COMMON_DEPEND="
+ >=app-crypt/gpgme-1.16.0:=[cxx,qt5]
+ >=dev-qt/qtcore-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-apps/akonadi-${PVCUT}:5
+ >=kde-apps/akonadi-contacts-${PVCUT}:5
+ >=kde-apps/akonadi-mime-${PVCUT}:5
+ >=kde-apps/akonadi-search-${PVCUT}:5
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/kontactinterface-${PVCUT}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5[speech=]
+ >=kde-apps/libgravatar-${PVCUT}:5
+ >=kde-apps/libkdepim-${PVCUT}:5
+ >=kde-apps/libkleo-${PVCUT}:5
+ >=kde-apps/libksieve-${PVCUT}:5
+ >=kde-apps/libktnef-${PVCUT}:5
+ >=kde-apps/mailcommon-${PVCUT}:5
+ >=kde-apps/messagelib-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcalendarcore-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcontacts-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/sonnet-${KFMIN}:5
+ telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=kde-apps/kcalutils-${PVCUT}:5
+ >=kde-apps/kldap-${PVCUT}:5
+ test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=kde-apps/kdepim-runtime-${PVCUT}:5
+ >=kde-apps/kmail-account-wizard-${PVCUT}:5
+"
+BDEPEND="
+ dev-libs/libxslt
+ test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-22.08.3-fix-crash-on-replay-msg-w-user-template.patch"
+)
+
+src_prepare() {
+ ecm_src_prepare
+ use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_PRECOMPILED_HEADERS=$(usex pch)
+ $(cmake_use_find_package telemetry KUserFeedback)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "virus detection" app-antivirus/clamav
+ optfeature "spam filtering" mail-filter/bogofilter mail-filter/spamassassin
+ optfeature "fancy e-mail headers and useful plugins" kde-apps/kdepim-addons:${SLOT}
+ optfeature "crypto config and certificate details GUI" kde-apps/kleopatra:${SLOT}
+ optfeature "import PIM data from other applications" kde-apps/akonadi-import-wizard:${SLOT}
+ fi
+ ecm_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-01-28 22:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-16 11:28 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/kmail/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-01-28 22:48 Andreas Sturmlechner
2019-08-14 8:47 Andreas Sturmlechner
2019-06-06 20:33 Andreas Sturmlechner
2018-10-19 19:20 Andreas Sturmlechner
2017-06-15 11:49 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox