[gentoo-commits] proj/kde:master commit in: kde-apps/libksieve/files/, kde-apps/libksieve/

[gentoo-commits] proj/kde:master commit in: kde-apps/libksieve/files/, kde-apps/libksieve/

[Andreas Sturmlechner]

commit:     f1a30521878cbecbb0a5ea89b692892edfd78ed6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 17:04:42 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 17:04:42 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f1a30521

kde-apps/libksieve: Fix build w/ downstream patched pimcommon

Upstream commit 5e89420482da4f24ca4b0555562a9160cf259de4

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/libksieve-22.03.80-unused-dep.patch      | 39 ++++++++++++++++++++++
 kde-apps/libksieve/libksieve-22.03.80.ebuild       |  2 ++
 kde-apps/libksieve/libksieve-22.04.49.9999.ebuild  |  2 ++
 3 files changed, 43 insertions(+)

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
new file mode 100644
index 0000000000..2d0a36210e
--- /dev/null
+++ b/kde-apps/libksieve/files/libksieve-22.03.80-unused-dep.patch
@@ -0,0 +1,39 @@
+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-22.03.80.ebuild b/kde-apps/libksieve/libksieve-22.03.80.ebuild
index 09c6ff6c03..0866f23c29 100644
--- a/kde-apps/libksieve/libksieve-22.03.80.ebuild
+++ b/kde-apps/libksieve/libksieve-22.03.80.ebuild
@@ -51,6 +51,8 @@ DEPEND="${RDEPEND}
 	>=kde-apps/kmailtransport-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-22.03.80-unused-dep.patch" )
+
 src_prepare() {
 	ecm_src_prepare
 	cmake_run_in kioslave cmake_comment_add_subdirectory doc

diff --git a/kde-apps/libksieve/libksieve-22.04.49.9999.ebuild b/kde-apps/libksieve/libksieve-22.04.49.9999.ebuild
index 8a53ca01f3..666c0fb65b 100644
--- a/kde-apps/libksieve/libksieve-22.04.49.9999.ebuild
+++ b/kde-apps/libksieve/libksieve-22.04.49.9999.ebuild
@@ -51,6 +51,8 @@ DEPEND="${RDEPEND}
 	>=kde-apps/kmailtransport-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-22.03.80-unused-dep.patch" )
+
 src_prepare() {
 	ecm_src_prepare
 	cmake_run_in kioslave cmake_comment_add_subdirectory doc