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/cantor/files/, kde-apps/cantor/
Date: Mon, 12 Aug 2019 19:59:23
Message-Id: 1565639949.a2ebe989c58066eacc134386760f8e9f7b59393b.asturm@gentoo
1 commit: a2ebe989c58066eacc134386760f8e9f7b59393b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 12 19:58:24 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 12 19:59:09 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2ebe989
7
8 kde-apps/cantor: Fix missing header with Frameworks 5.61
9
10 Closes: https://bugs.gentoo.org/692008
11 Package-Manager: Portage-2.3.71, Repoman-2.3.17
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 kde-apps/cantor/cantor-19.04.3.ebuild | 2 ++
15 .../files/cantor-19.04.3-missing-header.patch | 26 ++++++++++++++++++++++
16 2 files changed, 28 insertions(+)
17
18 diff --git a/kde-apps/cantor/cantor-19.04.3.ebuild b/kde-apps/cantor/cantor-19.04.3.ebuild
19 index fca31777aba..306541dd15a 100644
20 --- a/kde-apps/cantor/cantor-19.04.3.ebuild
21 +++ b/kde-apps/cantor/cantor-19.04.3.ebuild
22 @@ -57,6 +57,8 @@ DEPEND="
23 "
24 RDEPEND="${DEPEND}"
25
26 +PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
27 +
28 RESTRICT+=" test"
29
30 pkg_pretend() {
31
32 diff --git a/kde-apps/cantor/files/cantor-19.04.3-missing-header.patch b/kde-apps/cantor/files/cantor-19.04.3-missing-header.patch
33 new file mode 100644
34 index 00000000000..3844b6bcc54
35 --- /dev/null
36 +++ b/kde-apps/cantor/files/cantor-19.04.3-missing-header.patch
37 @@ -0,0 +1,26 @@
38 +From 6a49ffa048f619752d32ff9b85a03c8cbcb448b7 Mon Sep 17 00:00:00 2001
39 +From: Nikita Sirgienko <warquark@×××××.com>
40 +Date: Sun, 21 Jul 2019 02:00:46 +0300
41 +Subject: Try to fix build error in stable-kf5-qt5 #7
42 +
43 +---
44 + src/cantor.h | 2 ++
45 + 1 file changed, 2 insertions(+)
46 +
47 +(limited to 'src/cantor.h')
48 +
49 +diff --git a/src/cantor.h b/src/cantor.h
50 +index 0352753..bbf8f6e 100644
51 +--- a/src/cantor.h
52 ++++ b/src/cantor.h
53 +@@ -25,6 +25,8 @@
54 + #include <KParts/MainWindow>
55 +
56 + #include <QList>
57 ++#include <QStringList>
58 ++#include <QMap>
59 +
60 + class QTabWidget;
61 + class KTextEdit;
62 +--
63 +cgit v1.1