[gentoo-commits] repo/gentoo:master commit in: kde-apps/kaddressbook/, kde-apps/kaddressbook/files/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kaddressbook/, kde-apps/kaddressbook/files/

[Andreas Sturmlechner]

commit:     7cc43df477195c18097b8b3d5899c20a40b2ff0f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 29 19:59:31 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 29 20:04:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cc43df4

kde-apps/kaddressbook: Fix build with Qt 5.15.2

Upstream commit 8aee8d40ae2a1c920d3520163d550d3b49720226

Reported-by: <peter <AT> prh.myzen.co.uk>
Closes: https://bugs.gentoo.org/757582
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kaddressbook-20.08.3-qt-5.15.2.patch     | 69 ++++++++++++++++++++++
 kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild  |  2 +
 2 files changed, 71 insertions(+)

diff --git a/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch b/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch
new file mode 100644
index 00000000000..888febed0fa
--- /dev/null
+++ b/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch
@@ -0,0 +1,69 @@
+From 8aee8d40ae2a1c920d3520163d550d3b49720226 Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Sun, 25 Oct 2020 18:22:58 +0100
+Subject: [PATCH] Compile with recent Qt 5.15
+
+More QPrinter methods got deprecated there. DevicePixel no longer exists
+as a unit, visually Point looks pretty much the same though.
+---
+ src/printing/compact/compactstyle.cpp        | 2 +-
+ src/printing/grantlee/grantleeprintstyle.cpp | 2 +-
+ src/printing/mike/mikesstyle.cpp             | 2 +-
+ src/printing/ringbinder/ringbinderstyle.cpp  | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/printing/compact/compactstyle.cpp b/src/printing/compact/compactstyle.cpp
+index d950a963..71e74c0f 100644
+--- a/src/printing/compact/compactstyle.cpp
++++ b/src/printing/compact/compactstyle.cpp
+@@ -168,7 +168,7 @@ void CompactStyle::print(const KContacts::Addressee::List &contacts, PrintProgre
+ 
+     // print
+     QPrinter *printer = wizard()->printer();
+-    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
++    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
+ 
+     progress->addMessage(i18n("Setting up document"));
+ 
+diff --git a/src/printing/grantlee/grantleeprintstyle.cpp b/src/printing/grantlee/grantleeprintstyle.cpp
+index d7afe8ef..49b5e494 100644
+--- a/src/printing/grantlee/grantleeprintstyle.cpp
++++ b/src/printing/grantlee/grantleeprintstyle.cpp
+@@ -38,7 +38,7 @@ GrantleePrintStyle::~GrantleePrintStyle()
+ void GrantleePrintStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
+ {
+     QPrinter *printer = wizard()->printer();
+-    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
++    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
+ 
+     progress->addMessage(i18n("Setting up document"));
+ 
+diff --git a/src/printing/mike/mikesstyle.cpp b/src/printing/mike/mikesstyle.cpp
+index 9f698c53..81a4bd6f 100644
+--- a/src/printing/mike/mikesstyle.cpp
++++ b/src/printing/mike/mikesstyle.cpp
+@@ -107,7 +107,7 @@ MikesStyle::~MikesStyle()
+ void MikesStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
+ {
+     QPrinter *printer = wizard()->printer();
+-    printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
++    printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
+ 
+     progress->addMessage(i18n("Setting up document"));
+ 
+diff --git a/src/printing/ringbinder/ringbinderstyle.cpp b/src/printing/ringbinder/ringbinderstyle.cpp
+index 60a39c86..5f600d6a 100644
+--- a/src/printing/ringbinder/ringbinderstyle.cpp
++++ b/src/printing/ringbinder/ringbinderstyle.cpp
+@@ -159,7 +159,7 @@ void RingBinderPrintStyle::print(const KContacts::Addressee::List &contacts, Pri
+     config.sync();
+ 
+     QPrinter *printer = wizard()->printer();
+-    printer->setPageMargins(50, 20, 0, 50, QPrinter::DevicePixel);
++    printer->setPageMargins(QMarginsF(50, 20, 0, 50), QPageLayout::Point);
+ 
+     progress->addMessage(i18n("Setting up document"));
+ 
+-- 
+GitLab
+

diff --git a/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild
index 7da1971f728..4a9f7e41299 100644
--- a/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild
@@ -59,6 +59,8 @@ RDEPEND="${DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.2.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package telemetry KUserFeedback)