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/ark/, kde-apps/ark/files/
Date: Tue, 13 Aug 2019 05:54:02
Message-Id: 1565675600.5b21f5734def975d65bfb183641a8bcd05c53a0d.asturm@gentoo
1 commit: 5b21f5734def975d65bfb183641a8bcd05c53a0d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 13 05:52:49 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 13 05:53:20 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b21f573
7
8 kde-apps/ark: Fix missing header with Frameworks 5.61
9
10 Reported-by: Geoff Madden <mgmadden <AT> internode.on.net>
11 Closes: https://bugs.gentoo.org/692034
12 Package-Manager: Portage-2.3.71, Repoman-2.3.17
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 kde-apps/ark/ark-19.04.3.ebuild | 2 +
16 .../ark/files/ark-19.04.3-missing-header.patch | 54 ++++++++++++++++++++++
17 2 files changed, 56 insertions(+)
18
19 diff --git a/kde-apps/ark/ark-19.04.3.ebuild b/kde-apps/ark/ark-19.04.3.ebuild
20 index b9224f70aa0..1369e67045f 100644
21 --- a/kde-apps/ark/ark-19.04.3.ebuild
22 +++ b/kde-apps/ark/ark-19.04.3.ebuild
23 @@ -46,6 +46,8 @@ DEPEND="${RDEPEND}
24 $(add_qt_dep qtconcurrent)
25 "
26
27 +PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
28 +
29 # bug #560548, last checked with 16.04.1
30 RESTRICT+=" test"
31
32
33 diff --git a/kde-apps/ark/files/ark-19.04.3-missing-header.patch b/kde-apps/ark/files/ark-19.04.3-missing-header.patch
34 new file mode 100644
35 index 00000000000..a0b16e93a4f
36 --- /dev/null
37 +++ b/kde-apps/ark/files/ark-19.04.3-missing-header.patch
38 @@ -0,0 +1,54 @@
39 +From dfad7a3f389c3b852f45563854df123ac6facdec Mon Sep 17 00:00:00 2001
40 +From: Nicolas Fella <nicolas.fella@×××.de>
41 +Date: Mon, 15 Jul 2019 00:09:18 +0200
42 +Subject: Add missing QVector include
43 +MIME-Version: 1.0
44 +Content-Type: text/plain; charset=UTF-8
45 +Content-Transfer-Encoding: 8bit
46 +
47 +Summary:
48 +My build was failing with
49 +```
50 +In file included from /home/nico/kde/src/ark/kerfuffle/pluginmanager.cpp:28:
51 +/home/nico/kde/src/ark/kerfuffle/pluginmanager.h:138:22: error: field ‘m_plugins’ has incomplete type ‘QVector<Kerfuffle::Plugin*>’
52 + QVector<Plugin*> m_plugins;
53 + ^~~~~~~~~
54 +In file included from /usr/include/qt/QtCore/qglobal.h:1204,
55 + from /usr/include/qt/QtCore/qnamespace.h:43,
56 + from /usr/include/qt/QtCore/qobjectdefs.h:48,
57 + from /usr/include/qt/QtCore/qobject.h:46,
58 + from /usr/include/qt/QtCore/QObject:1,
59 + from /home/nico/kde/src/ark/kerfuffle/plugin.h:33,
60 + from /home/nico/kde/src/ark/kerfuffle/pluginmanager.h:31,
61 + from /home/nico/kde/src/ark/kerfuffle/pluginmanager.cpp:28
62 +```
63 +
64 +Test Plan: Builds. Can open a file
65 +
66 +Reviewers: #ark, elvisangelaccio
67 +
68 +Reviewed By: #ark, elvisangelaccio
69 +
70 +Subscribers: kde-utils-devel, #ark
71 +
72 +Tags: #ark
73 +
74 +Differential Revision: https://phabricator.kde.org/D22461
75 +---
76 + kerfuffle/pluginmanager.h | 1 +
77 + 1 file changed, 1 insertion(+)
78 +
79 +diff --git a/kerfuffle/pluginmanager.h b/kerfuffle/pluginmanager.h
80 +index 75a971b..8b9ad69 100644
81 +--- a/kerfuffle/pluginmanager.h
82 ++++ b/kerfuffle/pluginmanager.h
83 +@@ -31,6 +31,7 @@
84 + #include "plugin.h"
85 +
86 + #include <QMimeType>
87 ++#include <QVector>
88 +
89 + namespace Kerfuffle
90 + {
91 +--
92 +cgit v1.1