1 |
commit: 7cc43df477195c18097b8b3d5899c20a40b2ff0f |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 29 19:59:31 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 29 20:04:29 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cc43df4 |
7 |
|
8 |
kde-apps/kaddressbook: Fix build with Qt 5.15.2 |
9 |
|
10 |
Upstream commit 8aee8d40ae2a1c920d3520163d550d3b49720226 |
11 |
|
12 |
Reported-by: <peter <AT> prh.myzen.co.uk> |
13 |
Closes: https://bugs.gentoo.org/757582 |
14 |
Package-Manager: Portage-3.0.11, Repoman-3.0.2 |
15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
16 |
|
17 |
.../files/kaddressbook-20.08.3-qt-5.15.2.patch | 69 ++++++++++++++++++++++ |
18 |
kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild | 2 + |
19 |
2 files changed, 71 insertions(+) |
20 |
|
21 |
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 |
22 |
new file mode 100644 |
23 |
index 00000000000..888febed0fa |
24 |
--- /dev/null |
25 |
+++ b/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch |
26 |
@@ -0,0 +1,69 @@ |
27 |
+From 8aee8d40ae2a1c920d3520163d550d3b49720226 Mon Sep 17 00:00:00 2001 |
28 |
+From: Volker Krause <vkrause@×××.org> |
29 |
+Date: Sun, 25 Oct 2020 18:22:58 +0100 |
30 |
+Subject: [PATCH] Compile with recent Qt 5.15 |
31 |
+ |
32 |
+More QPrinter methods got deprecated there. DevicePixel no longer exists |
33 |
+as a unit, visually Point looks pretty much the same though. |
34 |
+--- |
35 |
+ src/printing/compact/compactstyle.cpp | 2 +- |
36 |
+ src/printing/grantlee/grantleeprintstyle.cpp | 2 +- |
37 |
+ src/printing/mike/mikesstyle.cpp | 2 +- |
38 |
+ src/printing/ringbinder/ringbinderstyle.cpp | 2 +- |
39 |
+ 4 files changed, 4 insertions(+), 4 deletions(-) |
40 |
+ |
41 |
+diff --git a/src/printing/compact/compactstyle.cpp b/src/printing/compact/compactstyle.cpp |
42 |
+index d950a963..71e74c0f 100644 |
43 |
+--- a/src/printing/compact/compactstyle.cpp |
44 |
++++ b/src/printing/compact/compactstyle.cpp |
45 |
+@@ -168,7 +168,7 @@ void CompactStyle::print(const KContacts::Addressee::List &contacts, PrintProgre |
46 |
+ |
47 |
+ // print |
48 |
+ QPrinter *printer = wizard()->printer(); |
49 |
+- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel); |
50 |
++ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point); |
51 |
+ |
52 |
+ progress->addMessage(i18n("Setting up document")); |
53 |
+ |
54 |
+diff --git a/src/printing/grantlee/grantleeprintstyle.cpp b/src/printing/grantlee/grantleeprintstyle.cpp |
55 |
+index d7afe8ef..49b5e494 100644 |
56 |
+--- a/src/printing/grantlee/grantleeprintstyle.cpp |
57 |
++++ b/src/printing/grantlee/grantleeprintstyle.cpp |
58 |
+@@ -38,7 +38,7 @@ GrantleePrintStyle::~GrantleePrintStyle() |
59 |
+ void GrantleePrintStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress) |
60 |
+ { |
61 |
+ QPrinter *printer = wizard()->printer(); |
62 |
+- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel); |
63 |
++ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point); |
64 |
+ |
65 |
+ progress->addMessage(i18n("Setting up document")); |
66 |
+ |
67 |
+diff --git a/src/printing/mike/mikesstyle.cpp b/src/printing/mike/mikesstyle.cpp |
68 |
+index 9f698c53..81a4bd6f 100644 |
69 |
+--- a/src/printing/mike/mikesstyle.cpp |
70 |
++++ b/src/printing/mike/mikesstyle.cpp |
71 |
+@@ -107,7 +107,7 @@ MikesStyle::~MikesStyle() |
72 |
+ void MikesStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress) |
73 |
+ { |
74 |
+ QPrinter *printer = wizard()->printer(); |
75 |
+- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel); |
76 |
++ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point); |
77 |
+ |
78 |
+ progress->addMessage(i18n("Setting up document")); |
79 |
+ |
80 |
+diff --git a/src/printing/ringbinder/ringbinderstyle.cpp b/src/printing/ringbinder/ringbinderstyle.cpp |
81 |
+index 60a39c86..5f600d6a 100644 |
82 |
+--- a/src/printing/ringbinder/ringbinderstyle.cpp |
83 |
++++ b/src/printing/ringbinder/ringbinderstyle.cpp |
84 |
+@@ -159,7 +159,7 @@ void RingBinderPrintStyle::print(const KContacts::Addressee::List &contacts, Pri |
85 |
+ config.sync(); |
86 |
+ |
87 |
+ QPrinter *printer = wizard()->printer(); |
88 |
+- printer->setPageMargins(50, 20, 0, 50, QPrinter::DevicePixel); |
89 |
++ printer->setPageMargins(QMarginsF(50, 20, 0, 50), QPageLayout::Point); |
90 |
+ |
91 |
+ progress->addMessage(i18n("Setting up document")); |
92 |
+ |
93 |
+-- |
94 |
+GitLab |
95 |
+ |
96 |
|
97 |
diff --git a/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild |
98 |
index 7da1971f728..4a9f7e41299 100644 |
99 |
--- a/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild |
100 |
+++ b/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild |
101 |
@@ -59,6 +59,8 @@ RDEPEND="${DEPEND} |
102 |
>=kde-apps/kdepim-runtime-${PVCUT}:5 |
103 |
" |
104 |
|
105 |
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.2.patch" ) |
106 |
+ |
107 |
src_configure() { |
108 |
local mycmakeargs=( |
109 |
$(cmake_use_find_package telemetry KUserFeedback) |