From 22899eb46c1c332d9a8a995c0be0b965fb1bcfc3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Jul 2022 14:56:29 +0100 Subject: gentoo auto-resync : 25:07:2022 - 14:56:29 --- kde-apps/akregator/Manifest | 4 - kde-apps/akregator/akregator-21.12.3.ebuild | 66 ---------- .../akregator-21.12.3-speech-optional-1.patch | 144 --------------------- .../akregator-21.12.3-speech-optional-2.patch | 25 ---- 4 files changed, 239 deletions(-) delete mode 100644 kde-apps/akregator/akregator-21.12.3.ebuild delete mode 100644 kde-apps/akregator/files/akregator-21.12.3-speech-optional-1.patch delete mode 100644 kde-apps/akregator/files/akregator-21.12.3-speech-optional-2.patch (limited to 'kde-apps/akregator') diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest index 1027dcdf277b..bd191c4fa8c2 100644 --- a/kde-apps/akregator/Manifest +++ b/kde-apps/akregator/Manifest @@ -1,7 +1,3 @@ -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.12.3.tar.xz 2259904 BLAKE2B aa4ecc2e65969bca6f92cde18745a00f36bf8f537013a7f7ab7d18a14f03a2b16c8064c005b42dc37e8c7cc01459d9586cb4445d22b4930ad70d8b75039ed67b SHA512 be20a0d7e9dc52d3b0dafbac0fd3429873642f4c199289067314f3b0753dfa8d747728b9d747c339c6436c5c5fcf726788d99e51467f70025d3a1657984076e4 DIST akregator-22.04.3.tar.xz 2262312 BLAKE2B 76a4f99f58979da8c87afcb813ea06ed45f038a263028082b996e6a222bb08fb318018a7756e7169b187d054fef05d089afff15e891a7d91bb4e843ed645d07e SHA512 21017492288adb7f2083754215916ed5aa517bab696ca40bef585e85834ee82dc3aa0393b91835cb4a18981343c0640eeba1ff24ad56d6a2f9dc9a0bd21641f9 -EBUILD akregator-21.12.3.ebuild 1805 BLAKE2B a8f6e0000ac7d733af7fc300831c3a1b64386467ca9ba98eb66b375b4c4ebd36c30865ecef3bd73ec77f32dd7702c69ad9609ad617a1ed5399b4a9a12df4e22b SHA512 ee0d264ec668becfe61e11c3a28c28b6b1d46460dc5b43553f173b7988e09ee0eee5cfdc07f410c004a4aa1a5850eaf3bb844666b59b6348b8a107bc4190717a EBUILD akregator-22.04.3.ebuild 1727 BLAKE2B 51aa17538489851b66a8bbb8b33ca84eed9634205523595d3f742f50cbef40e8973a22871a2222679def960b02db99f13b4418a7b95b9a8743dcfba98b3da8cf SHA512 ce1909eed4a21bb9800214285b0484313b612b5eaf4a16f4d07043b38c4b009f4823056a7827ee26ebb6da531c03ae89b2138b1595e2c2b01c45312c95d53434 MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb diff --git a/kde-apps/akregator/akregator-21.12.3.ebuild b/kde-apps/akregator/akregator-21.12.3.ebuild deleted file mode 100644 index cda467055969..000000000000 --- a/kde-apps/akregator/akregator-21.12.3.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# 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 deleted file mode 100644 index f8ebe576b8b7..000000000000 --- 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 -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 -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - #include -+#endif - #include - #include - #include -@@ -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 - #include - #include -- -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - #include -- -+#endif - #include - - #include -@@ -45,7 +45,9 @@ template InvokeWrapper 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 -+ - #include - 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 - #include - #include -+#include -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - #include -+#endif - #include - #include - #include -@@ -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 0f3dfe05946e..000000000000 --- 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 -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 - #include - #if KPIMTEXTEDIT_TEXT_TO_SPEECH --#include -+#include - #endif - #include - --- -GitLab - -- cgit v1.2.3