From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- kde-apps/kalarm/Manifest | 7 +- .../files/kalarm-21.12.3-speech-optional.patch | 124 +++++++++++++++++++++ kde-apps/kalarm/kalarm-21.12.1.ebuild | 80 ------------- kde-apps/kalarm/kalarm-21.12.3.ebuild | 82 ++++++++++++++ kde-apps/kalarm/metadata.xml | 3 + 5 files changed, 213 insertions(+), 83 deletions(-) create mode 100644 kde-apps/kalarm/files/kalarm-21.12.3-speech-optional.patch delete mode 100644 kde-apps/kalarm/kalarm-21.12.1.ebuild create mode 100644 kde-apps/kalarm/kalarm-21.12.3.ebuild (limited to 'kde-apps/kalarm') diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest index 1e1d536120e1..3edc3f27919e 100644 --- a/kde-apps/kalarm/Manifest +++ b/kde-apps/kalarm/Manifest @@ -1,5 +1,6 @@ +AUX kalarm-21.12.3-speech-optional.patch 4053 BLAKE2B 70f49fde0e91654bfcbee359ca742916962013e717c55ab196c463bd22e91cc6634caa228769e5d8e94b285b47a19271383d70e89dfc4a1775d41889cade4d64 SHA512 6eee12b81f5ea316af5b15d9b00beb752026d150e07aa37177806852120d407402cd8cc9576688cb50dd702b5ba75150bc9796e4bc2329ce7a3cd5ea40f2f24b DIST kalarm-21.08.3.tar.xz 2158988 BLAKE2B 45e544bc518a0640760a0af329983ab6b052fcc0cbba43beff5963018cdd4992053aec6fac506784fe826b626591218eb24bb654402e7a00ae009b5234b54d83 SHA512 690c89006598e8e87e1fd4b0f9b5d183280efa3f5f2d1fcda01607498b03ffad75a60e49ef4435f8fd66357231446c187a77d9976a6c04d98519f8ca3747a1b7 -DIST kalarm-21.12.1.tar.xz 2193880 BLAKE2B 4905b41e198b2a59b46a37bf0a4cece85ed547dd500cc54f56ca154e1f300335db5ce6b17f13702fdab6af0acec2abde2e5dfda65adec7bca2c2ab7c9a79196d SHA512 05a7ea4de29befa3aa60139ea508e8650abfe3f619805f2e42ec967df1289fec29ef678bf6827499ff82161837aa77d656082aa99f3ee81517ce621fc3d9d71e +DIST kalarm-21.12.3.tar.xz 2197144 BLAKE2B 583a367bd883351311d5d84e48af9e8168a5d6ef6210e0191983079c02b9a87866d9b602a6a5b9bf0e78f9f183705e6be5876c23311d8e217858e5aa65e4e196 SHA512 6f56719774b99968a4037ec2aaf4938101ff012244e5b432daa0d5591a92ac7f454101770e01470647abd472399eac6bec8ecb7b5def4480dcc7feed779f4acd EBUILD kalarm-21.08.3-r1.ebuild 2290 BLAKE2B 0a31d1b55e5a5ea91638462e84754312c3d7f4dd59182540dcfd16070c2592c3f9efc171ae1f15f5e82c2a7dcef020cf7abb6b912130af247c7261c4e071a097 SHA512 12529edf2f111366f3624b958a97404524ef6809f2ef91bcb273053a10b4f44baf3fb93b75b77964ab08749c47d575d23adfc0e7fee284aad06204696e6f056e -EBUILD kalarm-21.12.1.ebuild 2346 BLAKE2B 4001348699cd155784f2530a3e13548aff8c8db4430fa730e634a5da430948665c631655f7859442d884199e9fd5a08c9b206e6d5d1ffaae7569caceca1d31c2 SHA512 61d39ff138575275c21c7e4998b7c19e80ea291688219a84db2d64ff2a80aa08425788335709284240a32da4b55397e754ab729bf70aed0d284469eff60891ac -MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 +EBUILD kalarm-21.12.3.ebuild 2425 BLAKE2B 7adad2eaf4e3392fc0f7866de10f1cf230648d621cfa566da8a0d8f6dd3510d438bef09b89772c59cb2c14a96afb5c070fa25b0c5f9b940f2aa31f416feb2ef7 SHA512 e2976998a1137adea29890eeb2fb726aa520b7d2a526d3216e826c733d1be7f4e0474d9619aeef5006f8bcf22cf38c8f274b1432fa7ed78223b93099144108a2 +MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb 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 new file mode 100644 index 000000000000..ce4f45c37601 --- /dev/null +++ b/kde-apps/kalarm/files/kalarm-21.12.3-speech-optional.patch @@ -0,0 +1,124 @@ +From 53a299c513c447afc57c7f520ac35aea2dffc277 Mon Sep 17 00:00:00 2001 +From: Laurent Montel +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 ++#include ++#if KPIMTEXTEDIT_TEXT_TO_SPEECH + #include ++#endif + #include + + #include +@@ -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", "%1 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 ++#if KPIMTEXTEDIT_TEXT_TO_SPEECH + #include ++#endif + + #include + #include +@@ -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 + using namespace KHolidays; + ++#include ++#if KPIMTEXTEDIT_TEXT_TO_SPEECH + #include ++#endif + + #include + #include +@@ -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 ++#if KPIMTEXTEDIT_TEXT_TO_SPEECH + #include ++#endif + + #include + #include +@@ -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/kalarm/kalarm-21.12.1.ebuild b/kde-apps/kalarm/kalarm-21.12.1.ebuild deleted file mode 100644 index 1988cc57bd2e..000000000000 --- a/kde-apps/kalarm/kalarm-21.12.1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -PVCUT=$(ver_cut 1-3) -KFMIN=5.88.0 -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop" -HOMEPAGE="https://apps.kde.org/kalarm/ https://userbase.kde.org/KAlarm" - -LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="X" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/akonadi-${PVCUT}:5 - >=kde-apps/akonadi-contacts-${PVCUT}:5 - >=kde-apps/akonadi-mime-${PVCUT}:5 - >=kde-apps/kalarmcal-${PVCUT}:5 - >=kde-apps/kcalutils-${PVCUT}:5 - >=kde-apps/kidentitymanagement-${PVCUT}:5 - >=kde-apps/kmailtransport-${PVCUT}:5 - >=kde-apps/kmime-${PVCUT}:5 - >=kde-apps/kontactinterface-${PVCUT}:5 - >=kde-apps/kpimtextedit-${PVCUT}:5 - >=kde-apps/pimcommon-${PVCUT}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kcalendarcore-${KFMIN}: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/kcontacts-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/kholidays-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=media-libs/phonon-4.11.0 - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) -" -RDEPEND="${DEPEND} - >=kde-apps/kdepim-runtime-${PVCUT}:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package X Qt5X11Extras) - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} diff --git a/kde-apps/kalarm/kalarm-21.12.3.ebuild b/kde-apps/kalarm/kalarm-21.12.3.ebuild new file mode 100644 index 000000000000..e3bb67656fee --- /dev/null +++ b/kde-apps/kalarm/kalarm-21.12.3.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +PVCUT=$(ver_cut 1-3) +KFMIN=5.88.0 +QTMIN=5.15.2 +inherit ecm kde.org + +DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop" +HOMEPAGE="https://apps.kde.org/kalarm/ https://userbase.kde.org/KAlarm" + +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="speech X" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-apps/akonadi-${PVCUT}:5 + >=kde-apps/akonadi-contacts-${PVCUT}:5 + >=kde-apps/akonadi-mime-${PVCUT}:5 + >=kde-apps/kalarmcal-${PVCUT}:5 + >=kde-apps/kcalutils-${PVCUT}:5 + >=kde-apps/kidentitymanagement-${PVCUT}:5 + >=kde-apps/kmailtransport-${PVCUT}:5 + >=kde-apps/kmime-${PVCUT}:5 + >=kde-apps/kontactinterface-${PVCUT}:5 + >=kde-apps/kpimtextedit-${PVCUT}:5[speech=] + >=kde-apps/pimcommon-${PVCUT}:5 + >=kde-frameworks/kauth-${KFMIN}:5 + >=kde-frameworks/kcalendarcore-${KFMIN}: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/kcontacts-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/kholidays-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kidletime-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=media-libs/phonon-4.11.0 + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libX11 + ) +" +RDEPEND="${DEPEND} + >=kde-apps/kdepim-runtime-${PVCUT}:5 +" + +PATCHES=( "${FILESDIR}"/${PN}-21.12.3-speech-optional.patch ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package X Qt5X11Extras) + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} diff --git a/kde-apps/kalarm/metadata.xml b/kde-apps/kalarm/metadata.xml index d925f2439758..fa80953797d0 100644 --- a/kde-apps/kalarm/metadata.xml +++ b/kde-apps/kalarm/metadata.xml @@ -8,4 +8,7 @@ https://bugs.kde.org/ + + Enable text-to-speech support + -- cgit v1.2.3