diff options
Diffstat (limited to 'kde-apps/libksieve')
| -rw-r--r-- | kde-apps/libksieve/Manifest | 4 | ||||
| -rw-r--r-- | kde-apps/libksieve/files/libksieve-21.12.3-speech-optional.patch | 180 | ||||
| -rw-r--r-- | kde-apps/libksieve/files/libksieve-22.03.80-unused-dep.patch | 39 | ||||
| -rw-r--r-- | kde-apps/libksieve/libksieve-21.12.3.ebuild | 59 | ||||
| -rw-r--r-- | kde-apps/libksieve/libksieve-23.08.5.ebuild (renamed from kde-apps/libksieve/libksieve-22.04.2.ebuild) | 21 | ||||
| -rw-r--r-- | kde-apps/libksieve/libksieve-24.02.2.ebuild | 55 | ||||
| -rw-r--r-- | kde-apps/libksieve/metadata.xml | 3 |
7 files changed, 68 insertions, 293 deletions
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest index 428038434145..4374b65974da 100644 --- a/kde-apps/libksieve/Manifest +++ b/kde-apps/libksieve/Manifest @@ -1,2 +1,2 @@ -DIST libksieve-21.12.3.tar.xz 572276 BLAKE2B 190a32d2e19abb6a28ef1419c73fa93bc73989086374e83b95427ab4ded93fa058c644c290052e273a9ac45895c842efee87eb3d626a8f769e0e969b547976d9 SHA512 ca4b970a3ec510a904187904c5070990728c7fcd3dc42e2052caf80cc828c0e00d31b00828457dbc8dc7a2f21927542f60552b1d67cfedc85b52a57f0c12d3a4 -DIST libksieve-22.04.2.tar.xz 576908 BLAKE2B 467d3d90289302ad70bba35f9c7d672246595316d801565b134937ba768baab78ebbf01f56fb9299546eb56b82733149c46b1f8222ce6168adb95cff7430fb44 SHA512 811a930ade6d25f26e7a0e0a5cff42605a560ac2c331fed05d757f7518fe2dd02096e5f251cf6f3673ce87209feeeb1c2216b408af1df14632ca7977e23236b5 +DIST libksieve-23.08.5.tar.xz 581988 BLAKE2B 23aca922e538c3f31793e5e50ec00111db1cc0de5a1249618e27112791c229018d6e5b1a9876947a6efb4ed16e1bc91fbd397a6eb46d6b5a98716a604ae4e12b SHA512 791f4d9e5f24c8b3ba785db2db73d800275e82bf5ce68fdbc0ae0b8411a24417de71be0d38f21b1225e124efcc4fba4fa585602fbfdefcc5af106a8aa1d848d6 +DIST libksieve-24.02.2.tar.xz 584908 BLAKE2B d04b2f7ff9539f102d172d54a93dce614a25e395fc687c7ae916f19d86024981dfe3e514b3609694524ae4789ce4bf8b55380a6c4b678d0567be5e0863857b33 SHA512 e85a47e8f6673ff41d35a26000e9fa36efac478cd7fb0bae8b03d22692f742d50840606e5913e5717df19b9879a39906baf1ad56650f21b954e32b973371d9b7 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/files/libksieve-22.03.80-unused-dep.patch b/kde-apps/libksieve/files/libksieve-22.03.80-unused-dep.patch deleted file mode 100644 index 2d0a36210ee6..000000000000 --- a/kde-apps/libksieve/files/libksieve-22.03.80-unused-dep.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5e89420482da4f24ca4b0555562a9160cf259de4 Mon Sep 17 00:00:00 2001 -From: Laurent Montel <montel@kde.org> -Date: Tue, 15 Mar 2022 06:49:17 +0100 -Subject: [PATCH] Use KWindowStateSaver directly - ---- - src/ksieveui/editor/sieveeditortextmodewidget.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/ksieveui/editor/sieveeditortextmodewidget.cpp b/src/ksieveui/editor/sieveeditortextmodewidget.cpp -index 7d7c385d..a9857d54 100644 ---- a/src/ksieveui/editor/sieveeditortextmodewidget.cpp -+++ b/src/ksieveui/editor/sieveeditortextmodewidget.cpp -@@ -33,10 +33,11 @@ - #include <KLocalizedString> - #include <KMessageBox> - #include <KSharedConfig> -+#include <KWindowStateSaver> - --#include <PimCommon/KPimPrintPreviewDialog> - #include <QPointer> - #include <QPrintDialog> -+#include <QPrintPreviewDialog> - #include <QPrinter> - #include <QPushButton> - #include <QShortcut> -@@ -442,7 +443,8 @@ void SieveEditorTextModeWidget::printPreview() - if (w == mEditorWidget) { - bool restoreSpellCheck = mTextEdit->checkSpellingEnabled(); - mTextEdit->setCheckSpellingEnabled(false); -- QPointer<PimCommon::KPimPrintPreviewDialog> previewdlg = new PimCommon::KPimPrintPreviewDialog(this); -+ QPointer<QPrintPreviewDialog> previewdlg = new QPrintPreviewDialog(this); -+ new KWindowStateSaver(previewdlg.data(), "SieveEditorPrintPreviewDialog"); - connect(previewdlg.data(), &QPrintPreviewDialog::paintRequested, this, [this](QPrinter *printer) { - mTextEdit->print(printer); - }); --- -GitLab - 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 -} diff --git a/kde-apps/libksieve/libksieve-22.04.2.ebuild b/kde-apps/libksieve/libksieve-23.08.5.ebuild index 42358ae64462..2ce536dbeb54 100644 --- a/kde-apps/libksieve/libksieve-22.04.2.ebuild +++ b/kde-apps/libksieve/libksieve-23.08.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,22 +7,22 @@ ECM_HANDBOOK="forceoptional" ECM_QTHELP="true" ECM_TEST="true" PVCUT=$(ver_cut 1-3) -KFMIN=5.92.0 -QTMIN=5.15.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org DESCRIPTION="Common PIM libraries" LICENSE="GPL-2+ LGPL-2.1+" SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ~x86" IUSE="speech" RESTRICT="test" RDEPEND=" dev-libs/cyrus-sasl + dev-libs/ktextaddons:5[speech?] >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 @@ -51,9 +51,10 @@ DEPEND="${RDEPEND} >=kde-apps/kmailtransport-${PVCUT}:5 " -PATCHES=( "${FILESDIR}/${PN}-22.03.80-unused-dep.patch" ) +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package speech KF5TextEditTextToSpeech) + ) -src_prepare() { - ecm_src_prepare - cmake_run_in kioslave cmake_comment_add_subdirectory doc + ecm_src_configure } diff --git a/kde-apps/libksieve/libksieve-24.02.2.ebuild b/kde-apps/libksieve/libksieve-24.02.2.ebuild new file mode 100644 index 000000000000..118a4044f472 --- /dev/null +++ b/kde-apps/libksieve/libksieve-24.02.2.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 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=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="Common PIM libraries" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="speech" + +RESTRICT="test" + +RDEPEND=" + dev-libs/cyrus-sasl + >=dev-libs/ktextaddons-1.5.3:6[speech?] + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] + >=dev-qt/qtwebengine-${QTMIN}:6[widgets] + >=kde-apps/kidentitymanagement-${PVCUT}:6 + >=kde-apps/kmime-${PVCUT}:6 + >=kde-apps/libkdepim-${PVCUT}:6 + >=kde-apps/pimcommon-${PVCUT}:6 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/sonnet-${KFMIN}:6 + >=kde-frameworks/syntax-highlighting-${KFMIN}:6 +" +DEPEND="${RDEPEND} + >=kde-apps/kimap-${PVCUT}:6 + >=kde-apps/kmailtransport-${PVCUT}:6 +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package speech KF6TextEditTextToSpeech) + ) + + ecm_src_configure +} diff --git a/kde-apps/libksieve/metadata.xml b/kde-apps/libksieve/metadata.xml index fa80953797d0..d925f2439758 100644 --- a/kde-apps/libksieve/metadata.xml +++ b/kde-apps/libksieve/metadata.xml @@ -8,7 +8,4 @@ <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> - <use> - <flag name="speech">Enable text-to-speech support</flag> - </use> </pkgmetadata> |