commit: 512c4955cc278d5c7997bf6ec6e9e174d4d37ce9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Mar 26 17:17:32 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Mar 26 17:17:32 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=512c4955
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 <AT> gentoo.org> .../knotes/files/knotes-22.03.80-unused-dep.patch | 49 ++++++++++++++++++++++ kde-apps/knotes/knotes-22.03.80.ebuild | 2 + kde-apps/knotes/knotes-22.04.49.9999.ebuild | 2 + 3 files changed, 53 insertions(+) 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 0000000000..be55b53c7b --- /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 <[email protected]> +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 13f22a66f6..662404df16 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 1f5fadc134..0bf9621d1d 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)
