| 1 |
commit: f1a30521878cbecbb0a5ea89b692892edfd78ed6 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 26 17:04:42 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 26 17:04:42 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f1a30521 |
| 7 |
|
| 8 |
kde-apps/libksieve: Fix build w/ downstream patched pimcommon |
| 9 |
|
| 10 |
Upstream commit 5e89420482da4f24ca4b0555562a9160cf259de4 |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/libksieve-22.03.80-unused-dep.patch | 39 ++++++++++++++++++++++ |
| 16 |
kde-apps/libksieve/libksieve-22.03.80.ebuild | 2 ++ |
| 17 |
kde-apps/libksieve/libksieve-22.04.49.9999.ebuild | 2 ++ |
| 18 |
3 files changed, 43 insertions(+) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 0000000000..2d0a36210e |
| 23 |
--- /dev/null |
| 24 |
+++ b/kde-apps/libksieve/files/libksieve-22.03.80-unused-dep.patch |
| 25 |
@@ -0,0 +1,39 @@ |
| 26 |
+From 5e89420482da4f24ca4b0555562a9160cf259de4 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Laurent Montel <montel@×××.org> |
| 28 |
+Date: Tue, 15 Mar 2022 06:49:17 +0100 |
| 29 |
+Subject: [PATCH] Use KWindowStateSaver directly |
| 30 |
+ |
| 31 |
+--- |
| 32 |
+ src/ksieveui/editor/sieveeditortextmodewidget.cpp | 6 ++++-- |
| 33 |
+ 1 file changed, 4 insertions(+), 2 deletions(-) |
| 34 |
+ |
| 35 |
+diff --git a/src/ksieveui/editor/sieveeditortextmodewidget.cpp b/src/ksieveui/editor/sieveeditortextmodewidget.cpp |
| 36 |
+index 7d7c385d..a9857d54 100644 |
| 37 |
+--- a/src/ksieveui/editor/sieveeditortextmodewidget.cpp |
| 38 |
++++ b/src/ksieveui/editor/sieveeditortextmodewidget.cpp |
| 39 |
+@@ -33,10 +33,11 @@ |
| 40 |
+ #include <KLocalizedString> |
| 41 |
+ #include <KMessageBox> |
| 42 |
+ #include <KSharedConfig> |
| 43 |
++#include <KWindowStateSaver> |
| 44 |
+ |
| 45 |
+-#include <PimCommon/KPimPrintPreviewDialog> |
| 46 |
+ #include <QPointer> |
| 47 |
+ #include <QPrintDialog> |
| 48 |
++#include <QPrintPreviewDialog> |
| 49 |
+ #include <QPrinter> |
| 50 |
+ #include <QPushButton> |
| 51 |
+ #include <QShortcut> |
| 52 |
+@@ -442,7 +443,8 @@ void SieveEditorTextModeWidget::printPreview() |
| 53 |
+ if (w == mEditorWidget) { |
| 54 |
+ bool restoreSpellCheck = mTextEdit->checkSpellingEnabled(); |
| 55 |
+ mTextEdit->setCheckSpellingEnabled(false); |
| 56 |
+- QPointer<PimCommon::KPimPrintPreviewDialog> previewdlg = new PimCommon::KPimPrintPreviewDialog(this); |
| 57 |
++ QPointer<QPrintPreviewDialog> previewdlg = new QPrintPreviewDialog(this); |
| 58 |
++ new KWindowStateSaver(previewdlg.data(), "SieveEditorPrintPreviewDialog"); |
| 59 |
+ connect(previewdlg.data(), &QPrintPreviewDialog::paintRequested, this, [this](QPrinter *printer) { |
| 60 |
+ mTextEdit->print(printer); |
| 61 |
+ }); |
| 62 |
+-- |
| 63 |
+GitLab |
| 64 |
+ |
| 65 |
|
| 66 |
diff --git a/kde-apps/libksieve/libksieve-22.03.80.ebuild b/kde-apps/libksieve/libksieve-22.03.80.ebuild |
| 67 |
index 09c6ff6c03..0866f23c29 100644 |
| 68 |
--- a/kde-apps/libksieve/libksieve-22.03.80.ebuild |
| 69 |
+++ b/kde-apps/libksieve/libksieve-22.03.80.ebuild |
| 70 |
@@ -51,6 +51,8 @@ DEPEND="${RDEPEND} |
| 71 |
>=kde-apps/kmailtransport-${PVCUT}:5 |
| 72 |
" |
| 73 |
|
| 74 |
+PATCHES=( "${FILESDIR}/${PN}-22.03.80-unused-dep.patch" ) |
| 75 |
+ |
| 76 |
src_prepare() { |
| 77 |
ecm_src_prepare |
| 78 |
cmake_run_in kioslave cmake_comment_add_subdirectory doc |
| 79 |
|
| 80 |
diff --git a/kde-apps/libksieve/libksieve-22.04.49.9999.ebuild b/kde-apps/libksieve/libksieve-22.04.49.9999.ebuild |
| 81 |
index 8a53ca01f3..666c0fb65b 100644 |
| 82 |
--- a/kde-apps/libksieve/libksieve-22.04.49.9999.ebuild |
| 83 |
+++ b/kde-apps/libksieve/libksieve-22.04.49.9999.ebuild |
| 84 |
@@ -51,6 +51,8 @@ DEPEND="${RDEPEND} |
| 85 |
>=kde-apps/kmailtransport-${PVCUT}:5 |
| 86 |
" |
| 87 |
|
| 88 |
+PATCHES=( "${FILESDIR}/${PN}-22.03.80-unused-dep.patch" ) |
| 89 |
+ |
| 90 |
src_prepare() { |
| 91 |
ecm_src_prepare |
| 92 |
cmake_run_in kioslave cmake_comment_add_subdirectory doc |
Archives