kde-apps/kmail: 21.12.3 version bump

Bug: https://bugs.gentoo.org/800689
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

4 files changed, 189 insertions, 0 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 79ac976bb3c1..f7bb5005b4f9 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,2 +1,3 @@
 DIST kmail-21.08.3.tar.xz 6929860 BLAKE2B d6adc4cd78c880dc61aaa6b9e443b658d49513d24f472877f2de3a6f8c383c8dbe7db11614540e00dc01a0e3de918a0df4b11c312287892a1ee66faf64d825b7 SHA512 f92ecb2a3095e5a2f3fec67f476ebf8c7cad38d5e6f23ed6ce67fc6244e5a3ec590aa85cec847bda50b47896a1a77079727980deab5d58e847a0e4b1e224e113
 DIST kmail-21.12.2.tar.xz 7138820 BLAKE2B 5cc37312cab16b1848dde284226a5395d6574bf28f2981ae252fff7d285f00e0388f08c49772719d523ccb9b7a989f7e659b8029da117269a97f75bbacafd881 SHA512 1345847dfc3783ce9ce185fe3a330da502977ac83c9a84022c74260f062533776eb31ec332ccfc086b503be62d60d3f7041420ff6db889815e8f391bdda60dfb
+DIST kmail-21.12.3.tar.xz 7145316 BLAKE2B a901631e14b6d4e652877439594fd35a787699a2a8b3787323ebd49f109ef2c527984bb5791a428353f124bb01755a5e475c7c5b39ba1d0277bbfdf0a1dac001 SHA512 7656feaeca6ac664c7bd2402f4bd369c4ce924db812b99d9f27556e0112722eb18a3490ffcd26047653b84f14c2990be53967dc689f277557dd0deac56d03a60
diff --git a/kde-apps/kmail/files/kmail-21.12.3-speech-optional.patch b/kde-apps/kmail/files/kmail-21.12.3-speech-optional.patch
new file mode 100644
index 000000000000..e0c7a4518c46
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-21.12.3-speech-optional.patch
@@ -0,0 +1,69 @@
+From 817515f9278f97b3fa32bb434cb2bd26816a7838 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Thu, 24 Feb 2022 17:28:35 +0100
+Subject: [PATCH] Make it compile without texttospeach
+
+---
+ src/kmmainwidget.cpp    | 5 +++++
+ src/kmreadermainwin.cpp | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
+index d6d0d40ac..37bbe72a2 100644
+--- a/src/kmmainwidget.cpp
++++ b/src/kmmainwidget.cpp
+@@ -36,7 +36,10 @@
+ #include "widgets/collectionpane.h"
+ #include "widgets/kactionmenuaccount.h"
+ #include "widgets/kactionmenutransport.h"
++#include <kpimtextedit/kpimtextedit-texttospeech.h>
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ #include <KPIMTextEdit/TextToSpeech>
++#endif
+ #include <KSieveUi/SieveDebugDialog>
+ #include <MailCommon/FolderTreeView>
+ #include <MailCommon/MailKernel>
+@@ -2707,10 +2710,12 @@ void KMMainWidget::showMessagePopup(const Akonadi::Item &msg,
+         mMsgActions->addWebShortcutsMenu(&menu, selectedText);
+         menu.addSeparator();
+         menu.addActions(mMsgView->viewerPluginActionList(MessageViewer::ViewerPluginInterface::NeedSelection));
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+         if (KPIMTextEdit::TextToSpeech::self()->isReady()) {
+             menu.addSeparator();
+             menu.addAction(mMsgView->speakTextAction());
+         }
++#endif
+         menu.addSeparator();
+         menu.addAction(mMsgView->shareTextAction());
+     } else if (!urlMenuAdded) {
+diff --git a/src/kmreadermainwin.cpp b/src/kmreadermainwin.cpp
+index 4967459cc..85c488f97 100644
+--- a/src/kmreadermainwin.cpp
++++ b/src/kmreadermainwin.cpp
+@@ -54,7 +54,10 @@
+ #include <Akonadi/ItemCreateJob>
+ #include <Akonadi/ItemMoveJob>
+ #include <Akonadi/KMime/MessageFlags>
++#include <kpimtextedit/kpimtextedit-texttospeech.h>
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ #include <KPIMTextEdit/TextToSpeech>
++#endif
+ #include <MailCommon/MailUtil>
+ #include <MessageViewer/DKIMViewerMenu>
+ #include <MessageViewer/DKIMWidgetInfo>
+@@ -736,10 +739,12 @@ void KMReaderMainWin::showMessagePopup(const Akonadi::Item &msg,
+         mMsgActions->addWebShortcutsMenu(menu, selectedText);
+         menu->addSeparator();
+         menu->addActions(mReaderWin->viewerPluginActionList(MessageViewer::ViewerPluginInterface::NeedSelection));
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+         if (KPIMTextEdit::TextToSpeech::self()->isReady()) {
+             menu->addSeparator();
+             menu->addAction(mReaderWin->speakTextAction());
+         }
++#endif
+         menu->addSeparator();
+         menu->addAction(mReaderWin->shareTextAction());
+     } else if (!urlMenuAdded) {
+-- 
+GitLab
+
diff --git a/kde-apps/kmail/kmail-21.12.3.ebuild b/kde-apps/kmail/kmail-21.12.3.ebuild
new file mode 100644
index 000000000000..0af27f6855a5
--- /dev/null
+++ b/kde-apps/kmail/kmail-21.12.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 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.88.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes"
+HOMEPAGE="https://apps.kde.org/kmail2/
+https://kontact.kde.org/components/kmail.html"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="pch speech telemetry"
+
+RESTRICT="test" # bug 616878
+
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.11.1:=[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
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	telemetry? ( dev-libs/kuserfeedback: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}-21.12.3-speech-optional.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/metadata.xml b/kde-apps/kmail/metadata.xml
index d925f2439758..fa80953797d0 100644
--- a/kde-apps/kmail/metadata.xml
+++ b/kde-apps/kmail/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
+	<use>
+		<flag name="speech">Enable text-to-speech support</flag>
+	</use>
 </pkgmetadata>