Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/mgba/, games-emulation/mgba/files/
Date: Tue, 03 Jul 2018 14:11:03
Message-Id: 1530627052.288f883b4305bfaee177adb899a78345eb99afde.polynomial-c@gentoo
1 commit: 288f883b4305bfaee177adb899a78345eb99afde
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 3 14:10:52 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 3 14:10:52 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288f883b
7
8 games-emulation/mgba: Fixed build against qt-5.11
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11
12 games-emulation/mgba/files/mgba-0.6.3-qt511.patch | 34 +++++++++++++++++++++++
13 games-emulation/mgba/mgba-0.6.3.ebuild | 4 +++
14 2 files changed, 38 insertions(+)
15
16 diff --git a/games-emulation/mgba/files/mgba-0.6.3-qt511.patch b/games-emulation/mgba/files/mgba-0.6.3-qt511.patch
17 new file mode 100644
18 index 00000000000..05368f6e30e
19 --- /dev/null
20 +++ b/games-emulation/mgba/files/mgba-0.6.3-qt511.patch
21 @@ -0,0 +1,34 @@
22 +From a2b8c4ae807ae92103e14961fd34377b28cbe219 Mon Sep 17 00:00:00 2001
23 +From: Vicki Pfau <vi@×××××××.com>
24 +Date: Fri, 25 May 2018 18:04:16 -0700
25 +Subject: [PATCH] Qt: Fix build with Qt 5.11
26 +
27 +---
28 + src/platform/qt/LoadSaveState.cpp | 1 +
29 + src/platform/qt/Window.h | 1 +
30 + 2 files changed, 2 insertions(+)
31 +
32 +diff --git a/src/platform/qt/LoadSaveState.cpp b/src/platform/qt/LoadSaveState.cpp
33 +index a381c3d22..41ddb842e 100644
34 +--- a/src/platform/qt/LoadSaveState.cpp
35 ++++ b/src/platform/qt/LoadSaveState.cpp
36 +@@ -10,6 +10,7 @@
37 + #include "GamepadButtonEvent.h"
38 + #include "VFileDevice.h"
39 +
40 ++#include <QAction>
41 + #include <QDateTime>
42 + #include <QKeyEvent>
43 + #include <QPainter>
44 +diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h
45 +index c009c7ffa..8ee63907d 100644
46 +--- a/src/platform/qt/Window.h
47 ++++ b/src/platform/qt/Window.h
48 +@@ -6,6 +6,7 @@
49 + #ifndef QGBA_WINDOW
50 + #define QGBA_WINDOW
51 +
52 ++#include <QAction>
53 + #include <QDateTime>
54 + #include <QList>
55 + #include <QMainWindow>
56
57 diff --git a/games-emulation/mgba/mgba-0.6.3.ebuild b/games-emulation/mgba/mgba-0.6.3.ebuild
58 index 6674579a2fc..c4859e9bec5 100644
59 --- a/games-emulation/mgba/mgba-0.6.3.ebuild
60 +++ b/games-emulation/mgba/mgba-0.6.3.ebuild
61 @@ -37,6 +37,10 @@ RDEPEND="
62 "
63 DEPEND="${RDEPEND}"
64
65 +PATCHES=(
66 + "${FILESDIR}/${P}-qt511.patch"
67 +)
68 +
69 src_prepare() {
70 cmake-utils_src_prepare