| 1 |
commit: 2df5ad7d373dd302811eff02a0b303858a0dc28b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 26 17:10:34 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 26 17:10:34 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2df5ad7d |
| 7 |
|
| 8 |
kde-apps/kaddressbook: Fix build w/ downstream patched pimcommon |
| 9 |
|
| 10 |
Upstream commit 0b5823a77372924025fb24bf245839393dbe3f70 |
| 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/kaddressbook-22.03.80-unused-dep.patch | 36 ++++++++++++++++++++++ |
| 16 |
kde-apps/kaddressbook/kaddressbook-22.03.80.ebuild | 2 ++ |
| 17 |
.../kaddressbook/kaddressbook-22.04.49.9999.ebuild | 2 ++ |
| 18 |
3 files changed, 40 insertions(+) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 0000000000..1a988e0c2d |
| 23 |
--- /dev/null |
| 24 |
+++ b/kde-apps/kaddressbook/files/kaddressbook-22.03.80-unused-dep.patch |
| 25 |
@@ -0,0 +1,36 @@ |
| 26 |
+From 0b5823a77372924025fb24bf245839393dbe3f70 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Laurent Montel <montel@×××.org> |
| 28 |
+Date: Tue, 15 Mar 2022 06:57:48 +0100 |
| 29 |
+Subject: [PATCH] Use KWindowStateSaver directly |
| 30 |
+ |
| 31 |
+--- |
| 32 |
+ src/mainwidget.cpp | 6 ++++-- |
| 33 |
+ 1 file changed, 4 insertions(+), 2 deletions(-) |
| 34 |
+ |
| 35 |
+diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp |
| 36 |
+index 440f0ff1..1372efa1 100644 |
| 37 |
+--- a/src/mainwidget.cpp |
| 38 |
++++ b/src/mainwidget.cpp |
| 39 |
+@@ -76,7 +76,7 @@ |
| 40 |
+ #include <QTextBrowser> |
| 41 |
+ |
| 42 |
+ #include <Akonadi/ItemModifyJob> |
| 43 |
+-#include <PimCommon/KPimPrintPreviewDialog> |
| 44 |
++#include <KWindowStateSaver> |
| 45 |
+ #include <QActionGroup> |
| 46 |
+ #include <QDBusConnection> |
| 47 |
+ #include <QHBoxLayout> |
| 48 |
+@@ -694,7 +694,9 @@ void MainWidget::printPreview() |
| 49 |
+ printer.setOutputFormat(QPrinter::PdfFormat); |
| 50 |
+ printer.setCollateCopies(true); |
| 51 |
+ |
| 52 |
+- QPointer<PimCommon::KPimPrintPreviewDialog> previewdlg = new PimCommon::KPimPrintPreviewDialog(&printer, this); |
| 53 |
++ QPointer<QPrintPreviewDialog> previewdlg = new QPrintPreviewDialog(&printer, this); |
| 54 |
++ new KWindowStateSaver(previewdlg.data(), "KAddressBookPrintPreviewDialog"); |
| 55 |
++ |
| 56 |
+ KABPrinting::PrintingWizard wizard(&printer, mItemView->selectionModel(), this); |
| 57 |
+ wizard.setDefaultAddressBook(currentAddressBook()); |
| 58 |
+ connect(previewdlg.data(), &QPrintPreviewDialog::paintRequested, this, [&wizard]() { |
| 59 |
+-- |
| 60 |
+GitLab |
| 61 |
+ |
| 62 |
|
| 63 |
diff --git a/kde-apps/kaddressbook/kaddressbook-22.03.80.ebuild b/kde-apps/kaddressbook/kaddressbook-22.03.80.ebuild |
| 64 |
index 05e42f1016..19c5d8d092 100644 |
| 65 |
--- a/kde-apps/kaddressbook/kaddressbook-22.03.80.ebuild |
| 66 |
+++ b/kde-apps/kaddressbook/kaddressbook-22.03.80.ebuild |
| 67 |
@@ -56,6 +56,8 @@ RDEPEND="${DEPEND} |
| 68 |
>=kde-apps/kdepim-runtime-${PVCUT}:5 |
| 69 |
" |
| 70 |
|
| 71 |
+PATCHES=( "${FILESDIR}/${PN}-22.03.80-unused-dep.patch" ) |
| 72 |
+ |
| 73 |
src_configure() { |
| 74 |
local mycmakeargs=( |
| 75 |
$(cmake_use_find_package telemetry KUserFeedback) |
| 76 |
|
| 77 |
diff --git a/kde-apps/kaddressbook/kaddressbook-22.04.49.9999.ebuild b/kde-apps/kaddressbook/kaddressbook-22.04.49.9999.ebuild |
| 78 |
index 3112a297e2..86938e87c6 100644 |
| 79 |
--- a/kde-apps/kaddressbook/kaddressbook-22.04.49.9999.ebuild |
| 80 |
+++ b/kde-apps/kaddressbook/kaddressbook-22.04.49.9999.ebuild |
| 81 |
@@ -56,6 +56,8 @@ RDEPEND="${DEPEND} |
| 82 |
>=kde-apps/kdepim-runtime-${PVCUT}:5 |
| 83 |
" |
| 84 |
|
| 85 |
+PATCHES=( "${FILESDIR}/${PN}-22.03.80-unused-dep.patch" ) |
| 86 |
+ |
| 87 |
src_configure() { |
| 88 |
local mycmakeargs=( |
| 89 |
$(cmake_use_find_package telemetry KUserFeedback) |
Archives