gentoo resync : 20.03.2022

4 files changed, 191 insertions, 5 deletions

diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 9fa9dae1e8ff..f42261b78294 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,6 @@
+AUX libksieve-21.12.3-speech-optional.patch 8029 BLAKE2B f8dda7f2c6c3a3c2cf4feecaa66e8263282ec478823ab5d32b3583f5b202ce555174d73c8b5e9b0bb5ba9a4f79d25ba26e249b8186f87ab9c8b1238141e4bedc SHA512 1c319d2740615c041f8c630038d287b0894dfe7fb63300f4188c05772bba5e512293edf49d487eb511a5e3e2429d4904756401d77bb5a8f2111347a5b8a37f07
 DIST libksieve-21.08.3.tar.xz 569836 BLAKE2B 0b04ce3a3e00c62dc168b8a6bc0d32d465198f9ce3a2e6af0e7d2e1c14118a0f94f2bceac743cf51057d35fec2f2bec84293b0065d77a4f80d653029114d53eb SHA512 ed4a116e26e27606b54b83a4c48038b962b32f294cdfdfed87bc9dc280d660a6f3345312bee8a61a2e17c7fa2c896cabc6856991d6d364dad19969411840b819
-DIST libksieve-21.12.1.tar.xz 572644 BLAKE2B e8ff703afa98b48e54f26f236c4843c6fdc82f3e6e0a72f94c5efbecc1989467c1f04c0cde9d83f559203e6fbebd2d992a2ed831260db59867a7b8518c1f2b68 SHA512 f83effd9cda22adc4bbc8a3b362ebf6de70bb06d424742907285f69513732d4d6a1d9188432d47b3ce73c65075b9981bbc1068e5d61c14b6e41685838a0a3c90
+DIST libksieve-21.12.3.tar.xz 572276 BLAKE2B 190a32d2e19abb6a28ef1419c73fa93bc73989086374e83b95427ab4ded93fa058c644c290052e273a9ac45895c842efee87eb3d626a8f769e0e969b547976d9 SHA512 ca4b970a3ec510a904187904c5070990728c7fcd3dc42e2052caf80cc828c0e00d31b00828457dbc8dc7a2f21927542f60552b1d67cfedc85b52a57f0c12d3a4
 EBUILD libksieve-21.08.3.ebuild 1404 BLAKE2B d01b40ba94e03e36273a76db1143ac3721d1d0a4c095296bdc0c63d6328b9300dc25073dbca9cdabc3c8608708729fabed9d581d9be34c7e33a4cc5a41e08f4e SHA512 a93fdf5651ef9fbd9dd1b20e5a5669e7992dbfdc035cfde2cbc90fb05aba1682faff215da45ac4fb9103f2ab9fd5e5d68ad88fc91e53951b502e52cc13bee5c0
-EBUILD libksieve-21.12.1.ebuild 1425 BLAKE2B 485f02613597331cb8a0260ac7009132e92be210d90172c4f8448bc9a0a994338318966302488959f91e36d0c202ef2bfd3e87b7b8d0fffca53700fa596adda2 SHA512 2a7887c9d1a50f58e26dfa04467cf3acc024f40c78e4be211a3e37a2b99df88c6c559d9da608d3a51eb6528e223dac95727e695d7d83296eae4c3ce7e539608c
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+EBUILD libksieve-21.12.3.ebuild 1503 BLAKE2B c7b8d6cd5c1eb614ef08bd3e99fbf1041a800befbd3d17372a3431c9238cd13c9c4c0584052dfc750cb135c50a1dd3cb34347cd8609dd7815af824f6f6ed7e66 SHA512 3915606d537904a5636cef77f654617e5105c81d22d5173614ff7a0f9784b5259d8789a239bb65360d59be9bf0ca6710a7e397812fde8555d72081bcbfb7fd88
+MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
diff --git a/kde-apps/libksieve/files/libksieve-21.12.3-speech-optional.patch b/kde-apps/libksieve/files/libksieve-21.12.3-speech-optional.patch
new file mode 100644
index 000000000000..b77300483aa5
--- /dev/null
+++ b/kde-apps/libksieve/files/libksieve-21.12.3-speech-optional.patch
@@ -0,0 +1,180 @@
+From dd296ce1c679f73a52b4d501383346f51acccce8 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Sun, 23 Jan 2022 10:48:47 +0100
+Subject: [PATCH] Fix compile without texttospeech
+
+(cherry picked from commit 4ff666c61d4c0dde3e96ad7d45c0a81cb58324a0)
+
+Merged with (and stripped of Qt6 trivia):
+
+Text to speak is not supported yet in qt6
+(cherry picked from commit 72be23f5c355864a78174f402596d959a5ad4081)
+
+Fix some qt6 build
+(cherry picked from commit b7acbb937cf92d41c955199c31758c5770b08f0e)
+
+USe upper cas includes
+(cherry picked from commit 66a6cd63083a15bb570100c62053c3ac3e292642)
+---
+ src/ksieveui/editor/sieveeditortextmodewidget.cpp     |  7 ++++++-
+ src/ksieveui/editor/sieveeditortextmodewidget.h       |  1 +
+ .../sievescriptdebuggerfrontendwidgettest.cpp         |  8 ++++++--
+ .../sievescriptdebuggerfrontendwidget.cpp             | 10 +++++++---
+ src/ksieveui/templates/sievetemplateeditdialog.cpp    | 11 +++++++----
+ 5 files changed, 27 insertions(+), 10 deletions(-)
+
+diff --git a/src/ksieveui/editor/sieveeditortextmodewidget.cpp b/src/ksieveui/editor/sieveeditortextmodewidget.cpp
+index d5c7c57a..0c10f9fa 100644
+--- a/src/ksieveui/editor/sieveeditortextmodewidget.cpp
++++ b/src/ksieveui/editor/sieveeditortextmodewidget.cpp
+@@ -21,7 +21,9 @@
+ #include <KPIMTextEdit/PlainTextEditorWidget>
+ #include <KPIMTextEdit/SlideContainer>
+ #include <KPIMTextEdit/TextGotoLineWidget>
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ #include <KPIMTextEdit/TextToSpeechWidget>
++#endif
+ 
+ #include <ksieve/error.h>
+ #include <ksieve/parser.h>
+@@ -73,9 +75,10 @@ SieveEditorTextModeWidget::SieveEditorTextModeWidget(QWidget *parent)
+     mTabWidget = new SieveEditorTabWidget;
+     connect(mTabWidget, &SieveEditorTabWidget::currentChanged, this, &SieveEditorTextModeWidget::sieveEditorTabCurrentChanged);
+     connect(mTabWidget, &SieveEditorTabWidget::copyAvailable, this, &SieveEditorTextModeWidget::copyAvailable);
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     mTextToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this);
+     editorWidgetLayout->addWidget(mTextToSpeechWidget);
+-
++#endif
+     mTextEdit = new SieveTextEdit;
+     editorWidgetLayout->addWidget(mTextEdit);
+     connect(mTextEdit, &SieveTextEdit::textChanged, this, &SieveEditorTextModeWidget::valueChanged);
+@@ -83,7 +86,9 @@ SieveEditorTextModeWidget::SieveEditorTextModeWidget(QWidget *parent)
+     mTabWidget->tabBar()->hide();
+     textEditLayout->addWidget(mTabWidget);
+     connect(mTextEdit, &SieveTextEdit::openHelp, mTabWidget, &SieveEditorTabWidget::slotAddHelpPage);
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     connect(mTextEdit, &SieveTextEdit::say, mTextToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say);
++#endif
+     connect(mTextEdit, &SieveTextEdit::editRule, this, &SieveEditorTextModeWidget::slotEditRule);
+     connect(mTextEdit, &SieveTextEdit::insertRule, this, &SieveEditorTextModeWidget::slotInsertRule);
+ 
+diff --git a/src/ksieveui/editor/sieveeditortextmodewidget.h b/src/ksieveui/editor/sieveeditortextmodewidget.h
+index 934b3d72..2ef5b824 100644
+--- a/src/ksieveui/editor/sieveeditortextmodewidget.h
++++ b/src/ksieveui/editor/sieveeditortextmodewidget.h
+@@ -7,6 +7,7 @@
+ 
+ #include "ksieveui_export.h"
+ #include "sieveeditorabstractwidget.h"
++#include <kpimtextedit/kpimtextedit-texttospeech.h>
+ class QSplitter;
+ namespace KPIMTextEdit
+ {
+diff --git a/src/ksieveui/sievescriptdebugger/autotests/sievescriptdebuggerfrontendwidgettest.cpp b/src/ksieveui/sievescriptdebugger/autotests/sievescriptdebuggerfrontendwidgettest.cpp
+index ea66438b..28b2ba08 100644
+--- a/src/ksieveui/sievescriptdebugger/autotests/sievescriptdebuggerfrontendwidgettest.cpp
++++ b/src/ksieveui/sievescriptdebugger/autotests/sievescriptdebuggerfrontendwidgettest.cpp
+@@ -6,7 +6,10 @@
+ 
+ #include "sievescriptdebuggerfrontendwidgettest.h"
+ #include "../sievescriptdebuggerfrontendwidget.h"
+-#include <KPIMTextEdit/kpimtextedit/texttospeechwidget.h>
++#include <kpimtextedit/kpimtextedit-texttospeech.h>
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
++#include <KPIMTextEdit/TextToSpeechWidget>
++#endif
+ #include <KUrlRequester>
+ #include <QLabel>
+ #include <QLineEdit>
+@@ -48,9 +51,10 @@ void SieveScriptDebuggerFrontEndWidgetTest::shouldHaveDefaultValue()
+     QVERIFY(extension);
+     QVERIFY(extension->text().isEmpty());
+     QVERIFY(extension->isClearButtonEnabled());
+-
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     auto textToSpeechWidget = w.findChild<KPIMTextEdit::TextToSpeechWidget *>(QStringLiteral("texttospeechwidget"));
+     QVERIFY(textToSpeechWidget);
++#endif
+ }
+ 
+ void SieveScriptDebuggerFrontEndWidgetTest::shouldChangeButtonEnabledState()
+diff --git a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp
+index 4543caef..5ff016e4 100644
+--- a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp
++++ b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp
+@@ -14,7 +14,10 @@
+ #include <KLineEdit>
+ #include <KLocalizedString>
+ #include <KPIMTextEdit/PlainTextEditorWidget>
++#include <kpimtextedit/kpimtextedit-texttospeech.h>
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ #include <KPIMTextEdit/TextToSpeechWidget>
++#endif
+ #include <KUrlRequester>
+ #include <Libkdepim/LineEditCatchReturnKey>
+ #include <QDate>
+@@ -71,18 +74,19 @@ SieveScriptDebuggerFrontEndWidget::SieveScriptDebuggerFrontEndWidget(QWidget *pa
+     auto vboxSieveEditorLayout = new QVBoxLayout;
+     sieveEditorWidget->setLayout(vboxSieveEditorLayout);
+     vboxSieveEditorLayout->setContentsMargins({});
+-
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     auto textToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this);
+     textToSpeechWidget->setObjectName(QStringLiteral("texttospeechwidget"));
+     vboxSieveEditorLayout->addWidget(textToSpeechWidget);
+-
++#endif
+     auto textEdit = new KSieveUi::SieveScriptDebuggerTextEdit(this);
+     connect(textEdit, &KSieveUi::SieveScriptDebuggerTextEdit::textChanged, this, &SieveScriptDebuggerFrontEndWidget::slotScriptTextChanged);
+     mSieveTextEditWidget = new KSieveUi::SieveTextEditWidget(textEdit, this);
+     mSieveTextEditWidget->setObjectName(QStringLiteral("sievetexteditwidget"));
+     vboxSieveEditorLayout->addWidget(mSieveTextEditWidget);
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     connect(mSieveTextEditWidget->textEdit(), &SieveTextEdit::say, textToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say);
+-
++#endif
+     mSplitter->addWidget(sieveEditorWidget);
+     mSplitter->setChildrenCollapsible(false);
+ 
+diff --git a/src/ksieveui/templates/sievetemplateeditdialog.cpp b/src/ksieveui/templates/sievetemplateeditdialog.cpp
+index 8a7127c4..5f039f0d 100644
+--- a/src/ksieveui/templates/sievetemplateeditdialog.cpp
++++ b/src/ksieveui/templates/sievetemplateeditdialog.cpp
+@@ -24,9 +24,10 @@
+ #include <QVBoxLayout>
+ 
+ #include <editor/sievetexteditwidget.h>
+-
++#include <kpimtextedit/kpimtextedit-texttospeech.h>
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+ #include <KPIMTextEdit/TextToSpeechWidget>
+-
++#endif
+ using namespace KSieveUi;
+ 
+ SieveTemplateEditDialog::SieveTemplateEditDialog(QWidget *parent, bool defaultTemplate)
+@@ -62,16 +63,18 @@ SieveTemplateEditDialog::SieveTemplateEditDialog(QWidget *parent, bool defaultTe
+     hbox->addWidget(mTemplateNameEdit);
+ 
+     vbox->addLayout(hbox);
+-
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     auto textToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this);
+     vbox->addWidget(textToSpeechWidget);
++#endif
+ 
+     mTextEditWidget = new KSieveUi::SieveTextEditWidget;
+     mTextEditWidget->textEdit()->setShowHelpMenu(false);
+     mTextEditWidget->setReadOnly(defaultTemplate);
+     vbox->addWidget(mTextEditWidget);
++#if KPIMTEXTEDIT_TEXT_TO_SPEECH
+     connect(mTextEditWidget->textEdit(), &SieveTextEdit::say, textToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say);
+-
++#endif
+     auto shortcut = new QShortcut(this);
+     shortcut->setKey(Qt::Key_F | Qt::CTRL);
+     connect(shortcut, &QShortcut::activated, mTextEditWidget, &SieveTextEditWidget::slotFind);
+-- 
+2.35.1
+
diff --git a/kde-apps/libksieve/libksieve-21.12.1.ebuild b/kde-apps/libksieve/libksieve-21.12.3.ebuild
index d3f7537e66fa..c666290c7271 100644
--- a/kde-apps/libksieve/libksieve-21.12.1.ebuild
+++ b/kde-apps/libksieve/libksieve-21.12.3.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Common PIM libraries"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
+IUSE="speech"
 
 RESTRICT="test"
 
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-apps/kidentitymanagement-${PVCUT}:5
 	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5[speech=]
 	>=kde-apps/libkdepim-${PVCUT}:5
 	>=kde-apps/pimcommon-${PVCUT}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
@@ -51,6 +51,8 @@ DEPEND="${RDEPEND}
 	>=kde-apps/kmailtransport-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-21.12.3-speech-optional.patch" )
+
 src_prepare() {
 	ecm_src_prepare
 	cmake_run_in kioslave cmake_comment_add_subdirectory doc
diff --git a/kde-apps/libksieve/metadata.xml b/kde-apps/libksieve/metadata.xml
index d925f2439758..fa80953797d0 100644
--- a/kde-apps/libksieve/metadata.xml
+++ b/kde-apps/libksieve/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>