From 531de6829c8f1ecaa99217d447eea27f6281768f Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 21 Sep 2018 19:03:33 +0000 Subject: [PATCH] community/mgba to 0.6.3-2 --- community/mgba/PKGBUILD | 13 ++++++++---- community/mgba/mgba-qt5.11.patch | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 community/mgba/mgba-qt5.11.patch diff --git a/community/mgba/PKGBUILD b/community/mgba/PKGBUILD index abebe6963..e94f26a31 100644 --- a/community/mgba/PKGBUILD +++ b/community/mgba/PKGBUILD @@ -1,4 +1,3 @@ -# $Id$ # Maintainer: Jonathan Steel # Contributor: Bartłomiej Piotrowski # Contributor: Duck Hunt @@ -9,17 +8,23 @@ pkgbase=mgba pkgname=('libmgba' 'mgba-sdl' 'mgba-qt') pkgver=0.6.3 -pkgrel=1 +pkgrel=2 arch=('x86_64') url='http://mgba.io' license=('custom:MPL2') makedepends=('cmake' 'qt5-multimedia' 'sdl2' 'zlib' 'libpng' 'libzip' 'libedit' 'ffmpeg' 'libmagick' 'desktop-file-utils' 'qt5-tools') -source=($pkgbase-$pkgver.tar.gz::https://github.com/mgba-emu/mgba/archive/$pkgver.tar.gz) -md5sums=('5e46c98c6321941499c44f88b2001d9b') +source=($pkgbase-$pkgver.tar.gz::https://github.com/mgba-emu/mgba/archive/$pkgver.tar.gz + mgba-qt5.11.patch) +md5sums=('5e46c98c6321941499c44f88b2001d9b' + '36e0ba610e1ba0806324d1d6b8f315b7') prepare() { [[ ! -d build ]] && mkdir build || rm -rf build + + cd mgba-$pkgver + + patch -Np1 -i ../mgba-qt5.11.patch } build() { diff --git a/community/mgba/mgba-qt5.11.patch b/community/mgba/mgba-qt5.11.patch new file mode 100644 index 000000000..338bb50c8 --- /dev/null +++ b/community/mgba/mgba-qt5.11.patch @@ -0,0 +1,35 @@ +From 7f41dd354176b720c8e3310553c6b772278b9dca Mon Sep 17 00:00:00 2001 +From: Vicki Pfau +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 538254ff6..d9db6a7d3 100644 +--- a/src/platform/qt/LoadSaveState.cpp ++++ b/src/platform/qt/LoadSaveState.cpp +@@ -10,6 +10,7 @@ + #include "GamepadButtonEvent.h" + #include "VFileDevice.h" + ++#include + #include + #include + #include +diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h +index baca971ea..2d9d139cc 100644 +--- a/src/platform/qt/Window.h ++++ b/src/platform/qt/Window.h +@@ -5,6 +5,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + #pragma once + ++#include + #include + #include + #include +