summaryrefslogtreecommitdiff
path: root/kde-apps/akregator
diff options
context:
space:
mode:
Diffstat (limited to 'kde-apps/akregator')
-rw-r--r--kde-apps/akregator/Manifest8
-rw-r--r--kde-apps/akregator/akregator-21.12.3.ebuild (renamed from kde-apps/akregator/akregator-21.12.1.ebuild)6
-rw-r--r--kde-apps/akregator/files/akregator-21.12.3-speech-optional-1.patch144
-rw-r--r--kde-apps/akregator/files/akregator-21.12.3-speech-optional-2.patch25
-rw-r--r--kde-apps/akregator/metadata.xml3
5 files changed, 181 insertions, 5 deletions
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index cf35d6e080b0..e4447b88c8aa 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,5 +1,7 @@
+AUX akregator-21.12.3-speech-optional-1.patch 5994 BLAKE2B 02158bf839e389eab98b7872b3bab952503fddc39cdf63391c788dd8ebc4bdb98f9126b47eda1369f7b5cf9462ce70a205204837b55c3eece9bebcf823dbc3cf SHA512 3be05a8e3a5eda38138d4f4c0624fe3297fa3dd5bf4724e59946275617e332984f7b8f3bf4e536f9c970afe771680fa76340c6ea581b56fcd5ceaf418b2313e0
+AUX akregator-21.12.3-speech-optional-2.patch 916 BLAKE2B 3d84ecb9c7c9d4f2a4e2d1bd85fb3b32264440264880c8d6fb8a67ce1b899b71b58143f6a12067cc166f6a37ffbd56e2f5d257a0f277dcb89e79fd493549f258 SHA512 7d24d217c5d3e71e415138dbc98ebea11b947bd2051d44eef466a0ab62412917c7ac369a27afbd300cf278f7cb8e90fcef2dc78f2b48ce5efb6f744ea1e8e22e
DIST akregator-21.08.3.tar.xz 2246092 BLAKE2B 02ec9980dfcaca1a10be6bb8ae4b3067530f122297a633daff9f9ee5787003d178494cf2548410f4904f713207a8fd6d5e0fe331dc353a4e549c47b12c12687d SHA512 44d32689b3e717a967a6444742198122452bbaff752006dce29228b278299a44b7c71d3c79207d5b122e3c7a8b89513eb6bcc919d08c1e9a52704a96c27970c0
-DIST akregator-21.12.1.tar.xz 2252640 BLAKE2B 2801d62493dd97495e36e8de703488bdb48e3a9c9908cf0809c9d0b63377872b08df9bcc7e8696c2f22f9649f9298ca48503352c146aea9d9026ce2fcbef51e2 SHA512 fa6690cbe64aa65fa52387ac48b8787e0f570c6b7318133cc87e0b2acf84b559554804a33b59b544ef137ce3e101b47f94f52ef74988feb0839c5a2c8d010243
+DIST akregator-21.12.3.tar.xz 2259904 BLAKE2B aa4ecc2e65969bca6f92cde18745a00f36bf8f537013a7f7ab7d18a14f03a2b16c8064c005b42dc37e8c7cc01459d9586cb4445d22b4930ad70d8b75039ed67b SHA512 be20a0d7e9dc52d3b0dafbac0fd3429873642f4c199289067314f3b0753dfa8d747728b9d747c339c6436c5c5fcf726788d99e51467f70025d3a1657984076e4
EBUILD akregator-21.08.3.ebuild 1720 BLAKE2B 34e70093a88456655d643d6fed49aff6f536366fcf77329673a39511dd69f15ac5444f09b7635b30cbd77b8ab08c4eee8d52ab697675b832191c3a675293fe13 SHA512 8d285d35fc86591a0d9bbf56207abec8304e6e453884cc1ecb75ab369e270ee2c5625e61f538ef6d593edd6b2b3740d5db9d47abd27e81e31b8b19a1e5538631
-EBUILD akregator-21.12.1.ebuild 1723 BLAKE2B e955b81218f8de674255cdc72cfe4cfffe2b81be716054cdb9559cf6a4d24db76a139617481b227e989b5bfcf7fe67aee54cac3ea38d7b6847b60106fd3ec2bc SHA512 4ae174a090f3a3948bf8f7ab11202ee9c118d1ce190114dfa5545379ef6f0ccad4418ed613005e2e3561a279a88675d41da7ae4a9b2a06680e0533e769b15106
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+EBUILD akregator-21.12.3.ebuild 1808 BLAKE2B 5deaf63c1d76e1151c00f41ee9268af53e8d71e3d61cd2a45e8b31f462d0b9265b418373c53e9da0f9c219fcca359740b68139354bfe7a8e64705948a6ce98f3 SHA512 2d309b30f50afd5d7bad4aa171b88256725595ce07cfff730a8489d03cbf53e0d95c7bfc3d63ca5ed91daa3190298984f29843aa906aba09879e82fe1827c837
+MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
diff --git a/kde-apps/akregator/akregator-21.12.1.ebuild b/kde-apps/akregator/akregator-21.12.3.ebuild
index d1b10448c420..705015ddd923 100644
--- a/kde-apps/akregator/akregator-21.12.1.ebuild
+++ b/kde-apps/akregator/akregator-21.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/akregator/"
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
SLOT="5"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="telemetry"
+IUSE="speech telemetry"
RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -27,7 +27,7 @@ RDEPEND="
>=dev-qt/qtxml-${QTMIN}:5
>=kde-apps/grantleetheme-${PVCUT}:5
>=kde-apps/kontactinterface-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
+ >=kde-apps/kpimtextedit-${PVCUT}:5[speech=]
>=kde-apps/libkdepim-${PVCUT}:5
>=kde-apps/messagelib-${PVCUT}:5
>=kde-apps/pimcommon-${PVCUT}:5
@@ -55,6 +55,8 @@ 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)
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-18 16:42:39 +0000