commit: 2df5ad7d373dd302811eff02a0b303858a0dc28b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 17:10:34 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 17:10:34 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2df5ad7d
kde-apps/kaddressbook: Fix build w/ downstream patched pimcommon
Upstream commit 0b5823a77372924025fb24bf245839393dbe3f70
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kaddressbook-22.03.80-unused-dep.patch | 36 ++++++++++++++++++++++
kde-apps/kaddressbook/kaddressbook-22.03.80.ebuild | 2 ++
.../kaddressbook/kaddressbook-22.04.49.9999.ebuild | 2 ++
3 files changed, 40 insertions(+)
diff --git a/kde-apps/kaddressbook/files/kaddressbook-22.03.80-unused-dep.patch
b/kde-apps/kaddressbook/files/kaddressbook-22.03.80-unused-dep.patch
new file mode 100644
index 0000000000..1a988e0c2d
--- /dev/null
+++ b/kde-apps/kaddressbook/files/kaddressbook-22.03.80-unused-dep.patch
@@ -0,0 +1,36 @@
+From 0b5823a77372924025fb24bf245839393dbe3f70 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <mon...@kde.org>
+Date: Tue, 15 Mar 2022 06:57:48 +0100
+Subject: [PATCH] Use KWindowStateSaver directly
+
+---
+ src/mainwidget.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp
+index 440f0ff1..1372efa1 100644
+--- a/src/mainwidget.cpp
++++ b/src/mainwidget.cpp
+@@ -76,7 +76,7 @@
+ #include <QTextBrowser>
+
+ #include <Akonadi/ItemModifyJob>
+-#include <PimCommon/KPimPrintPreviewDialog>
++#include <KWindowStateSaver>
+ #include <QActionGroup>
+ #include <QDBusConnection>
+ #include <QHBoxLayout>
+@@ -694,7 +694,9 @@ void MainWidget::printPreview()
+ printer.setOutputFormat(QPrinter::PdfFormat);
+ printer.setCollateCopies(true);
+
+- QPointer<PimCommon::KPimPrintPreviewDialog> previewdlg = new
PimCommon::KPimPrintPreviewDialog(&printer, this);
++ QPointer<QPrintPreviewDialog> previewdlg = new
QPrintPreviewDialog(&printer, this);
++ new KWindowStateSaver(previewdlg.data(),
"KAddressBookPrintPreviewDialog");
++
+ KABPrinting::PrintingWizard wizard(&printer, mItemView->selectionModel(),
this);
+ wizard.setDefaultAddressBook(currentAddressBook());
+ connect(previewdlg.data(), &QPrintPreviewDialog::paintRequested, this,
[&wizard]() {
+--
+GitLab
+
diff --git a/kde-apps/kaddressbook/kaddressbook-22.03.80.ebuild
b/kde-apps/kaddressbook/kaddressbook-22.03.80.ebuild
index 05e42f1016..19c5d8d092 100644
--- a/kde-apps/kaddressbook/kaddressbook-22.03.80.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-22.03.80.ebuild
@@ -56,6 +56,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 telemetry KUserFeedback)
diff --git a/kde-apps/kaddressbook/kaddressbook-22.04.49.9999.ebuild
b/kde-apps/kaddressbook/kaddressbook-22.04.49.9999.ebuild
index 3112a297e2..86938e87c6 100644
--- a/kde-apps/kaddressbook/kaddressbook-22.04.49.9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-22.04.49.9999.ebuild
@@ -56,6 +56,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 telemetry KUserFeedback)
