Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmail/, kde-apps/kmail/files/
Date: Wed, 14 Aug 2019 08:47:32
Message-Id: 1565772429.889b7cb2cd6dd320ff513d407b6a67dbef0a1172.asturm@gentoo
1 commit: 889b7cb2cd6dd320ff513d407b6a67dbef0a1172
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 14 08:46:42 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 14 08:47:09 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=889b7cb2
7
8 kde-apps/kmail: Fix missing header with Frameworks 5.61
9
10 Closes: https://bugs.gentoo.org/692116
11 Package-Manager: Portage-2.3.71, Repoman-2.3.17
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 .../kmail/files/kmail-19.04.3-missing-header.patch | 24 ++++++++++++++++++++++
15 kde-apps/kmail/kmail-19.04.3.ebuild | 2 ++
16 2 files changed, 26 insertions(+)
17
18 diff --git a/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch b/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch
19 new file mode 100644
20 index 00000000000..6c6cc309213
21 --- /dev/null
22 +++ b/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch
23 @@ -0,0 +1,24 @@
24 +From 201eac97eba591e16f0108e2605b9977e2db9a03 Mon Sep 17 00:00:00 2001
25 +From: Allen Winter <winter@×××.org>
26 +Date: Thu, 18 Jul 2019 15:35:24 -0400
27 +Subject: summaryview_part.h - fix build by including QMap
28 +
29 +---
30 + src/kontactplugin/summary/summaryview_part.h | 2 +-
31 + 1 file changed, 1 insertion(+), 1 deletion(-)
32 +
33 +diff --git a/src/kontactplugin/summary/summaryview_part.h b/src/kontactplugin/summary/summaryview_part.h
34 +index 542335d..b116e23 100644
35 +--- a/src/kontactplugin/summary/summaryview_part.h
36 ++++ b/src/kontactplugin/summary/summaryview_part.h
37 +@@ -25,7 +25,7 @@
38 + #define SUMMARYVIEW_PART_H
39 +
40 + #include <KParts/ReadOnlyPart>
41 +-#include <kparts/readonlypart.h>
42 ++#include <QMap>
43 +
44 + class DropWidget;
45 +
46 +--
47 +cgit v1.1
48
49 diff --git a/kde-apps/kmail/kmail-19.04.3.ebuild b/kde-apps/kmail/kmail-19.04.3.ebuild
50 index 0b70de2bd9b..3fb1fb73c9a 100644
51 --- a/kde-apps/kmail/kmail-19.04.3.ebuild
52 +++ b/kde-apps/kmail/kmail-19.04.3.ebuild
53 @@ -83,6 +83,8 @@ RDEPEND="${COMMON_DEPEND}
54 $(add_kdeapps_dep kmail-account-wizard)
55 "
56
57 +PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
58 +
59 RESTRICT+=" test" # bug 616878
60
61 src_prepare() {