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/kpat/, kde-apps/kpat/files/
Date: Sun, 11 Aug 2019 08:19:49
Message-Id: 1565511566.655e22d852f7864da784eaade86a31d069e7b9f2.asturm@gentoo
1 commit: 655e22d852f7864da784eaade86a31d069e7b9f2
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 11 07:58:28 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 11 08:19:26 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=655e22d8
7
8 kde-apps/kpat: Fix missing header with Frameworks 5.61
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 .../kpat/files/kpat-19.04.3-missing-header.patch | 42 ++++++++++++++++++++++
14 kde-apps/kpat/kpat-19.04.3.ebuild | 2 ++
15 2 files changed, 44 insertions(+)
16
17 diff --git a/kde-apps/kpat/files/kpat-19.04.3-missing-header.patch b/kde-apps/kpat/files/kpat-19.04.3-missing-header.patch
18 new file mode 100644
19 index 00000000000..be272b75f4c
20 --- /dev/null
21 +++ b/kde-apps/kpat/files/kpat-19.04.3-missing-header.patch
22 @@ -0,0 +1,42 @@
23 +From 5b68765dcd431bca55582c4996adf73ed0ac0123 Mon Sep 17 00:00:00 2001
24 +From: Luca Beltrame <lbeltrame@×××.org>
25 +Date: Thu, 18 Jul 2019 23:28:57 +0200
26 +Subject: Add QMap include to fix build (with Qt 5.13)
27 +
28 +It looks it's no longer included transitively.
29 +---
30 + mainwindow.h | 5 +++--
31 + 1 file changed, 3 insertions(+), 2 deletions(-)
32 +
33 +diff --git a/mainwindow.h b/mainwindow.h
34 +index 0d6b2da..ca6ee0f 100644
35 +--- a/mainwindow.h
36 ++++ b/mainwindow.h
37 +@@ -23,7 +23,7 @@
38 + * -------------------------------------------------------------------------
39 + * This program is free software; you can redistribute it and/or
40 + * modify it under the terms of the GNU General Public License as
41 +- * published by the Free Software Foundation; either version 2 of
42 ++ * published by the Free Software Foundation; either version 2 of
43 + * the License, or (at your option) any later version.
44 + *
45 + * This program is distributed in the hope that it will be useful,
46 +@@ -53,6 +53,7 @@ class KRecentFilesAction;
47 + class KToggleAction;
48 + class QUrl;
49 + #include <KXmlGuiWindow>
50 ++#include <QMap>
51 +
52 + class QLabel;
53 +
54 +@@ -127,7 +128,7 @@ private:
55 + QAction * m_upAction;
56 + QAction * m_downAction;
57 + QAction * m_cancelAction;
58 +- QAction * m_pickUpSetDownAction;
59 ++ QAction * m_pickUpSetDownAction;
60 +
61 + KRecentFilesAction * m_recentFilesAction;
62 + QAction * m_saveAction;
63 +--
64 +cgit v1.1
65
66 diff --git a/kde-apps/kpat/kpat-19.04.3.ebuild b/kde-apps/kpat/kpat-19.04.3.ebuild
67 index 74d19ed5d4b..fbe9f755a2f 100644
68 --- a/kde-apps/kpat/kpat-19.04.3.ebuild
69 +++ b/kde-apps/kpat/kpat-19.04.3.ebuild
70 @@ -32,3 +32,5 @@ DEPEND="
71 dev-games/freecell-solver
72 "
73 RDEPEND="${DEPEND}"
74 +
75 +PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )