diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-07-20 10:31:58 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-07-25 11:21:46 +0200 |
commit | 5db9715e8cb368e626c721187e1af40a9ae93d83 (patch) | |
tree | 7580bbda7842dd4fd7405dab51d7cc65af115f94 /kde-apps/libksieve | |
parent | kde-apps/libkleo: drop 21.12.3 (diff) | |
download | gentoo-5db9715e8cb368e626c721187e1af40a9ae93d83.tar.gz gentoo-5db9715e8cb368e626c721187e1af40a9ae93d83.tar.bz2 gentoo-5db9715e8cb368e626c721187e1af40a9ae93d83.zip |
kde-apps/libksieve: drop 21.12.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/libksieve')
-rw-r--r-- | kde-apps/libksieve/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/libksieve/files/libksieve-21.12.3-speech-optional.patch | 180 | ||||
-rw-r--r-- | kde-apps/libksieve/libksieve-21.12.3.ebuild | 59 |
3 files changed, 0 insertions, 240 deletions
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest index 4cb5dda55982..1150a26f4c14 100644 --- a/kde-apps/libksieve/Manifest +++ b/kde-apps/libksieve/Manifest @@ -1,2 +1 @@ -DIST libksieve-21.12.3.tar.xz 572276 BLAKE2B 190a32d2e19abb6a28ef1419c73fa93bc73989086374e83b95427ab4ded93fa058c644c290052e273a9ac45895c842efee87eb3d626a8f769e0e969b547976d9 SHA512 ca4b970a3ec510a904187904c5070990728c7fcd3dc42e2052caf80cc828c0e00d31b00828457dbc8dc7a2f21927542f60552b1d67cfedc85b52a57f0c12d3a4 DIST libksieve-22.04.3.tar.xz 576588 BLAKE2B 8756c6c7cc3831a17a22c8c62091df1fbca31257178b1ebd545502e1f54eff291c60f614e1712ff0e83f3d97ce315215eda00a2892c18ba91abdd2ece44e14b3 SHA512 21f27b6579142c19e83aafe4a565e0b3d91f30961384c40509077c8468daae0dc5f1120fc6c81a551e5464a317c362890f6414e4a11818eac9c34ac717c797c9 diff --git a/kde-apps/libksieve/files/libksieve-21.12.3-speech-optional.patch b/kde-apps/libksieve/files/libksieve-21.12.3-speech-optional.patch deleted file mode 100644 index b77300483aa5..000000000000 --- a/kde-apps/libksieve/files/libksieve-21.12.3-speech-optional.patch +++ /dev/null @@ -1,180 +0,0 @@ -From dd296ce1c679f73a52b4d501383346f51acccce8 Mon Sep 17 00:00:00 2001 -From: Laurent Montel <montel@kde.org> -Date: Sun, 23 Jan 2022 10:48:47 +0100 -Subject: [PATCH] Fix compile without texttospeech - -(cherry picked from commit 4ff666c61d4c0dde3e96ad7d45c0a81cb58324a0) - -Merged with (and stripped of Qt6 trivia): - -Text to speak is not supported yet in qt6 -(cherry picked from commit 72be23f5c355864a78174f402596d959a5ad4081) - -Fix some qt6 build -(cherry picked from commit b7acbb937cf92d41c955199c31758c5770b08f0e) - -USe upper cas includes -(cherry picked from commit 66a6cd63083a15bb570100c62053c3ac3e292642) ---- - src/ksieveui/editor/sieveeditortextmodewidget.cpp | 7 ++++++- - src/ksieveui/editor/sieveeditortextmodewidget.h | 1 + - .../sievescriptdebuggerfrontendwidgettest.cpp | 8 ++++++-- - .../sievescriptdebuggerfrontendwidget.cpp | 10 +++++++--- - src/ksieveui/templates/sievetemplateeditdialog.cpp | 11 +++++++---- - 5 files changed, 27 insertions(+), 10 deletions(-) - -diff --git a/src/ksieveui/editor/sieveeditortextmodewidget.cpp b/src/ksieveui/editor/sieveeditortextmodewidget.cpp -index d5c7c57a..0c10f9fa 100644 ---- a/src/ksieveui/editor/sieveeditortextmodewidget.cpp -+++ b/src/ksieveui/editor/sieveeditortextmodewidget.cpp -@@ -21,7 +21,9 @@ - #include <KPIMTextEdit/PlainTextEditorWidget> - #include <KPIMTextEdit/SlideContainer> - #include <KPIMTextEdit/TextGotoLineWidget> -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - #include <KPIMTextEdit/TextToSpeechWidget> -+#endif - - #include <ksieve/error.h> - #include <ksieve/parser.h> -@@ -73,9 +75,10 @@ SieveEditorTextModeWidget::SieveEditorTextModeWidget(QWidget *parent) - mTabWidget = new SieveEditorTabWidget; - connect(mTabWidget, &SieveEditorTabWidget::currentChanged, this, &SieveEditorTextModeWidget::sieveEditorTabCurrentChanged); - connect(mTabWidget, &SieveEditorTabWidget::copyAvailable, this, &SieveEditorTextModeWidget::copyAvailable); -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - mTextToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this); - editorWidgetLayout->addWidget(mTextToSpeechWidget); -- -+#endif - mTextEdit = new SieveTextEdit; - editorWidgetLayout->addWidget(mTextEdit); - connect(mTextEdit, &SieveTextEdit::textChanged, this, &SieveEditorTextModeWidget::valueChanged); -@@ -83,7 +86,9 @@ SieveEditorTextModeWidget::SieveEditorTextModeWidget(QWidget *parent) - mTabWidget->tabBar()->hide(); - textEditLayout->addWidget(mTabWidget); - connect(mTextEdit, &SieveTextEdit::openHelp, mTabWidget, &SieveEditorTabWidget::slotAddHelpPage); -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - connect(mTextEdit, &SieveTextEdit::say, mTextToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say); -+#endif - connect(mTextEdit, &SieveTextEdit::editRule, this, &SieveEditorTextModeWidget::slotEditRule); - connect(mTextEdit, &SieveTextEdit::insertRule, this, &SieveEditorTextModeWidget::slotInsertRule); - -diff --git a/src/ksieveui/editor/sieveeditortextmodewidget.h b/src/ksieveui/editor/sieveeditortextmodewidget.h -index 934b3d72..2ef5b824 100644 ---- a/src/ksieveui/editor/sieveeditortextmodewidget.h -+++ b/src/ksieveui/editor/sieveeditortextmodewidget.h -@@ -7,6 +7,7 @@ - - #include "ksieveui_export.h" - #include "sieveeditorabstractwidget.h" -+#include <kpimtextedit/kpimtextedit-texttospeech.h> - class QSplitter; - namespace KPIMTextEdit - { -diff --git a/src/ksieveui/sievescriptdebugger/autotests/sievescriptdebuggerfrontendwidgettest.cpp b/src/ksieveui/sievescriptdebugger/autotests/sievescriptdebuggerfrontendwidgettest.cpp -index ea66438b..28b2ba08 100644 ---- a/src/ksieveui/sievescriptdebugger/autotests/sievescriptdebuggerfrontendwidgettest.cpp -+++ b/src/ksieveui/sievescriptdebugger/autotests/sievescriptdebuggerfrontendwidgettest.cpp -@@ -6,7 +6,10 @@ - - #include "sievescriptdebuggerfrontendwidgettest.h" - #include "../sievescriptdebuggerfrontendwidget.h" --#include <KPIMTextEdit/kpimtextedit/texttospeechwidget.h> -+#include <kpimtextedit/kpimtextedit-texttospeech.h> -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH -+#include <KPIMTextEdit/TextToSpeechWidget> -+#endif - #include <KUrlRequester> - #include <QLabel> - #include <QLineEdit> -@@ -48,9 +51,10 @@ void SieveScriptDebuggerFrontEndWidgetTest::shouldHaveDefaultValue() - QVERIFY(extension); - QVERIFY(extension->text().isEmpty()); - QVERIFY(extension->isClearButtonEnabled()); -- -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - auto textToSpeechWidget = w.findChild<KPIMTextEdit::TextToSpeechWidget *>(QStringLiteral("texttospeechwidget")); - QVERIFY(textToSpeechWidget); -+#endif - } - - void SieveScriptDebuggerFrontEndWidgetTest::shouldChangeButtonEnabledState() -diff --git a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp -index 4543caef..5ff016e4 100644 ---- a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp -+++ b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp -@@ -14,7 +14,10 @@ - #include <KLineEdit> - #include <KLocalizedString> - #include <KPIMTextEdit/PlainTextEditorWidget> -+#include <kpimtextedit/kpimtextedit-texttospeech.h> -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - #include <KPIMTextEdit/TextToSpeechWidget> -+#endif - #include <KUrlRequester> - #include <Libkdepim/LineEditCatchReturnKey> - #include <QDate> -@@ -71,18 +74,19 @@ SieveScriptDebuggerFrontEndWidget::SieveScriptDebuggerFrontEndWidget(QWidget *pa - auto vboxSieveEditorLayout = new QVBoxLayout; - sieveEditorWidget->setLayout(vboxSieveEditorLayout); - vboxSieveEditorLayout->setContentsMargins({}); -- -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - auto textToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this); - textToSpeechWidget->setObjectName(QStringLiteral("texttospeechwidget")); - vboxSieveEditorLayout->addWidget(textToSpeechWidget); -- -+#endif - auto textEdit = new KSieveUi::SieveScriptDebuggerTextEdit(this); - connect(textEdit, &KSieveUi::SieveScriptDebuggerTextEdit::textChanged, this, &SieveScriptDebuggerFrontEndWidget::slotScriptTextChanged); - mSieveTextEditWidget = new KSieveUi::SieveTextEditWidget(textEdit, this); - mSieveTextEditWidget->setObjectName(QStringLiteral("sievetexteditwidget")); - vboxSieveEditorLayout->addWidget(mSieveTextEditWidget); -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - connect(mSieveTextEditWidget->textEdit(), &SieveTextEdit::say, textToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say); -- -+#endif - mSplitter->addWidget(sieveEditorWidget); - mSplitter->setChildrenCollapsible(false); - -diff --git a/src/ksieveui/templates/sievetemplateeditdialog.cpp b/src/ksieveui/templates/sievetemplateeditdialog.cpp -index 8a7127c4..5f039f0d 100644 ---- a/src/ksieveui/templates/sievetemplateeditdialog.cpp -+++ b/src/ksieveui/templates/sievetemplateeditdialog.cpp -@@ -24,9 +24,10 @@ - #include <QVBoxLayout> - - #include <editor/sievetexteditwidget.h> -- -+#include <kpimtextedit/kpimtextedit-texttospeech.h> -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - #include <KPIMTextEdit/TextToSpeechWidget> -- -+#endif - using namespace KSieveUi; - - SieveTemplateEditDialog::SieveTemplateEditDialog(QWidget *parent, bool defaultTemplate) -@@ -62,16 +63,18 @@ SieveTemplateEditDialog::SieveTemplateEditDialog(QWidget *parent, bool defaultTe - hbox->addWidget(mTemplateNameEdit); - - vbox->addLayout(hbox); -- -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - auto textToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this); - vbox->addWidget(textToSpeechWidget); -+#endif - - mTextEditWidget = new KSieveUi::SieveTextEditWidget; - mTextEditWidget->textEdit()->setShowHelpMenu(false); - mTextEditWidget->setReadOnly(defaultTemplate); - vbox->addWidget(mTextEditWidget); -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - connect(mTextEditWidget->textEdit(), &SieveTextEdit::say, textToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say); -- -+#endif - auto shortcut = new QShortcut(this); - shortcut->setKey(Qt::Key_F | Qt::CTRL); - connect(shortcut, &QShortcut::activated, mTextEditWidget, &SieveTextEditWidget::slotFind); --- -2.35.1 - diff --git a/kde-apps/libksieve/libksieve-21.12.3.ebuild b/kde-apps/libksieve/libksieve-21.12.3.ebuild deleted file mode 100644 index 0ea9f904ebea..000000000000 --- a/kde-apps/libksieve/libksieve-21.12.3.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_QTHELP="true" -ECM_TEST="true" -PVCUT=$(ver_cut 1-3) -KFMIN=5.88.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Common PIM libraries" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="speech" - -RESTRICT="test" - -RDEPEND=" - dev-libs/cyrus-sasl - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/kidentitymanagement-${PVCUT}:5 - >=kde-apps/kmime-${PVCUT}:5 - >=kde-apps/kpimtextedit-${PVCUT}:5[speech=] - >=kde-apps/libkdepim-${PVCUT}:5 - >=kde-apps/pimcommon-${PVCUT}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - >=kde-frameworks/syntax-highlighting-${KFMIN}:5 -" -DEPEND="${RDEPEND} - >=kde-apps/kimap-${PVCUT}:5 - >=kde-apps/kmailtransport-${PVCUT}:5 -" - -PATCHES=( "${FILESDIR}/${PN}-21.12.3-speech-optional.patch" ) - -src_prepare() { - ecm_src_prepare - cmake_run_in kioslave cmake_comment_add_subdirectory doc -} |