From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8AF4715808B for ; Thu, 24 Feb 2022 17:04:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6219BE0830; Thu, 24 Feb 2022 17:04:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E8531E0837 for ; Thu, 24 Feb 2022 17:04:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0352A342DB0 for ; Thu, 24 Feb 2022 17:04:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F2A42F9 for ; Thu, 24 Feb 2022 17:04:34 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1645722263.e49b850b1e9c9cae33ebfde2925eda070bd9fd8d.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kmail/, kde-apps/kmail/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kmail/files/kmail-21.12.3-speech-optional.patch kde-apps/kmail/kmail-21.12.49.9999.ebuild kde-apps/kmail/kmail-9999.ebuild kde-apps/kmail/metadata.xml X-VCS-Directories: kde-apps/kmail/ kde-apps/kmail/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e49b850b1e9c9cae33ebfde2925eda070bd9fd8d X-VCS-Branch: master Date: Thu, 24 Feb 2022 17:04:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 20df826d-24fb-48e2-a5be-8f05582030a6 X-Archives-Hash: 22fa17bd4d6e9c23e93d5fc947f55f79 commit: e49b850b1e9c9cae33ebfde2925eda070bd9fd8d Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 24 16:58:07 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 24 17:04:23 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e49b850b kde-apps/kmail: Add IUSE speech Bug: https://bugs.gentoo.org/832776 Bug: https://bugs.gentoo.org/832845 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/kmail-21.12.3-speech-optional.patch | 69 ++++++++++++++++++++++ kde-apps/kmail/kmail-21.12.49.9999.ebuild | 6 +- kde-apps/kmail/kmail-9999.ebuild | 4 +- kde-apps/kmail/metadata.xml | 3 + 4 files changed, 78 insertions(+), 4 deletions(-) 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 new file mode 100644 index 0000000000..e0c7a4518c --- /dev/null +++ b/kde-apps/kmail/files/kmail-21.12.3-speech-optional.patch @@ -0,0 +1,69 @@ +From 817515f9278f97b3fa32bb434cb2bd26816a7838 Mon Sep 17 00:00:00 2001 +From: Laurent Montel +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 ++#if KPIMTEXTEDIT_TEXT_TO_SPEECH + #include ++#endif + #include + #include + #include +@@ -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 + #include + #include ++#include ++#if KPIMTEXTEDIT_TEXT_TO_SPEECH + #include ++#endif + #include + #include + #include +@@ -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/kmail/kmail-21.12.49.9999.ebuild b/kde-apps/kmail/kmail-21.12.49.9999.ebuild index ffbffdd5ea..6833a72d42 100644 --- a/kde-apps/kmail/kmail-21.12.49.9999.ebuild +++ b/kde-apps/kmail/kmail-21.12.49.9999.ebuild @@ -18,7 +18,7 @@ https://kontact.kde.org/components/kmail.html" LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" SLOT="5" KEYWORDS="" -IUSE="pch telemetry" +IUSE="pch speech telemetry" RESTRICT="test" # bug 616878 @@ -38,7 +38,7 @@ COMMON_DEPEND=" >=kde-apps/kmailtransport-${PVCUT}:5 >=kde-apps/kmime-${PVCUT}:5 >=kde-apps/kontactinterface-${PVCUT}:5 - >=kde-apps/kpimtextedit-${PVCUT}:5 + >=kde-apps/kpimtextedit-${PVCUT}:5[speech=] >=kde-apps/libgravatar-${PVCUT}:5 >=kde-apps/libkdepim-${PVCUT}:5 >=kde-apps/libkleo-${PVCUT}:5 @@ -88,6 +88,8 @@ BDEPEND=" test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] ) " +PATCHES=( "${FILESDIR}"/${PN}-21.12.3-speech-optional.patch ) + src_prepare() { ecm_src_prepare use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild index ffbffdd5ea..69950079bb 100644 --- a/kde-apps/kmail/kmail-9999.ebuild +++ b/kde-apps/kmail/kmail-9999.ebuild @@ -18,7 +18,7 @@ https://kontact.kde.org/components/kmail.html" LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" SLOT="5" KEYWORDS="" -IUSE="pch telemetry" +IUSE="pch speech telemetry" RESTRICT="test" # bug 616878 @@ -38,7 +38,7 @@ COMMON_DEPEND=" >=kde-apps/kmailtransport-${PVCUT}:5 >=kde-apps/kmime-${PVCUT}:5 >=kde-apps/kontactinterface-${PVCUT}:5 - >=kde-apps/kpimtextedit-${PVCUT}:5 + >=kde-apps/kpimtextedit-${PVCUT}:5[speech=] >=kde-apps/libgravatar-${PVCUT}:5 >=kde-apps/libkdepim-${PVCUT}:5 >=kde-apps/libkleo-${PVCUT}:5 diff --git a/kde-apps/kmail/metadata.xml b/kde-apps/kmail/metadata.xml index d925f24397..fa80953797 100644 --- a/kde-apps/kmail/metadata.xml +++ b/kde-apps/kmail/metadata.xml @@ -8,4 +8,7 @@ https://bugs.kde.org/ + + Enable text-to-speech support +