Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/engauge/, media-gfx/engauge/files/
Date: Thu, 11 Oct 2018 13:01:11
Message-Id: 1539262849.eee92fc66783faa17112955812d026d205310001.kensington@gentoo
1 commit: eee92fc66783faa17112955812d026d205310001
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 11 13:00:34 2018 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 11 13:00:49 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eee92fc6
7
8 media-gfx/engauge: fix build with Qt 5.11
9
10 Closes: https://bugs.gentoo.org/662476
11 Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
12 Package-Manager: Portage-2.3.49, Repoman-2.3.11
13
14 media-gfx/engauge/engauge-10.6.ebuild | 4 +++-
15 media-gfx/engauge/files/engauge-10.6-qt-5.11.patch | 26 ++++++++++++++++++++++
16 2 files changed, 29 insertions(+), 1 deletion(-)
17
18 diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
19 index ea7530fd0b5..7d8aba7d2cc 100644
20 --- a/media-gfx/engauge/engauge-10.6.ebuild
21 +++ b/media-gfx/engauge/engauge-10.6.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2018 Gentoo Foundation
24 +# Copyright 1999-2018 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=6
28 @@ -32,6 +32,8 @@ S=$WORKDIR/engauge-digitizer-$PV
29 src_prepare() {
30 eapply_user
31
32 + eapply "${FILESDIR}/${P}-qt-5.11.patch"
33 +
34 # Make sure the documentation is looked for in the proper directory
35 sed -e "s:engauge-digitizer/engauge.qhc:${PF}/engauge.qhc:" \
36 -i src/Help/HelpWindow.cpp || die
37
38 diff --git a/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch b/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch
39 new file mode 100644
40 index 00000000000..9070f522393
41 --- /dev/null
42 +++ b/media-gfx/engauge/files/engauge-10.6-qt-5.11.patch
43 @@ -0,0 +1,26 @@
44 +Bug: https://bugs.gentoo.org/662476
45 +
46 +From 5eab86bf84dd1e52fc52b427a8f3508780811976 Mon Sep 17 00:00:00 2001
47 +From: Michael Palimaka <kensington@g.o>
48 +Date: Thu, 11 Oct 2018 23:51:15 +1100
49 +Subject: [PATCH] Add missing include.
50 +
51 +---
52 + src/Load/LoadImageFromUrl.cpp | 1 +
53 + 1 file changed, 1 insertion(+)
54 +
55 +diff --git a/src/Load/LoadImageFromUrl.cpp b/src/Load/LoadImageFromUrl.cpp
56 +index 684629bd..1150dad0 100644
57 +--- a/src/Load/LoadImageFromUrl.cpp
58 ++++ b/src/Load/LoadImageFromUrl.cpp
59 +@@ -10,6 +10,7 @@
60 + #include <QFileInfo>
61 + #include <QMessageBox>
62 + #include <QtNetwork/QNetworkReply>
63 ++#include <QTextStream>
64 + #include <QUrl>
65 + #include "Version.h"
66 +
67 +--
68 +2.18.1
69 +