summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-07-15 21:21:32 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-07-15 21:27:55 +0200
commit8b6cc02dcadf1e0d9dc8df3e4c5ed045d44fbb71 (patch)
tree9a6ec97480e32d2aa8c73ddbb99ff2f1017dc08c /games-emulation/yabause/files
parentdev-ruby/actioncable: cleanup (diff)
downloadgentoo-8b6cc02dcadf1e0d9dc8df3e4c5ed045d44fbb71.tar.gz
gentoo-8b6cc02dcadf1e0d9dc8df3e4c5ed045d44fbb71.tar.bz2
gentoo-8b6cc02dcadf1e0d9dc8df3e4c5ed045d44fbb71.zip
games-emulation/yabause: 0.9.15 version bump, EAPI-6, fix Qt 5.11
Drop games.eclass. Make USE=qt5 default per upstream recommendation. Disabling SH2_DYNAREC due to being broken, see also: https://github.com/Yabause/yabause/issues/270 Thanks-to: Samuel BAUER <BM-2cTVBXjxdVtEQCycBQjMxszLsgTNVujvM5@bitmessage.ch> Bug: https://bugs.gentoo.org/582326 Closes: https://bugs.gentoo.org/654674 Closes: https://bugs.gentoo.org/660458 Package-Manager: Portage-2.3.42, Repoman-2.3.9
Diffstat (limited to 'games-emulation/yabause/files')
-rw-r--r--games-emulation/yabause/files/yabause-0.9.15-RWX.patch20
-rw-r--r--games-emulation/yabause/files/yabause-0.9.15-qt-5.11.patch65
2 files changed, 85 insertions, 0 deletions
diff --git a/games-emulation/yabause/files/yabause-0.9.15-RWX.patch b/games-emulation/yabause/files/yabause-0.9.15-RWX.patch
new file mode 100644
index 000000000000..e08a8a7a7d50
--- /dev/null
+++ b/games-emulation/yabause/files/yabause-0.9.15-RWX.patch
@@ -0,0 +1,20 @@
+--- a/src/sh2_dynarec/linkage_x64.s
++++ b/src/sh2_dynarec/linkage_x64.s
+@@ -747,3 +747,7 @@ breakpoint:
+ ret
+ /* Set breakpoint here for debugging */
+ .size breakpoint, .-breakpoint
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+--- a/src/sh2_dynarec/linkage_x86.s
++++ b/src/sh2_dynarec/linkage_x86.s
+@@ -743,3 +743,7 @@ breakpoint:
+ ret
+ /* Set breakpoint here for debugging */
+ .size breakpoint, .-breakpoint
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/games-emulation/yabause/files/yabause-0.9.15-qt-5.11.patch b/games-emulation/yabause/files/yabause-0.9.15-qt-5.11.patch
new file mode 100644
index 000000000000..3f4528482b3d
--- /dev/null
+++ b/games-emulation/yabause/files/yabause-0.9.15-qt-5.11.patch
@@ -0,0 +1,65 @@
+From 06a816c032c6f7fd79ced6e594dd4b33571a0e73 Mon Sep 17 00:00:00 2001
+From: Guillaume Duhamel <guillaume.duhamel@gmail.com>
+Date: Fri, 6 Jul 2018 08:08:22 +0200
+Subject: [PATCH] Fix qt 5.11 (#422)
+
+Header fixes for Qt 5.11
+---
+ yabause/src/qt/ui/UICheatRaw.cpp | 2 --
+ yabause/src/qt/ui/UICheatRaw.h | 2 +-
+ yabause/src/qt/ui/UICheats.cpp | 2 ++
+ yabause/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 4ad82d770..3f78486bf 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 d97b429da..20318c670 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 c60279723..44d341c34 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 f333b0166..4bd8aed48 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