kde-apps: Cleanup unused patches

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

14 files changed, 0 insertions, 1486 deletions

diff --git a/kde-apps/akregator/files/akregator-21.12.3-speech-optional-1.patch b/kde-apps/akregator/files/akregator-21.12.3-speech-optional-1.patch
deleted file mode 100644
index f8ebe576b8b..00000000000
--- a/kde-apps/akregator/files/akregator-21.12.3-speech-optional-1.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From cb0ddc563482ccbad9331d944c711cd180f38400 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Thu, 24 Feb 2022 17:30:26 +0100
-Subject: [PATCH] Make it compile without texttospeach
-
----
- .../webengine/articleviewerwebengine.cpp             |  5 +++++
- .../webengine/articleviewerwebenginewidgetng.cpp     | 12 ++++++++----
- .../webengine/articleviewerwebenginewidgetng.h       |  4 ++++
- src/frame/webengine/akrwebengineviewer.cpp           |  5 +++++
- 4 files changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/src/articleviewer-ng/webengine/articleviewerwebengine.cpp b/src/articleviewer-ng/webengine/articleviewerwebengine.cpp
-index 787efefc..e308df8a 100644
---- a/src/articleviewer-ng/webengine/articleviewerwebengine.cpp
-+++ b/src/articleviewer-ng/webengine/articleviewerwebengine.cpp
-@@ -12,7 +12,10 @@
- #include "articleviewerwebenginepage.h"
- #include "urlhandler/webengine/urlhandlerwebengine.h"
- #include "webengine/urlhandlerwebenginemanager.h"
-+#include <kpimtextedit/kpimtextedit-texttospeech.h>
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- #include <KPIMTextEdit/TextToSpeech>
-+#endif
- #include <WebEngineViewer/InterceptorManager>
- #include <WebEngineViewer/WebEngineAccessKey>
- #include <WebEngineViewer/WebEngineManageScript>
-@@ -305,10 +308,12 @@ void ArticleViewerWebEngine::slotWebHitFinished(const WebEngineViewer::WebHitTes
-     popup.addAction(ActionManager::getInstance()->action(QStringLiteral("tab_unmute")));
-     popup.addSeparator();
-     popup.addAction(ActionManager::getInstance()->action(QStringLiteral("find_in_messages")));
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
-     if (KPIMTextEdit::TextToSpeech::self()->isReady()) {
-         popup.addSeparator();
-         popup.addAction(ActionManager::getInstance()->action(QStringLiteral("speak_text")));
-     }
-+#endif
-     popup.exec(mapToGlobal(result.pos()));
- }
- 
-diff --git a/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.cpp b/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.cpp
-index e806b343..3784894e 100644
---- a/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.cpp
-+++ b/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.cpp
-@@ -12,9 +12,9 @@
- #include <KLocalizedString>
- #include <QVBoxLayout>
- #include <viewerplugintoolmanager.h>
--
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- #include <KPIMTextEdit/kpimtextedit/texttospeechwidget.h>
--
-+#endif
- #include <KPIMTextEdit/SlideContainer>
- 
- #include <WebEngineViewer/FindBarWebEngineView>
-@@ -45,7 +45,9 @@ template<typename Arg, typename R, typename C> InvokeWrapper<Arg, R, C> invoke(R
- ArticleViewerWebEngineWidgetNg::ArticleViewerWebEngineWidgetNg(ArticleViewerWebEngine *customViewer, KActionCollection *ac, QWidget *parent)
-     : QWidget(parent)
-     , mArticleViewerNg(customViewer)
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
-     , mTextToSpeechWidget(new KPIMTextEdit::TextToSpeechWidget(this))
-+#endif
-     , mSliderContainer(new KPIMTextEdit::SlideContainer(this))
-     , mTrackingWarningWidget(new WebEngineViewer::TrackingWarningWidget(this))
- 
-@@ -62,10 +64,10 @@ void ArticleViewerWebEngineWidgetNg::initializeLayout(KActionCollection *ac)
- {
-     auto layout = new QVBoxLayout(this);
-     layout->setContentsMargins({});
--
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
-     mTextToSpeechWidget->setObjectName(QStringLiteral("texttospeechwidget"));
-     layout->addWidget(mTextToSpeechWidget);
--
-+#endif
-     mTrackingWarningWidget->setObjectName(QStringLiteral("mTrackingWarningWidget"));
-     layout->addWidget(mTrackingWarningWidget);
- 
-@@ -107,7 +109,9 @@ void ArticleViewerWebEngineWidgetNg::slotFind()
- void ArticleViewerWebEngineWidgetNg::slotSpeakText()
- {
-     const QString text = mArticleViewerNg->selectedText();
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
-     mTextToSpeechWidget->say(text);
-+#endif
- }
- 
- void ArticleViewerWebEngineWidgetNg::saveCurrentPosition()
-diff --git a/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.h b/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.h
-index a9ff9eea..f4834d2e 100644
---- a/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.h
-+++ b/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.h
-@@ -8,6 +8,8 @@
- 
- #include "akregator_export.h"
- #include "articleviewerwebengine.h"
-+#include <kpimtextedit/kpimtextedit-texttospeech.h>
-+
- #include <QWidget>
- class QPrinter;
- class KActionCollection;
-@@ -55,7 +57,9 @@ private:
-     void printRequested(QWebEnginePage *page);
-     WebEngineViewer::FindBarWebEngineView *mFindBarWebView = nullptr;
-     ArticleViewerWebEngine *mArticleViewerNg = nullptr;
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
-     KPIMTextEdit::TextToSpeechWidget *const mTextToSpeechWidget;
-+#endif
-     KPIMTextEdit::SlideContainer *const mSliderContainer;
-     WebEngineViewer::TrackingWarningWidget *const mTrackingWarningWidget;
-     QPrinter *mCurrentPrinter = nullptr;
-diff --git a/src/frame/webengine/akrwebengineviewer.cpp b/src/frame/webengine/akrwebengineviewer.cpp
-index 53b5e5f8..d49e0a8c 100644
---- a/src/frame/webengine/akrwebengineviewer.cpp
-+++ b/src/frame/webengine/akrwebengineviewer.cpp
-@@ -15,7 +15,10 @@
- #include <KActionCollection>
- #include <KActionMenu>
- #include <KIO/KUriFilterSearchProviderActions>
-+#include <kpimtextedit/kpimtextedit-texttospeech.h>
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- #include <KPIMTextEdit/TextToSpeech>
-+#endif
- #include <QContextMenuEvent>
- #include <QMenu>
- #include <QWebEngineHistory>
-@@ -138,11 +141,13 @@ void AkrWebEngineViewer::slotWebHitFinished(const WebEngineViewer::WebHitTestRes
-         popup.addActions(interceptorUrlActions);
-     }
-     popup.addSeparator();
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
-     popup.addAction(ActionManager::getInstance()->action(QStringLiteral("find_in_messages")));
-     if (KPIMTextEdit::TextToSpeech::self()->isReady()) {
-         popup.addSeparator();
-         popup.addAction(ActionManager::getInstance()->action(QStringLiteral("speak_text")));
-     }
-+#endif
-     popup.exec(mapToGlobal(result.pos()));
- }
- 
--- 
-GitLab
-
diff --git a/kde-apps/akregator/files/akregator-21.12.3-speech-optional-2.patch b/kde-apps/akregator/files/akregator-21.12.3-speech-optional-2.patch
deleted file mode 100644
index 0f3dfe05946..00000000000
--- a/kde-apps/akregator/files/akregator-21.12.3-speech-optional-2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 49aa0675d5d84e3286e9879ceb2333cb83f1d824 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Thu, 24 Feb 2022 17:33:56 +0100
-Subject: [PATCH] Fix include
-
----
- .../webengine/articleviewerwebenginewidgetng.cpp                | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.cpp b/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.cpp
-index 3784894e..20e33120 100644
---- a/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.cpp
-+++ b/src/articleviewer-ng/webengine/articleviewerwebenginewidgetng.cpp
-@@ -13,7 +13,7 @@
- #include <MessageViewer/ViewerPluginToolManager>
- #include <QVBoxLayout>
- #if KPIMTEXTEDIT_TEXT_TO_SPEECH
--#include <KPIMTextEdit/kpimtextedit/texttospeechwidget.h>
-+#include <kpimtextedit/texttospeechwidget.h>
- #endif
- #include <KPIMTextEdit/SlideContainer>
- 
--- 
-GitLab
-
diff --git a/kde-apps/kalarm/files/kalarm-21.12.3-speech-optional.patch b/kde-apps/kalarm/files/kalarm-21.12.3-speech-optional.patch
deleted file mode 100644
index ce4f45c3760..00000000000
--- a/kde-apps/kalarm/files/kalarm-21.12.3-speech-optional.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 53a299c513c447afc57c7f520ac35aea2dffc277 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Fri, 25 Feb 2022 07:29:19 +0100
-Subject: [PATCH] Make build without texttospeech support
-
----
- src/commandoptions.cpp       | 7 +++++++
- src/messagedisplayhelper.cpp | 5 +++++
- src/prefdlg.cpp              | 5 +++++
- src/soundpicker.cpp          | 5 +++++
- 4 files changed, 22 insertions(+)
-
-diff --git a/src/commandoptions.cpp b/src/commandoptions.cpp
-index a564fbb3..a6bbded1 100644
---- a/src/commandoptions.cpp
-+++ b/src/commandoptions.cpp
-@@ -14,7 +14,10 @@
- #include "kalarm_debug.h"
- 
- #include <KAlarmCal/Identities>
-+#include <kpimtextedit/kpimtextedit-texttospeech.h>
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- #include <KPIMTextEdit/TextToSpeech>
-+#endif
- #include <KLocalizedString>
- 
- #include <QCommandLineParser>
-@@ -570,7 +573,11 @@ void CommandOptions::process()
-             {
-                 if (mParser->isSet(*mOptions.at(BEEP)))
-                     setErrorIncompatible(BEEP, SPEAK);
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
-                 else if (!KPIMTextEdit::TextToSpeech::self()->isReady())
-+#else
-+                else
-+#endif
-                     setError(xi18nc("@info:shell", "<icode>%1</icode> requires KAlarm to be compiled with QTextToSpeech support", optionName(SPEAK)));
-             }
-             const bool onceOnly = mParser->isSet(*mOptions.at(REMINDER_ONCE));
-diff --git a/src/messagedisplayhelper.cpp b/src/messagedisplayhelper.cpp
-index 0f6b9680..6e80e8ca 100644
---- a/src/messagedisplayhelper.cpp
-+++ b/src/messagedisplayhelper.cpp
-@@ -21,7 +21,10 @@
- #include "lib/synchtimer.h"
- #include "kalarm_debug.h"
- 
-+#include <kpimtextedit/kpimtextedit-texttospeech.h>
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- #include <KPIMTextEdit/TextToSpeech>
-+#endif
- 
- #include <KLocalizedString>
- #include <KConfig>
-@@ -831,6 +834,7 @@ void MessageDisplayHelper::playAudio()
- */
- void MessageDisplayHelper::slotSpeak()
- {
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
-     KPIMTextEdit::TextToSpeech* tts = KPIMTextEdit::TextToSpeech::self();
-     if (!tts->isReady())
-     {
-@@ -840,6 +844,7 @@ void MessageDisplayHelper::slotSpeak()
-     }
- 
-     tts->say(mMessage);
-+#endif
- }
- 
- /******************************************************************************
-diff --git a/src/prefdlg.cpp b/src/prefdlg.cpp
-index ea32116e..d3cf48ae 100644
---- a/src/prefdlg.cpp
-+++ b/src/prefdlg.cpp
-@@ -48,7 +48,10 @@
- #include <KHolidays/HolidayRegion>
- using namespace KHolidays;
- 
-+#include <kpimtextedit/kpimtextedit-texttospeech.h>
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- #include <KPIMTextEdit/TextToSpeech>
-+#endif
- 
- #include <KLocalizedString>
- #include <KShell>
-@@ -1355,8 +1358,10 @@ EditPrefTab::EditPrefTab(StackedScrollGroup* scrollGroup)
-     mSound->addItem(SoundPicker::i18n_combo_None());         // index 0
-     mSound->addItem(SoundPicker::i18n_combo_Beep());         // index 1
-     mSound->addItem(SoundPicker::i18n_combo_File());         // index 2
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
-     if (KPIMTextEdit::TextToSpeech::self()->isReady())
-         mSound->addItem(SoundPicker::i18n_combo_Speak());  // index 3
-+#endif
-     mSound->setMinimumSize(mSound->sizeHint());
-     mSound->setWhatsThis(defsetting.subs(SoundPicker::i18n_label_Sound()).toString());
-     hlayout->addWidget(mSound);
-diff --git a/src/soundpicker.cpp b/src/soundpicker.cpp
-index 426baf96..f85071ea 100644
---- a/src/soundpicker.cpp
-+++ b/src/soundpicker.cpp
-@@ -16,7 +16,10 @@
- #include "lib/pushbutton.h"
- #include "kalarm_debug.h"
- 
-+#include <kpimtextedit/kpimtextedit-texttospeech.h>
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- #include <KPIMTextEdit/TextToSpeech>
-+#endif
- 
- #include <KLocalizedString>
- #include <phonon/backendcapabilities.h>
-@@ -130,7 +133,9 @@ void SoundPicker::showFile(bool show)
- */
- void SoundPicker::showSpeak(bool show)
- {
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
-     if (!KPIMTextEdit::TextToSpeech::self()->isReady())
-+#endif
-         show = false;    // speech capability is not installed or configured
-     if (show != mSpeakShowing)
-     {
--- 
-GitLab
-
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
deleted file mode 100644
index e0c7a4518c4..00000000000
--- a/kde-apps/kmail/files/kmail-21.12.3-speech-optional.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-1.patch b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-1.patch
deleted file mode 100644
index d7fa7474a4b..00000000000
--- a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-1.patch
+++ /dev/null
@@ -1,289 +0,0 @@
-From 53f187315f51e7d53a03c4ed464812b388465c10 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Mon, 27 Dec 2021 07:53:16 +0100
-Subject: [PATCH] Add support for building without texttospeech as for the
- moment we don't
-
-have it in qt6
----
- CMakeLists.txt                                | 10 +++++-
- src/CMakeLists.txt                            | 34 ++++++++++++++-----
- .../plaintexteditor/plaintexteditor.cpp       |  4 +++
- .../plaintexteditor/plaintexteditorwidget.cpp | 10 ++++--
- .../richtexteditor/richtexteditor.cpp         |  5 ++-
- .../richtexteditor/richtexteditorwidget.cpp   |  9 ++++-
- 6 files changed, 59 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ae59804..d1a0181 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,7 +76,15 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
- add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055A00)
- 
- 
--find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS TextToSpeech)
-+find_package(Qt5TextToSpeech ${QT_REQUIRED_VERSION} CONFIG)
-+set_package_properties(Qt5TextToSpeech PROPERTIES DESCRIPTION
-+    "Add support for texttospeed"
-+    TYPE OPTIONAL
-+)
-+if(TARGET Qt5::TextToSpeech)
-+    set(HAVE_TEXT_TO_SPEECH_SUPPORT TRUE)
-+    add_definitions(-DHAVE_TEXT_TO_SPEECH_SUPPORT)
-+endif()
- 
- if(BUILD_TESTING)
-    find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Test)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 2720e0a..98e2854 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -53,7 +53,7 @@ target_sources(KF5PimTextEdit PRIVATE
-     composer-ng/richtextcomposeremailquotehighlighter.h
-     composer-ng/richtextcomposerwidget.h
-     )
--
-+if (HAVE_TEXT_TO_SPEECH_SUPPORT)
- target_sources(KF5PimTextEdit PRIVATE
-     texttospeech/texttospeech.cpp
-     texttospeech/texttospeechwidget.cpp
-@@ -76,6 +76,7 @@ target_sources(KF5PimTextEdit PRIVATE
-     texttospeech/texttospeechlanguagecombobox.h
-     texttospeech/texttospeechactions.h
-     )
-+endif()
- 
- target_sources(KF5PimTextEdit PRIVATE
-     grantleebuilder/plaintextmarkupbuilder.cpp
-@@ -168,7 +169,12 @@ target_link_libraries(KF5PimTextEdit
-     KF5::SyntaxHighlighting
-     Qt::TextToSpeech
-     )
--
-+if (HAVE_TEXT_TO_SPEECH_SUPPORT)
-+    target_link_libraries(KF5PimTextEdit
-+        PRIVATE
-+        Qt::TextToSpeech
-+        )
-+endif()
- set_target_properties(KF5PimTextEdit PROPERTIES
-     VERSION ${KPIMTEXTEDIT_VERSION}
-     SOVERSION ${KPIMTEXTEDIT_SOVERSION}
-@@ -240,7 +246,7 @@ ecm_generate_headers(KPimTextEdit_CamelCasetexteditor_commonwidget_HEADERS
-     )
- 
- 
--
-+if (HAVE_TEXT_TO_SPEECH_SUPPORT)
- ecm_generate_headers(KPimTextEdit_CamelCasetexttospeechs_HEADERS
-     HEADER_NAMES
-     TextToSpeech
-@@ -252,7 +258,7 @@ ecm_generate_headers(KPimTextEdit_CamelCasetexttospeechs_HEADERS
-     PREFIX KPIMTextEdit
-     RELATIVE texttospeech
-     )
--
-+endif()
- ecm_generate_headers(KPimTextEdit_Camelcasecomposerng_HEADERS
-     HEADER_NAMES
-     RichTextComposer
-@@ -269,11 +275,22 @@ ecm_generate_headers(KPimTextEdit_Camelcasecomposerng_HEADERS
- 
- 
- ########### install files ###############
-+if (HAVE_TEXT_TO_SPEECH_SUPPORT)
-+    install(FILES
-+        ${KPimTextEdit_texttospeechs_HEADERS}
-+        DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPIMTextEdit/kpimtextedit
-+        COMPONENT Devel
-+        )
-+    install(FILES
-+        ${KPimTextEdit_CamelCasetexttospeechs_HEADERS}
-+        DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPIMTextEdit/KPIMTextEdit/
-+        COMPONENT Devel
-+        )
-+endif()
- 
- install(FILES
-     ${CMAKE_CURRENT_BINARY_DIR}/kpimtextedit_export.h
-     ${kpimtextedit_HEADERS}
--    ${KPimTextEdit_texttospeechs_HEADERS}
-     ${KPimTextEdit_richtexteditor_HEADERS}
-     ${KPimTextEdit_texteditor_commonwidget_HEADERS}
-     ${KPimTextEdit_plaintexteditor_HEADERS}
-@@ -288,7 +305,6 @@ install(FILES
-     ${KPimTextEdit_CamelCase_HEADERS}
-     ${KPimTextEdit_CamelCasetextrichtexteditor_HEADERS}
-     ${KPimTextEdit_CamelCaseplaintexteditor_HEADERS}
--    ${KPimTextEdit_CamelCasetexttospeechs_HEADERS}
-     ${KPimTextEdit_CamelCasetexteditor_commonwidget_HEADERS}
-     ${KPimTextEdit_Camelcasecomposerng_HEADERS}
-     ${KPimTextEdit_CamelCaseemoticon_HEADERS}
-@@ -306,8 +322,10 @@ if (BUILD_TESTING)
-     add_subdirectory(texteditor/commonwidget/autotests)
-     add_subdirectory(texteditor/plaintexteditor/tests)
-     add_subdirectory(texteditor/richtexteditor/tests)
--    add_subdirectory(texttospeech/autotests)
--    add_subdirectory(texttospeech/tests)
-+    if (HAVE_TEXT_TO_SPEECH_SUPPORT)
-+        add_subdirectory(texttospeech/autotests)
-+        add_subdirectory(texttospeech/tests)
-+    endif()
-     add_subdirectory(composer-ng/autotests)
-     add_subdirectory(composer-ng/tests)
-     add_subdirectory(grantleebuilder/autotests)
-diff --git a/src/texteditor/plaintexteditor/plaintexteditor.cpp b/src/texteditor/plaintexteditor/plaintexteditor.cpp
-index cfa0741..4559568 100644
---- a/src/texteditor/plaintexteditor/plaintexteditor.cpp
-+++ b/src/texteditor/plaintexteditor/plaintexteditor.cpp
-@@ -18,7 +18,9 @@
- #include <QActionGroup>
- #include <QIcon>
- 
-+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
- #include "texttospeech/texttospeech.h"
-+#endif
- #include <Sonnet/Dialog>
- #include <sonnet/backgroundchecker.h>
- 
-@@ -181,6 +183,7 @@ void PlainTextEditor::contextMenuEvent(QContextMenuEvent *event)
-             }
-         }
-         if (d->supportFeatures & TextToSpeech) {
-+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
-             if (KPIMTextEdit::TextToSpeech::self()->isReady()) {
-                 if (!emptyDocument) {
-                     QAction *speakAction = popup->addAction(i18n("Speak Text"));
-@@ -188,6 +191,7 @@ void PlainTextEditor::contextMenuEvent(QContextMenuEvent *event)
-                     connect(speakAction, &QAction::triggered, this, &PlainTextEditor::slotSpeakText);
-                 }
-             }
-+#endif
-         }
-         if (webShortcutSupport() && textCursor().hasSelection()) {
-             popup->addSeparator();
-diff --git a/src/texteditor/plaintexteditor/plaintexteditorwidget.cpp b/src/texteditor/plaintexteditor/plaintexteditorwidget.cpp
-index 3251ea3..77a9b45 100644
---- a/src/texteditor/plaintexteditor/plaintexteditorwidget.cpp
-+++ b/src/texteditor/plaintexteditor/plaintexteditorwidget.cpp
-@@ -8,8 +8,9 @@
- #include "plaintexteditfindbar.h"
- #include "plaintexteditor.h"
- #include "slidecontainer.h"
-+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
- #include "texttospeech/texttospeechwidget.h"
--
-+#endif
- #include <QTextCursor>
- #include <QVBoxLayout>
- 
-@@ -21,7 +22,9 @@ public:
- 
-     KPIMTextEdit::PlainTextEditFindBar *mFindBar = nullptr;
-     PlainTextEditor *mEditor = nullptr;
-+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
-     KPIMTextEdit::TextToSpeechWidget *mTextToSpeechWidget = nullptr;
-+#endif
-     KPIMTextEdit::SlideContainer *mSliderContainer = nullptr;
- };
- 
-@@ -75,16 +78,19 @@ void PlainTextEditorWidget::init(PlainTextEditor *customEditor)
- {
-     auto lay = new QVBoxLayout(this);
-     lay->setContentsMargins({});
-+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
-     d->mTextToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this);
-     lay->addWidget(d->mTextToSpeechWidget);
-+#endif
-     if (customEditor) {
-         d->mEditor = customEditor;
-     } else {
-         d->mEditor = new PlainTextEditor;
-     }
-     lay->addWidget(d->mEditor);
-+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
-     connect(d->mEditor, &PlainTextEditor::say, d->mTextToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say);
--
-+#endif
-     d->mSliderContainer = new KPIMTextEdit::SlideContainer(this);
- 
-     d->mFindBar = new KPIMTextEdit::PlainTextEditFindBar(d->mEditor, this);
-diff --git a/src/texteditor/richtexteditor/richtexteditor.cpp b/src/texteditor/richtexteditor/richtexteditor.cpp
-index dfdf7c5..a004434 100644
---- a/src/texteditor/richtexteditor/richtexteditor.cpp
-+++ b/src/texteditor/richtexteditor/richtexteditor.cpp
-@@ -26,7 +26,9 @@
- #include <sonnet/backgroundchecker.h>
- #include <sonnet/spellcheckdecorator.h>
- #include <sonnet/speller.h>
-+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
- #include <texttospeech/texttospeech.h>
-+#endif
- 
- #include <QApplication>
- #include <QClipboard>
-@@ -247,7 +249,7 @@ QMenu *RichTextEditor::mousePopupMenu(QPoint pos)
-             allowTabAction->setChecked(!tabChangesFocus());
-             connect(allowTabAction, &QAction::triggered, this, &RichTextEditor::slotAllowTab);
-         }
--
-+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
-         if (KPIMTextEdit::TextToSpeech::self()->isReady()) {
-             if (!emptyDocument) {
-                 QAction *speakAction = popup->addAction(i18n("Speak Text"));
-@@ -255,6 +257,7 @@ QMenu *RichTextEditor::mousePopupMenu(QPoint pos)
-                 connect(speakAction, &QAction::triggered, this, &RichTextEditor::slotSpeakText);
-             }
-         }
-+#endif
-         if (webShortcutSupport() && textCursor().hasSelection()) {
-             popup->addSeparator();
-             const QString selectedText = textCursor().selectedText();
-diff --git a/src/texteditor/richtexteditor/richtexteditorwidget.cpp b/src/texteditor/richtexteditor/richtexteditorwidget.cpp
-index d0d8e14..d84cf3f 100644
---- a/src/texteditor/richtexteditor/richtexteditorwidget.cpp
-+++ b/src/texteditor/richtexteditor/richtexteditorwidget.cpp
-@@ -10,8 +10,9 @@
- 
- #include <QTextCursor>
- #include <QVBoxLayout>
-+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
- #include <texttospeech/texttospeechwidget.h>
--
-+#endif
- #include "slidecontainer.h"
- 
- using namespace KPIMTextEdit;
-@@ -23,7 +24,9 @@ public:
- 
-     KPIMTextEdit::RichTextEditFindBar *mFindBar = nullptr;
-     RichTextEditor *mEditor = nullptr;
-+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
-     KPIMTextEdit::TextToSpeechWidget *mTextToSpeechWidget = nullptr;
-+#endif
-     KPIMTextEdit::SlideContainer *mSliderContainer = nullptr;
- };
- 
-@@ -97,14 +100,18 @@ void RichTextEditorWidget::init(RichTextEditor *customEditor)
- {
-     auto lay = new QVBoxLayout(this);
-     lay->setContentsMargins({});
-+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
-     d->mTextToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this);
-     lay->addWidget(d->mTextToSpeechWidget);
-+#endif
-     if (customEditor) {
-         d->mEditor = customEditor;
-     } else {
-         d->mEditor = new RichTextEditor;
-     }
-+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT
-     connect(d->mEditor, &RichTextEditor::say, d->mTextToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say);
-+#endif
-     lay->addWidget(d->mEditor);
- 
-     d->mSliderContainer = new KPIMTextEdit::SlideContainer(this);
--- 
-GitLab
-
diff --git a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-2.patch b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-2.patch
deleted file mode 100644
index a078840af05..00000000000
--- a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3596c0a90f590c409654a9aec2b087809cff0a79 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Tue, 28 Dec 2021 12:26:25 +0100
-Subject: [PATCH] Fix build without TextToSpeech available
-
-(the linking happens again further down, inside the if)
----
- src/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 98e2854..a08978e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -167,7 +167,6 @@ target_link_libraries(KF5PimTextEdit
-     KF5::XmlGui
-     KF5::I18n
-     KF5::SyntaxHighlighting
--    Qt::TextToSpeech
-     )
- if (HAVE_TEXT_TO_SPEECH_SUPPORT)
-     target_link_libraries(KF5PimTextEdit
--- 
-GitLab
-
diff --git a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-3.patch b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-3.patch
deleted file mode 100644
index 617864cd7b0..00000000000
--- a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-3.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From b248e11f0c6f4e389052e616e6dd262135a23f3c Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Mon, 14 Feb 2022 18:58:34 +0100
-Subject: [PATCH] Add info about texttospeech support
-
----
- CMakeLists.txt                    |  7 +++++--
- kpimtextedit-texttospeech.h.cmake |  2 ++
- src/CMakeLists.txt                | 11 ++++++-----
- 3 files changed, 14 insertions(+), 8 deletions(-)
- create mode 100644 kpimtextedit-texttospeech.h.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b1c48c8..a00bdeb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -82,10 +82,13 @@ set_package_properties(Qt5TextToSpeech PROPERTIES DESCRIPTION
-     TYPE OPTIONAL
- )
- if(TARGET Qt5::TextToSpeech)
--    set(HAVE_TEXT_TO_SPEECH_SUPPORT TRUE)
--    add_definitions(-DHAVE_TEXT_TO_SPEECH_SUPPORT)
-+    add_definitions(-DHAVE_TEXT_TO_SPEECH_SUPPORT)
-+    set(KPIMTEXTEDIT_TEXT_TO_SPEECH TRUE)
- endif()
- 
-+configure_file(kpimtextedit-texttospeech.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kpimtextedit-texttospeech.h )
-+
-+
- if(BUILD_TESTING)
-     find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Test)
-     add_definitions(-DBUILD_TESTING)
-diff --git a/kpimtextedit-texttospeech.h.cmake b/kpimtextedit-texttospeech.h.cmake
-new file mode 100644
-index 0000000..c82af97
---- /dev/null
-+++ b/kpimtextedit-texttospeech.h.cmake
-@@ -0,0 +1,2 @@
-+#cmakedefine01 KPIMTEXTEDIT_TEXT_TO_SPEECH 
-+
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3e24a2f..4e02e5f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -53,7 +53,7 @@ target_sources(KF5PimTextEdit PRIVATE
-     composer-ng/richtextcomposeremailquotehighlighter.h
-     composer-ng/richtextcomposerwidget.h
-     )
--if (HAVE_TEXT_TO_SPEECH_SUPPORT)
-+if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
- target_sources(KF5PimTextEdit PRIVATE
-     texttospeech/texttospeech.cpp
-     texttospeech/texttospeechwidget.cpp
-@@ -168,7 +168,7 @@ target_link_libraries(KF5PimTextEdit
-     KF5::I18n
-     KF5::SyntaxHighlighting
-     )
--if (HAVE_TEXT_TO_SPEECH_SUPPORT)
-+if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
-     target_link_libraries(KF5PimTextEdit
-         PRIVATE
-         Qt5::TextToSpeech
-@@ -245,7 +245,7 @@ ecm_generate_headers(KPimTextEdit_CamelCasetexteditor_commonwidget_HEADERS
-     )
- 
- 
--if (HAVE_TEXT_TO_SPEECH_SUPPORT)
-+if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
- ecm_generate_headers(KPimTextEdit_CamelCasetexttospeechs_HEADERS
-     HEADER_NAMES
-     TextToSpeech
-@@ -274,7 +274,7 @@ ecm_generate_headers(KPimTextEdit_Camelcasecomposerng_HEADERS
- 
- 
- ########### install files ###############
--if (HAVE_TEXT_TO_SPEECH_SUPPORT)
-+if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
-     install(FILES
-         ${KPimTextEdit_texttospeechs_HEADERS}
-         DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KPIMTextEdit/kpimtextedit
-@@ -289,6 +289,7 @@ endif()
- 
- install(FILES
-     ${CMAKE_CURRENT_BINARY_DIR}/kpimtextedit_export.h
-+    ${CMAKE_CURRENT_BINARY_DIR}/../kpimtextedit-texttospeech.h
-     ${kpimtextedit_HEADERS}
-     ${KPimTextEdit_richtexteditor_HEADERS}
-     ${KPimTextEdit_texteditor_commonwidget_HEADERS}
-@@ -321,7 +322,7 @@ if (BUILD_TESTING)
-     add_subdirectory(texteditor/commonwidget/autotests)
-     add_subdirectory(texteditor/plaintexteditor/tests)
-     add_subdirectory(texteditor/richtexteditor/tests)
--    if (HAVE_TEXT_TO_SPEECH_SUPPORT)
-+    if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
-         add_subdirectory(texttospeech/autotests)
-         add_subdirectory(texttospeech/tests)
-     endif()
--- 
-GitLab
-
diff --git a/kde-apps/krfb/files/krfb-21.12.2-optional-pipewire.patch b/kde-apps/krfb/files/krfb-21.12.2-optional-pipewire.patch
deleted file mode 100644
index 42efc93ee68..00000000000
--- a/kde-apps/krfb/files/krfb-21.12.2-optional-pipewire.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1222c2067ccaeef69878bd3101fc579011b3e191 Mon Sep 17 00:00:00 2001
-From: Luke Dashjr <luke-jr+git@utopios.org>
-Date: Mon, 24 Jan 2022 01:35:21 +0000
-Subject: [PATCH] Add CMake option DISABLE_PIPEWIRE to skip dependency check
-
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4f8241f..01e6f57 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -79,7 +79,10 @@ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} )
- find_package(LibVNCServer REQUIRED)
- 
- 
--pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3)
-+option(DISABLE_PIPEWIRE "Disable PipeWire support." OFF)
-+if(NOT DISABLE_PIPEWIRE)
-+    pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3)
-+endif()
- add_feature_info(PipeWire