kde-apps/akregator: 21.12.3 version bump

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

5 files changed, 239 insertions, 0 deletions

diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 9adff645377d..fea69dc2511c 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,2 +1,3 @@
 DIST akregator-21.08.3.tar.xz 2246092 BLAKE2B 02ec9980dfcaca1a10be6bb8ae4b3067530f122297a633daff9f9ee5787003d178494cf2548410f4904f713207a8fd6d5e0fe331dc353a4e549c47b12c12687d SHA512 44d32689b3e717a967a6444742198122452bbaff752006dce29228b278299a44b7c71d3c79207d5b122e3c7a8b89513eb6bcc919d08c1e9a52704a96c27970c0
 DIST akregator-21.12.2.tar.xz 2259848 BLAKE2B ed03ff9d5c62b630bcc7676365f594ae6e069b697534fba92dd90dbf8b3ffd6f84d0505fed57a1183acda9a15dfabbd452c1f6dd405d59ad1ae5c17a6934f3a4 SHA512 faae377739c618d56411be94e768580069a5bea265da2fe88e1f941a2ab43279b19a704d419daf3c4d89fc5c3c2d78792a11511feed7831a58e5f6bbace958c8
+DIST akregator-21.12.3.tar.xz 2259904 BLAKE2B aa4ecc2e65969bca6f92cde18745a00f36bf8f537013a7f7ab7d18a14f03a2b16c8064c005b42dc37e8c7cc01459d9586cb4445d22b4930ad70d8b75039ed67b SHA512 be20a0d7e9dc52d3b0dafbac0fd3429873642f4c199289067314f3b0753dfa8d747728b9d747c339c6436c5c5fcf726788d99e51467f70025d3a1657984076e4
diff --git a/kde-apps/akregator/akregator-21.12.3.ebuild b/kde-apps/akregator/akregator-21.12.3.ebuild
new file mode 100644
index 000000000000..705015ddd923
--- /dev/null
+++ b/kde-apps/akregator/akregator-21.12.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.88.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="News feed aggregator"
+HOMEPAGE="https://apps.kde.org/akregator/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="speech telemetry"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5[speech=]
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/syndication-${KFMIN}:5
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/grantlee:5
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-21.12.3-speech-optional-{1,2}.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
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
new file mode 100644
index 000000000000..f8ebe576b8b7
--- /dev/null
+++ b/kde-apps/akregator/files/akregator-21.12.3-speech-optional-1.patch
@@ -0,0 +1,144 @@
+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
new file mode 100644
index 000000000000..0f3dfe05946e
--- /dev/null
+++ b/kde-apps/akregator/files/akregator-21.12.3-speech-optional-2.patch
@@ -0,0 +1,25 @@
+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/akregator/metadata.xml b/kde-apps/akregator/metadata.xml
index d925f2439758..fa80953797d0 100644
--- a/kde-apps/akregator/metadata.xml
+++ b/kde-apps/akregator/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
+	<use>
+		<flag name="speech">Enable text-to-speech support</flag>
+	</use>
 </pkgmetadata>