[arch-commits] Commit in yabause-qt/trunk (PKGBUILD qt-5.11.patch)

[Evangelos Foutras]

    Date: Saturday, April 25, 2020 @ 17:10:33
  Author: foutrelis
Revision: 620992

Fix build with Qt 5.11

Added:
  yabause-qt/trunk/qt-5.11.patch
Modified:
  yabause-qt/trunk/PKGBUILD

---------------+
 PKGBUILD      |    3 ++
 qt-5.11.patch |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-25 16:57:41 UTC (rev 620991)
+++ PKGBUILD	2020-04-25 17:10:33 UTC (rev 620992)
@@ -16,13 +16,16 @@
 makedepends=('cmake' 'glu' 'libxmu')
 conflicts=('yabause-gtk')
 source=("https://download.tuxfamily.org/yabause/releases/${pkgver}/yabause-${pkgver}.tar.gz"
+        'qt-5.11.patch'
         'rwx.patch')
 sha256sums=('4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2'
+            '5c4f639478567d9a42963420bb6ab4086fd0514e8787c597c7b40804e1946ea6'
             'd29997d3249683081a2687f31e777f917093101d56815d22103aaaf22ac786b1')
 
 prepare() {
   cd yabause-${pkgver}
 
+  patch -Np2 -i ../qt-5.11.patch
   patch -Np1 -i ../rwx.patch
 }
 

Added: qt-5.11.patch
===================================================================
--- qt-5.11.patch	                        (rev 0)
+++ qt-5.11.patch	2020-04-25 17:10:33 UTC (rev 620992)
@@ -0,0 +1,65 @@
+From 06a816c032c6f7fd79ced6e594dd4b33571a0e73 Mon Sep 17 00:00:00 2001
+From: Guillaume Duhamel <guillaume.duhamel at 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