yabause: 0.9.14 -> 0.9.15 (#46353)

+ fixes for Qt 5.11 build.
This commit is contained in:
Samuel Dionne-Riel 2018-09-08 07:58:50 -04:00 committed by xeji
parent cd20437f81
commit 2c751dcdc9
3 changed files with 77 additions and 17 deletions

View file

@ -0,0 +1,67 @@
From 3140afd6fb7dad7a25296526a71b005fb9eae048 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 8 Sep 2018 00:44:08 -0400
Subject: [PATCH] Fixes for Qt 5.11 upgrade
---
src/qt/ui/UICheatRaw.cpp | 2 --
src/qt/ui/UICheatRaw.h | 2 +-
src/qt/ui/UICheats.cpp | 2 ++
src/qt/ui/UIHexInput.h | 2 ++
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/qt/ui/UICheatRaw.cpp b/src/qt/ui/UICheatRaw.cpp
index 4ad82d77..3f78486b 100755
--- a/src/qt/ui/UICheatRaw.cpp
+++ b/src/qt/ui/UICheatRaw.cpp
@@ -20,8 +20,6 @@
#include "UIHexInput.h"
#include "../QtYabause.h"
-#include <QButtonGroup>
-
UICheatRaw::UICheatRaw( QWidget* p )
: QDialog( p )
{
diff --git a/src/qt/ui/UICheatRaw.h b/src/qt/ui/UICheatRaw.h
index d97b429d..20318c67 100755
--- a/src/qt/ui/UICheatRaw.h
+++ b/src/qt/ui/UICheatRaw.h
@@ -21,7 +21,7 @@
#include "ui_UICheatRaw.h"
-class QButtonGroup;
+#include <QButtonGroup>
class UICheatRaw : public QDialog, public Ui::UICheatRaw
{
diff --git a/src/qt/ui/UICheats.cpp b/src/qt/ui/UICheats.cpp
index c6027972..44d341c3 100755
--- a/src/qt/ui/UICheats.cpp
+++ b/src/qt/ui/UICheats.cpp
@@ -21,6 +21,8 @@
#include "UICheatRaw.h"
#include "../CommonDialogs.h"
+#include <QButtonGroup>
+
UICheats::UICheats( QWidget* p )
: QDialog( p )
{
diff --git a/src/qt/ui/UIHexInput.h b/src/qt/ui/UIHexInput.h
index f333b016..4bd8aed4 100644
--- a/src/qt/ui/UIHexInput.h
+++ b/src/qt/ui/UIHexInput.h
@@ -22,6 +22,8 @@
#include "ui_UIHexInput.h"
#include "../QtYabause.h"
+#include <QValidator>
+
class HexValidator : public QValidator
{
Q_OBJECT
--
2.16.4

View file

@ -1,21 +1,24 @@
{ stdenv, fetchurl, cmake, pkgconfig, qtbase, libGLU_combined
{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU_combined
, freeglut ? null, openal ? null, SDL2 ? null }:
stdenv.mkDerivation rec {
name = "yabause-${version}";
# 0.9.15 only works with OpenGL 3.2 or later:
# https://github.com/Yabause/yabause/issues/349
version = "0.9.14";
version = "0.9.15";
src = fetchurl {
url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz";
sha256 = "0nkpvnr599g0i2mf19sjvw5m0rrvixdgz2snav4qwvzgfc435rkm";
sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ qtbase libGLU_combined freeglut openal SDL2 ];
buildInputs = [ qtbase qt5.qtmultimedia libGLU_combined freeglut openal SDL2 ];
patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ];
patches = [
./linkage-rwx-linux-elf.patch
# Fixes derived from
# https://github.com/Yabause/yabause/commit/06a816c032c6f7fd79ced6e594dd4b33571a0e73
./0001-Fixes-for-Qt-5.11-upgrade.patch
];
cmakeFlags = [
"-DYAB_NETWORK=ON"

View file

@ -1,10 +0,0 @@
--- a/src/qt/ui/UIYabause.ui 2017-09-28 13:23:04.636014753 +0000
+++ b/src/qt/ui/UIYabause.ui 2017-09-28 13:23:21.945763537 +0000
@@ -230,7 +230,6 @@
<property name="title">
<string>&amp;Help</string>
</property>
- <addaction name="aHelpEmuCompatibility"/>
<addaction name="aHelpAbout"/>
</widget>
<widget class="QMenu" name="mTools">