gentoo resync : 07.07.2018

3 files changed, 40 insertions, 1 deletions

diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 8f0dce904fbe..279d284a9a53 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,7 +1,8 @@
+AUX mgba-0.6.3-qt511.patch 975 BLAKE2B 3fdafdd9a10cd643fbf29a76baf4e49db50142a2f1b096f8c8b962e38166756016bf663b53dd6cf3a2e33f2f28313d477463d8807d4ecb3139bf7a0943ae0274 SHA512 41e0ea8568d8ffddac2b9020933fd4a21562049b82bfd95bb0ae372702b3312c7ee3f03e03a36fcaec723d999f7820a785a730354825cee1a737d6c2accbfb29
 DIST mgba-0.6.1.tar.gz 7437240 BLAKE2B d00ed8a517b6e82f477537702d757bd9d86d007ee7bea022b67751b0423a2f386706e410c5e41b984ae8e7e66efabbf41356b846fdcba438cb5a64c89bc2379c SHA512 fb4d2bd490afa052c32d263e4d7b65ff83ccdcad01f5df6572d73c81de3c4e0c268b102ac36cff4a85ab20fc190d2f1a4959a3058e559a528be5e49c4808ce57
 DIST mgba-0.6.2.tar.gz 7441969 BLAKE2B f807a3a26667f50cbf3b87ac6e7887ec7fb99516895e1168855fafee417025a1d1e5605ca3f87a171fde563fd69878d5d164e068247643401c2696164d7460c1 SHA512 8afe4fb331f4163f4cd96cc73a51136bdb9008178b74c0ecb827c1f06dee79eba3cf753e1c35657972d8593ab97d294c15287ebf2c5ffa6a135527d5611d3574
 DIST mgba-0.6.3.tar.gz 7442154 BLAKE2B 2b46cf36174ef0a186b1bc71784820e6ddd7754a7cae695a95dcdae96efff58af70dd14faa2f1f6194a23450943d82aed2394f7bf2821ed91bf558eef6ae9c4d SHA512 d646af7869dbcf8df671a75ecfd8c270950c013b826b23b94bacae43a77243786f198725e1b9bf17827d1ffcf6a8eef70091d53ea878bfb2450472485f42f233
 EBUILD mgba-0.6.1.ebuild 2372 BLAKE2B a1044752dd33c7a2019f88d79cb247013a8de227ae5730cdfbc1ccc28409a9a767fa598a2000db5c962efe11e7f3031ed7b35353606885879838e147c9b20ef8 SHA512 33ebba4a7c94922750bbad82c1c06a1185f03336a2138ecd39bdc5d3dfbee9b7ac5f3b190cc693936790010e5cf86102ef1a4a25cc4ff28114c7710923e911e1
 EBUILD mgba-0.6.2.ebuild 2367 BLAKE2B d9b9d7779b6bcdcb82d883a0f1a6156111037603b04e7e417b7808b30f16f9ab6564145d56fc9534f54d591cde9229adc4e3fc47a34ec7ef41b4b01eb2783ec6 SHA512 97daec41ddf7d211c8ffcca2f6c5f53e7adf44cc02d7f7d35717a7fdb1c2d7d3f448f7df194386b0c168f6d63cbf85443eccddcdcda52d9d6b2384c5af3b56cb
-EBUILD mgba-0.6.3.ebuild 2425 BLAKE2B 75e0ddc31550bb283598f39215dc866c86561994365b7365281498b2b21b2c070a40abd690147d7fa077cbb91ca834f29f5dda06d081ab00ef72b668f362625f SHA512 17e5a72ca4f3ab23fb70dd16c5f1b586ec160ea9988bdb8cfa439f9351e8bd2cacb949c9254182ed793cced4c80bdd73c47eafcf942673e1e0874ce969327f08
+EBUILD mgba-0.6.3.ebuild 2470 BLAKE2B a00e6509643d0eed1ea8b213f3503791477b55c059085a9ab314f374e1a6c24ddfa1dc313b331fa9779659f76aab8458c22b6b83a5455c2d4d5824c64434a379 SHA512 66ab4004d8d4a22874030438c1bf1b9a02fe95be18f9bbf668cdd3cd111ad335641e2812d2e85485f9cd701f7e7702b3295ed79a7e99342af794697429139e31
 MISC metadata.xml 339 BLAKE2B e8edd01de74aa69c33c51ca095668dd89c74b83bd0c1597baf75f34b839cba3e74a2723b96acad0aef00b7a84628d54f70526f336a2d9880c32403cca153ca1d SHA512 33798a7a9145daff0c4f0e31cbd6ac05e49632edbec02709f51952716af659a7f3e76f378e9432c15e5bda68619816318a1d2fbfa27b4a5ef136970241ebfa03
diff --git a/games-emulation/mgba/files/mgba-0.6.3-qt511.patch b/games-emulation/mgba/files/mgba-0.6.3-qt511.patch
new file mode 100644
index 000000000000..05368f6e30e7
--- /dev/null
+++ b/games-emulation/mgba/files/mgba-0.6.3-qt511.patch
@@ -0,0 +1,34 @@
+From a2b8c4ae807ae92103e14961fd34377b28cbe219 Mon Sep 17 00:00:00 2001
+From: Vicki Pfau <vi@endrift.com>
+Date: Fri, 25 May 2018 18:04:16 -0700
+Subject: [PATCH] Qt: Fix build with Qt 5.11
+
+---
+ src/platform/qt/LoadSaveState.cpp | 1 +
+ src/platform/qt/Window.h          | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/platform/qt/LoadSaveState.cpp b/src/platform/qt/LoadSaveState.cpp
+index a381c3d22..41ddb842e 100644
+--- a/src/platform/qt/LoadSaveState.cpp
++++ b/src/platform/qt/LoadSaveState.cpp
+@@ -10,6 +10,7 @@
+ #include "GamepadButtonEvent.h"
+ #include "VFileDevice.h"
+ 
++#include <QAction>
+ #include <QDateTime>
+ #include <QKeyEvent>
+ #include <QPainter>
+diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h
+index c009c7ffa..8ee63907d 100644
+--- a/src/platform/qt/Window.h
++++ b/src/platform/qt/Window.h
+@@ -6,6 +6,7 @@
+ #ifndef QGBA_WINDOW
+ #define QGBA_WINDOW
+ 
++#include <QAction>
+ #include <QDateTime>
+ #include <QList>
+ #include <QMainWindow>
diff --git a/games-emulation/mgba/mgba-0.6.3.ebuild b/games-emulation/mgba/mgba-0.6.3.ebuild
index 6674579a2fcc..c4859e9bec53 100644
--- a/games-emulation/mgba/mgba-0.6.3.ebuild
+++ b/games-emulation/mgba/mgba-0.6.3.ebuild
@@ -37,6 +37,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-qt511.patch"
+)
+
 src_prepare() {
 	cmake-utils_src_prepare