* [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/files/, kde-apps/akregator/files/, kde-apps/messagelib/files/, ...
@ 2022-03-03 15:05 Andreas Sturmlechner
0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2022-03-03 15:05 UTC (permalink / raw
To: gentoo-commits
commit: 9cda37b51f896dc527130188156acf4cde829e64
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 3 15:05:01 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 3 15:05:01 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9cda37b5
kde-apps: Cleanup unused patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../akregator-21.12.3-speech-optional-1.patch | 144 ----------
.../akregator-21.12.3-speech-optional-2.patch | 25 --
.../files/kalarm-21.12.3-speech-optional.patch | 124 ---------
.../files/kmail-21.12.3-speech-optional.patch | 69 -----
.../kpimtextedit-21.12.3-speech-optional-1.patch | 289 ---------------------
.../kpimtextedit-21.12.3-speech-optional-2.patch | 25 --
.../kpimtextedit-21.12.3-speech-optional-3.patch | 100 -------
.../files/krfb-21.12.2-optional-pipewire.patch | 28 --
.../files/libksieve-21.12.3-speech-optional.patch | 180 -------------
.../messagelib-21.12.3-speech-optional-1.patch | 131 ----------
.../messagelib-21.12.3-speech-optional-2.patch | 95 -------
.../messagelib-21.12.3-speech-optional-3.patch | 56 ----
.../files/okular-21.08.1-optional-options.patch | 109 --------
.../files/umbrello-20.08.3-no-qtwebkit.patch | 111 --------
14 files changed, 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 f8ebe576b8..0000000000
--- 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 0f3dfe0594..0000000000
--- 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 ce4f45c376..0000000000
--- 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 e0c7a4518c..0000000000
--- 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 d7fa7474a4..0000000000
--- 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 a078840af0..0000000000
--- 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 617864cd7b..0000000000
--- 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 42efc93ee6..0000000000
--- 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 PipeWire_FOUND "Required for pipewire screencast plugin")
- find_package(PlasmaWaylandProtocols 1.5.0)
-
---
-GitLab
-
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
deleted file mode 100644
index b77300483a..0000000000
--- a/kde-apps/libksieve/files/libksieve-21.12.3-speech-optional.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-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/messagelib/files/messagelib-21.12.3-speech-optional-1.patch b/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-1.patch
deleted file mode 100644
index 39f48362a4..0000000000
--- a/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-1.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From a8d74999570b1dd6025548593e2d06b37afadce0 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Mon, 14 Feb 2022 19:07:53 +0100
-Subject: [PATCH] Fix build without texttospeech
-
----
- .../mailsourceviewtextbrowserwidget.cpp | 19 ++++++++++++++++---
- .../widgets/mailsourceviewtextbrowserwidget.h | 9 +++++++++
- 2 files changed, 25 insertions(+), 3 deletions(-)
-
-diff --git a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
-index 5c0050002..0e5b61c1e 100644
---- a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
-+++ b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
-@@ -38,16 +38,20 @@ using namespace MessageViewer;
- MailSourceViewTextBrowserWidget::MailSourceViewTextBrowserWidget(const QString &syntax, QWidget *parent)
- : QWidget(parent)
- , mSliderContainer(new KPIMTextEdit::SlideContainer(this))
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- , mTextToSpeechWidget(new KPIMTextEdit::TextToSpeechWidget(this))
-+#endif
- {
- auto lay = new QVBoxLayout(this);
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- lay->setContentsMargins({});
- mTextToSpeechWidget->setObjectName(QStringLiteral("texttospeech"));
- lay->addWidget(mTextToSpeechWidget);
--
- auto textToSpeechInterface = new KPIMTextEdit::TextToSpeechInterface(mTextToSpeechWidget, this);
--
- mTextBrowser = new MailSourceViewTextBrowser(textToSpeechInterface);
-+#else
-+ mTextBrowser = new MailSourceViewTextBrowser(this);
-+#endif
- mTextBrowser->setObjectName(QStringLiteral("textbrowser"));
- mTextBrowser->setLineWrapMode(QPlainTextEdit::NoWrap);
- mTextBrowser->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
-@@ -104,12 +108,17 @@ MessageViewer::MailSourceViewTextBrowser *MailSourceViewTextBrowserWidget::textB
- {
- return mTextBrowser;
- }
--
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- MailSourceViewTextBrowser::MailSourceViewTextBrowser(KPIMTextEdit::TextToSpeechInterface *textToSpeechInterface, QWidget *parent)
- : QPlainTextEdit(parent)
- , mTextToSpeechInterface(textToSpeechInterface)
- {
- }
-+#endif
-+MailSourceViewTextBrowser::MailSourceViewTextBrowser(QWidget *parent)
-+ : QPlainTextEdit(parent)
-+{
-+}
-
- void MailSourceViewTextBrowser::contextMenuEvent(QContextMenuEvent *event)
- {
-@@ -117,6 +126,7 @@ void MailSourceViewTextBrowser::contextMenuEvent(QContextMenuEvent *event)
- if (popup) {
- popup->addSeparator();
- popup->addAction(KStandardAction::find(this, &MailSourceViewTextBrowser::findText, this));
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- // Code from KTextBrowser
- if (mTextToSpeechInterface->isReady()) {
- popup->addSeparator();
-@@ -125,6 +135,7 @@ void MailSourceViewTextBrowser::contextMenuEvent(QContextMenuEvent *event)
- this,
- &MailSourceViewTextBrowser::slotSpeakText);
- }
-+#endif
- popup->addSeparator();
- popup->addAction(KStandardAction::saveAs(this, &MailSourceViewTextBrowser::slotSaveAs, this));
-
-@@ -140,6 +151,7 @@ void MailSourceViewTextBrowser::slotSaveAs()
-
- void MailSourceViewTextBrowser::slotSpeakText()
- {
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- QString text;
- if (textCursor().hasSelection()) {
- text = textCursor().selectedText();
-@@ -147,4 +159,5 @@ void MailSourceViewTextBrowser::slotSpeakText()
- text = toPlainText();
- }
- mTextToSpeechInterface->say(text);
-+#endif
- }
-diff --git a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h
-index 84f0eb8ae..500402f9a 100644
---- a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h
-+++ b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.h
-@@ -12,6 +12,8 @@
- #include <KSyntaxHighlighting/Repository>
- #include <QPlainTextEdit>
- #include <QSyntaxHighlighter>
-+#include <kpimtextedit/kpimtextedit-texttospeech.h>
-+
- namespace KPIMTextEdit
- {
- class SlideContainer;
-@@ -50,14 +52,19 @@ private:
- MailSourceViewTextBrowser *mTextBrowser = nullptr;
- FindBarSourceView *mFindBar = nullptr;
- KPIMTextEdit::SlideContainer *const mSliderContainer;
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- KPIMTextEdit::TextToSpeechWidget *const mTextToSpeechWidget;
-+#endif
- };
-
- class MailSourceViewTextBrowser : public QPlainTextEdit
- {
- Q_OBJECT
- public:
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- explicit MailSourceViewTextBrowser(KPIMTextEdit::TextToSpeechInterface *textToSpeechInterface, QWidget *parent = nullptr);
-+#endif
-+ explicit MailSourceViewTextBrowser(QWidget *parent);
-
- protected:
- void contextMenuEvent(QContextMenuEvent *event) override;
-@@ -67,6 +74,8 @@ Q_SIGNALS:
- private:
- void slotSpeakText();
- void slotSaveAs();
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- KPIMTextEdit::TextToSpeechInterface *mTextToSpeechInterface = nullptr;
-+#endif
- };
- }
---
-GitLab
-
diff --git a/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-2.patch b/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-2.patch
deleted file mode 100644
index a00fab7d58..0000000000
--- a/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-2.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From da4ba2b7dc18ba20994dad54e754ed1d9d9c7a48 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Mon, 14 Feb 2022 19:16:56 +0100
-Subject: [PATCH] Compile without text to speech support
-
----
- messageviewer/src/viewer/viewer_p.cpp | 10 ++++++----
- messageviewer/src/viewer/viewer_p.h | 8 +++++---
- 2 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp
-index 5e7af8e01..15e71482f 100644
---- a/messageviewer/src/viewer/viewer_p.cpp
-+++ b/messageviewer/src/viewer/viewer_p.cpp
-@@ -1403,11 +1403,11 @@ void ViewerPrivate::createWidgets()
- mOpenSavedFileFolderWidget = new OpenSavedFileFolderWidget(readerBox);
- mOpenSavedFileFolderWidget->setObjectName(QStringLiteral("opensavefilefolderwidget"));
- readerBoxVBoxLayout->addWidget(mOpenSavedFileFolderWidget);
--
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- mTextToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(readerBox);
- mTextToSpeechWidget->setObjectName(QStringLiteral("texttospeechwidget"));
- readerBoxVBoxLayout->addWidget(mTextToSpeechWidget);
--
-+#endif
- mViewer = new MailWebEngineView(mActionCollection, readerBox);
- mViewer->setViewer(this);
- readerBoxVBoxLayout->addWidget(mViewer);
-@@ -1609,12 +1609,12 @@ void ViewerPrivate::createActions()
- ac->setDefaultShortcut(loadExternalReferenceAction, QKeySequence(Qt::SHIFT | Qt::CTRL | Qt::Key_R));
- connect(loadExternalReferenceAction, &QAction::triggered, this, &ViewerPrivate::slotLoadExternalReference);
- MessageViewer::Util::addHelpTextAction(loadExternalReferenceAction, i18n("Load external references from the Internet for this message."));
--
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- mSpeakTextAction = new QAction(i18n("Speak Text"), this);
- mSpeakTextAction->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-text-to-speech")));
- ac->addAction(QStringLiteral("speak_text"), mSpeakTextAction);
- connect(mSpeakTextAction, &QAction::triggered, this, &ViewerPrivate::slotSpeakText);
--
-+#endif
- auto purposeMenuWidget = new MailfilterPurposeMenuWidget(mViewer, this);
- mShareTextAction = new QAction(i18n("Share Text..."), this);
- mShareTextAction->setMenu(purposeMenuWidget->menu());
-@@ -2605,10 +2605,12 @@ void ViewerPrivate::replyMessage(KMime::Content *atmNode, bool replyToAll)
-
- void ViewerPrivate::slotSpeakText()
- {
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- const QString text = mViewer->selectedText();
- if (!text.isEmpty()) {
- mTextToSpeechWidget->say(text);
- }
-+#endif
- }
-
- QUrl ViewerPrivate::imageUrl() const
-diff --git a/messageviewer/src/viewer/viewer_p.h b/messageviewer/src/viewer/viewer_p.h
-index 88cb605e5..467163a2a 100644
---- a/messageviewer/src/viewer/viewer_p.h
-+++ b/messageviewer/src/viewer/viewer_p.h
-@@ -13,18 +13,18 @@
- #include "messageviewer_private_export.h"
- #include "viewer.h" //not so nice, it is actually for the enums from MailViewer
- #include "widgets/opensavedfilefolderwidget.h"
--#include <PimCommon/ShareServiceUrlManager>
--#include <WebEngineViewer/CheckPhishingUrlUtil>
--
- #include <Akonadi/Item>
- #include <Akonadi/Monitor>
- #include <Akonadi/Session>
- #include <KIO/Job>
- #include <KMime/Message>
- #include <KService>
-+#include <PimCommon/ShareServiceUrlManager>
- #include <QPointer>
- #include <QUrl>
- #include <QVector>
-+#include <WebEngineViewer/CheckPhishingUrlUtil>
-+#include <kpimtextedit/kpimtextedit-texttospeech.h>
-
- #include <QObject>
- #include <QTimer>
-@@ -695,7 +695,9 @@ public:
- MessageViewer::OpenSavedFileFolderWidget *mOpenSavedFileFolderWidget = nullptr;
- WebEngineViewer::SubmittedFormWarningWidget *mSubmittedFormWarning = nullptr;
- WebEngineViewer::TrackingWarningWidget *mMailTrackingWarning = nullptr;
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- KPIMTextEdit::TextToSpeechWidget *mTextToSpeechWidget = nullptr;
-+#endif
- Viewer::DisplayFormatMessage mDisplayFormatMessageOverwrite;
- KPIMTextEdit::SlideContainer *mSliderContainer = nullptr;
- PimCommon::ShareServiceUrlManager *mShareServiceManager = nullptr;
---
-GitLab
-
diff --git a/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-3.patch b/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-3.patch
deleted file mode 100644
index 092df18f44..0000000000
--- a/kde-apps/messagelib/files/messagelib-21.12.3-speech-optional-3.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 141b7862a292323fa41c9f863e16f49e548d8bfa Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 24 Feb 2022 16:04:59 +0100
-Subject: [PATCH] Fix build without texttospeech
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- messageviewer/src/utils/messageviewerutil.cpp | 1 -
- messageviewer/src/viewer/viewer_p.cpp | 2 ++
- messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp | 2 ++
- 3 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/messageviewer/src/utils/messageviewerutil.cpp b/messageviewer/src/utils/messageviewerutil.cpp
-index 607fa65cb..e2446c13a 100644
---- a/messageviewer/src/utils/messageviewerutil.cpp
-+++ b/messageviewer/src/utils/messageviewerutil.cpp
-@@ -41,7 +41,6 @@
- #include "MessageCore/StringUtil"
- #include "messageviewer_debug.h"
- #include "messageviewerutil_p.h"
--#include <KPIMTextEdit/TextToSpeech>
- #include <MimeTreeParser/NodeHelper>
-
- #include <PimCommon/RenameFileDialog>
-diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp
-index b989b294a..22587635c 100644
---- a/messageviewer/src/viewer/viewer_p.cpp
-+++ b/messageviewer/src/viewer/viewer_p.cpp
-@@ -129,7 +129,9 @@
- #include <Akonadi/CollectionFetchScope>
-
- #include <KJobWidgets/KJobWidgets>
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- #include <KPIMTextEdit/TextToSpeechWidget>
-+#endif
- #include <QApplication>
- #include <QStandardPaths>
- #include <QWebEngineSettings>
-diff --git a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
-index 0e5b61c1e..67ac5bf1a 100644
---- a/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
-+++ b/messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp
-@@ -13,8 +13,10 @@
- #include "messageviewer/messageviewerutil.h"
- #include "messageviewer_debug.h"
- #include <KPIMTextEdit/SlideContainer>
-+#if KPIMTEXTEDIT_TEXT_TO_SPEECH
- #include <KPIMTextEdit/TextToSpeechInterface>
- #include <KPIMTextEdit/TextToSpeechWidget>
-+#endif
- #include <PimCommon/PimUtil>
-
- #include <KSyntaxHighlighting/Definition>
---
-2.35.1
-
diff --git a/kde-apps/okular/files/okular-21.08.1-optional-options.patch b/kde-apps/okular/files/okular-21.08.1-optional-options.patch
deleted file mode 100644
index 71d8df156e..0000000000
--- a/kde-apps/okular/files/okular-21.08.1-optional-options.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 54351076f87ce2a43a87427d9c3f3e00539b9fd5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 31 Aug 2021 16:48:42 +0200
-Subject: [PATCH] Make WITH_KWALLET and WITH_KJS proper cmake options
-
-Since I was asked to implement this, might as well make it real options,
-not just limited to ANDROID. Even though optional find_package() call is
-already being used for KF5Purpose as well.
-
-KF5DocTools is not made required more often than not.
-
-See also: https://invent.kde.org/graphics/okular/-/issues/61
-Downstream report: https://bugs.gentoo.org/810958
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 21 ++++++++-------------
- config-okular.h.cmake | 6 ++++++
- core/generator.cpp | 1 +
- core/scripter.cpp | 1 +
- 4 files changed, 16 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2506c3cfa..984f3695e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,12 +76,9 @@ ecm_setup_qtplugin_macro_names(
- PACKAGE_SETUP_AUTOMOC_VARIABLES
- )
-
--set(optionalComponents)
--if (ANDROID)
--# we want to make sure that generally all components are found
--
-- set(optionalComponents "OPTIONAL_COMPONENTS")
--endif()
-+# we want to make sure that generally all components are found
-+option(WITH_KWALLET "Build with desktop-wide storage for password support" ON)
-+option(WITH_KJS "Build with scripting support" ON)
-
- find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
- Archive
-@@ -98,17 +95,15 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
- TextWidgets
- ThreadWeaver
- WindowSystem
-- ${optionalComponents}
-+ OPTIONAL_COMPONENTS
- DocTools
-- JS
-- Wallet
- )
-
--if(KF5Wallet_FOUND)
-- add_definitions(-DWITH_KWALLET=1)
-+if(WITH_KWALLET)
-+ find_package(KF5Wallet ${KF5_REQUIRED_VERSION} REQUIRED)
- endif()
--if(KF5JS_FOUND)
-- add_definitions(-DWITH_KJS=1)
-+if(WITH_KJS)
-+ find_package(KF5JS ${KF5_REQUIRED_VERSION} REQUIRED)
- endif()
-
- if(NOT WIN32 AND NOT ANDROID)
-diff --git a/config-okular.h.cmake b/config-okular.h.cmake
-index 905aac9cb..00e45f77c 100644
---- a/config-okular.h.cmake
-+++ b/config-okular.h.cmake
-@@ -1,6 +1,12 @@
- /* Defines if force the use DRM in okular */
- #define OKULAR_FORCE_DRM ${_OKULAR_FORCE_DRM}
-
-+/* Defines if the KJS framework is available */
-+#cmakedefine WITH_KJS
-+
-+/* Defines if the kwallet framework is available */
-+#cmakedefine WITH_KWALLET
-+
- /* Defines if the purpose framework is available */
- #define PURPOSE_FOUND ${PURPOSE_FOUND}
-
-diff --git a/core/generator.cpp b/core/generator.cpp
-index 051c2c922..f675ebcb3 100644
---- a/core/generator.cpp
-+++ b/core/generator.cpp
-@@ -8,6 +8,7 @@
- SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-+#include "config-okular.h"
- #include "generator.h"
- #include "generator_p.h"
- #include "observer.h"
-diff --git a/core/scripter.cpp b/core/scripter.cpp
-index c60645895..d5b640dbb 100644
---- a/core/scripter.cpp
-+++ b/core/scripter.cpp
-@@ -4,6 +4,7 @@
- SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-+#include "config-okular.h"
- #include "scripter.h"
-
- #include <QDebug>
---
-2.33.0
-
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
deleted file mode 100644
index 74a1e9b3e6..0000000000
--- a/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From eb753a7eb0f49c6ac5b349f81387ca4b4c64342b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 12 Oct 2020 11:46:24 +0200
-Subject: [PATCH] Make QtWebKit usage in WelcomePage optional, with
- QTextBrowser fallback
-
-Thanks-to: Ralf Habacker <ralf.habacker@freenet.de> for QTextBrowser fallback code.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 7 ++++++-
- umbrello/CMakeLists.txt | 4 +++-
- umbrello/umlappprivate.h | 13 +++++++++++++
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 50b0bd163..8673740cc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -102,9 +102,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
- Test
- Widgets
- Xml
-- WebKitWidgets
- )
-
-+find_package(Qt5WebKitWidgets ${QT_MIN_VERSION})
-+if(Qt5WebKitWidgets_FOUND)
-+ add_definitions(-DWEBKIT_WELCOMEPAGE)
-+ set(WEBKIT_WELCOMEPAGE 1)
-+endif()
-+
- # search packages used by KDE
- find_package(KF5 REQUIRED COMPONENTS
- Archive
-diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
-index 4a2168542..fd5ef8fbf 100644
---- a/umbrello/CMakeLists.txt
-+++ b/umbrello/CMakeLists.txt
-@@ -549,7 +549,6 @@ else()
- Qt5::Xml
- Qt5::PrintSupport
- Qt5::Svg
-- Qt5::WebKitWidgets
- KF5::Archive
- KF5::Completion
- KF5::CoreAddons
-@@ -565,6 +564,9 @@ else()
- ${LIBXML2_LIBRARIES}
- codeimport
- )
-+ if(WEBKIT_WELCOMEPAGE)
-+ target_link_libraries(libumbrello Qt5::WebKitWidgets)
-+ endif()
- ecm_add_app_icon(umbrello_SRCS
- ICONS
- ${CMAKE_CURRENT_SOURCE_DIR}/pics/global/16-apps-umbrello.png
-diff --git a/umbrello/umlappprivate.h b/umbrello/umlappprivate.h
-index 0c832048d..ad425a37f 100644
---- a/umbrello/umlappprivate.h
-+++ b/umbrello/umlappprivate.h
-@@ -37,7 +37,11 @@
- #include <QFileInfo>
- #include <QListWidget>
- #include <QObject>
-+#ifdef WEBKIT_WELCOMEPAGE
- #include <QWebView>
-+#else
-+#include <QTextBrowser>
-+#endif
-
- class QWidget;
-
-@@ -155,6 +159,7 @@ public slots:
- // qDebug() << html;
- welcomeWindow = new QDockWidget(i18n("Welcome"), parent);
- welcomeWindow->setObjectName(QLatin1String("WelcomeDock"));
-+#ifdef WEBKIT_WELCOMEPAGE
- QWebView *view = new QWebView;
- view->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
- view->setContextMenuPolicy(Qt::NoContextMenu);
-@@ -162,6 +167,14 @@ public slots:
- view->setHtml(html);
- view->show();
- welcomeWindow->setWidget(view);
-+#else
-+ QTextBrowser *tb = new QTextBrowser(dynamic_cast<QWidget*>(this));
-+ tb->setOpenExternalLinks(true);
-+ tb->setOpenLinks(false);
-+ tb->setHtml(html);
-+ connect(tb, SIGNAL(anchorClicked(const QUrl)), this, SLOT(slotWelcomeWindowLinkClicked(const QUrl)));
-+ welcomeWindow->setWidget(tb);
-+#endif
- parent->addDockWidget(Qt::RightDockWidgetArea, welcomeWindow);
-
- viewWelcomeWindow = parent->actionCollection()->add<KToggleAction>(QLatin1String("view_show_welcome"));
-diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
-index 26bd4b870..9dadb484a 100644
---- a/unittests/CMakeLists.txt
-+++ b/unittests/CMakeLists.txt
-@@ -59,7 +59,6 @@ else()
- Qt5::Xml
- Qt5::Test
- Qt5::Widgets
-- Qt5::WebKitWidgets
- KF5::I18n
- KF5::Crash
- ${LIBXML2_LIBRARIES}
---
-2.29.2
-
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-03-03 15:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-03 15:05 [gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/files/, kde-apps/akregator/files/, kde-apps/messagelib/files/, Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox