summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-03-26 18:17:32 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2022-03-26 18:17:32 +0100
commit512c4955cc278d5c7997bf6ec6e9e174d4d37ce9 (patch)
tree151b1061b931959a6de306f9f03dfe3e1ee029e8
parent2df5ad7d373dd302811eff02a0b303858a0dc28b (diff)
downloadkde-512c4955cc278d5c7997bf6ec6e9e174d4d37ce9.tar.gz
kde-512c4955cc278d5c7997bf6ec6e9e174d4d37ce9.tar.bz2
kde-512c4955cc278d5c7997bf6ec6e9e174d4d37ce9.zip
kde-apps/knotes: Fix build w/ downstream patched pimcommon
Upstream commit c0cdfe376ff8e785c1af34122a8ca82a22fa9a9c Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-apps/knotes/files/knotes-22.03.80-unused-dep.patch49
-rw-r--r--kde-apps/knotes/knotes-22.03.80.ebuild2
-rw-r--r--kde-apps/knotes/knotes-22.04.49.9999.ebuild2
3 files changed, 53 insertions, 0 deletions
diff --git a/kde-apps/knotes/files/knotes-22.03.80-unused-dep.patch b/kde-apps/knotes/files/knotes-22.03.80-unused-dep.patch
new file mode 100644
index 00000000000..be55b53c7bf
--- /dev/null
+++ b/kde-apps/knotes/files/knotes-22.03.80-unused-dep.patch
@@ -0,0 +1,49 @@
+From c0cdfe376ff8e785c1af34122a8ca82a22fa9a9c Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 15 Mar 2022 06:54:35 +0100
+Subject: [PATCH] Use KWindowStateSaver
+
+---
+ src/print/knoteprinter.cpp | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/print/knoteprinter.cpp b/src/print/knoteprinter.cpp
+index 0b2a408d..be0b0b15 100644
+--- a/src/print/knoteprinter.cpp
++++ b/src/print/knoteprinter.cpp
+@@ -8,7 +8,6 @@
+ #include "knotegrantleeprint.h"
+ #include "print/knoteprintobject.h"
+
+-#include <PimCommon/KPimPrintPreviewDialog>
+ #include <QAbstractTextDocumentLayout>
+ #include <QPainter>
+ #include <QPointer>
+@@ -17,6 +16,8 @@
+ #include <QTextDocument>
+
+ #include <KMessageBox>
++#include <KWindowStateSaver>
++#include <QPrintPreviewDialog>
+
+ #include "knotes_debug.h"
+ #include <KLocalizedString>
+@@ -44,10 +45,11 @@ void KNotePrinter::doPrintPreview(const QString &htmlText)
+ QPrinter printer(QPrinter::HighResolution);
+ printer.setOutputFormat(QPrinter::PdfFormat);
+ printer.setCollateCopies(true);
+- PimCommon::KPimPrintPreviewDialog previewdlg(&printer, nullptr);
+-
+- connect(&previewdlg, &QPrintPreviewDialog::paintRequested, this, &KNotePrinter::slotPrinterPage);
+- previewdlg.exec();
++ QPointer<QPrintPreviewDialog> previewdlg = new QPrintPreviewDialog(&printer);
++ new KWindowStateSaver(previewdlg.data(), "KNotePrintPreviewDialog");
++ connect(previewdlg.data(), &QPrintPreviewDialog::paintRequested, this, &KNotePrinter::slotPrinterPage);
++ previewdlg->exec();
++ delete previewdlg;
+ }
+
+ void KNotePrinter::slotPrinterPage(QPrinter *printer)
+--
+GitLab
+
diff --git a/kde-apps/knotes/knotes-22.03.80.ebuild b/kde-apps/knotes/knotes-22.03.80.ebuild
index 13f22a66f65..662404df167 100644
--- a/kde-apps/knotes/knotes-22.03.80.ebuild
+++ b/kde-apps/knotes/knotes-22.03.80.ebuild
@@ -66,6 +66,8 @@ RDEPEND="${DEPEND}
>=kde-apps/kdepim-runtime-${PVCUT}:5
"
+PATCHES=( "${FILESDIR}/${PN}-22.03.80-unused-dep.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package X Qt5X11Extras)
diff --git a/kde-apps/knotes/knotes-22.04.49.9999.ebuild b/kde-apps/knotes/knotes-22.04.49.9999.ebuild
index 1f5fadc1342..0bf9621d1da 100644
--- a/kde-apps/knotes/knotes-22.04.49.9999.ebuild
+++ b/kde-apps/knotes/knotes-22.04.49.9999.ebuild
@@ -66,6 +66,8 @@ RDEPEND="${DEPEND}
>=kde-apps/kdepim-runtime-${PVCUT}:5
"
+PATCHES=( "${FILESDIR}/${PN}-22.03.80-unused-dep.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package X Qt5X11Extras)