9:09 a.m.
commit 6e535c019a42fc119837b6d40698a91862266925
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Jul 28 10:09:49 2018 +0100
Fix qt 5.11 build
Fix_qt_5.11.patch | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
yabause.spec | 19 +++++++++++-----
2 files changed, 80 insertions(+), 5 deletions(-)
---
diff --git a/Fix_qt_5.11.patch b/Fix_qt_5.11.patch
new file mode 100644
index 0000000..6b41603
--- /dev/null
+++ b/Fix_qt_5.11.patch
@@ -0,0 +1,66 @@
+From 06a816c032c6f7fd79ced6e594dd4b33571a0e73 Mon Sep 17 00:00:00 2001
+From: Guillaume Duhamel <guillaume.duhamel(a)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/yabause/src/qt/ui/UICheatRaw.cpp b/yabause/src/qt/ui/UICheatRaw.cpp
+index 4ad82d770..3f78486bf 100755
+--- a/yabause/src/qt/ui/UICheatRaw.cpp
++++ b/yabause/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/yabause/src/qt/ui/UICheatRaw.h b/yabause/src/qt/ui/UICheatRaw.h
+index d97b429da..20318c670 100755
+--- a/yabause/src/qt/ui/UICheatRaw.h
++++ b/yabause/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/yabause/src/qt/ui/UICheats.cpp b/yabause/src/qt/ui/UICheats.cpp
+index c60279723..44d341c34 100755
+--- a/yabause/src/qt/ui/UICheats.cpp
++++ b/yabause/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/yabause/src/qt/ui/UIHexInput.h b/yabause/src/qt/ui/UIHexInput.h
+index f333b0166..4bd8aed48 100644
+--- a/yabause/src/qt/ui/UIHexInput.h
++++ b/yabause/src/qt/ui/UIHexInput.h
+@@ -22,6 +22,8 @@
+ #include "ui_UIHexInput.h"
+ #include "../QtYabause.h"
+
++#include <QValidator>
++
+ class HexValidator : public QValidator
+ {
+ Q_OBJECT
+
diff --git a/yabause.spec b/yabause.spec
index a53971b..dae5e86 100644
--- a/yabause.spec
+++ b/yabause.spec
@@ -2,13 +2,16 @@
Name: yabause
Version: 0.9.15
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A Sega Saturn emulator
License: GPLv2+
URL: http://yabause.org
Source0:
https://download.tuxfamily.org/%{name}/releases/%{version}/%{name}-%{vers...
+# https://github.com/Yabause/yabause/commit/06a816c032c6f7fd79ced6e594dd4b3...
+Patch0: Fix_qt_5.11.patch
-BuildRequires: cmake
+BuildRequires: cmake3
+BuildRequires: dos2unix
BuildRequires: desktop-file-utils
BuildRequires: freeglut-devel
BuildRequires: glew-devel
@@ -29,7 +32,10 @@ but optionally a real Saturn BIOS can be used, however it is not
included.
%prep
-%autosetup
+%setup
+# Fix the dos crap to make patching easy
+dos2unix src/qt/ui/*
+%patch0 -p2
#fix end-of-line encoding
find \( -name \*.c\* -or -name \*.h\* -or -name AUTHORS \) -exec sed -i 's/\r$//'
{} \;
@@ -46,9 +52,9 @@ export CXXFLAGS
#arm dynarec is broken
%ifarch %{ix86} x86_64
-%cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DYAB_PORTS=qt -DYAB_OPTIMIZATION=-O2 .
+%cmake3 -DBUILD_SHARED_LIBS:BOOL=OFF -DYAB_PORTS=qt -DYAB_OPTIMIZATION=-O2 .
%else
-%cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DYAB_PORTS=qt -DYAB_OPTIMIZATION=-O2 \
+%cmake3 -DBUILD_SHARED_LIBS:BOOL=OFF -DYAB_PORTS=qt -DYAB_OPTIMIZATION=-O2 \
-DSH2_DYNAREC:BOOL=OFF .
%endif
%make_build
@@ -70,6 +76,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{name}.desktop
%changelog
+* Sat Jul 28 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.9.15-6
+- Fix qt 5.11 build
+
* Fri Jul 27 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
0.9.15-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild