From b425cff9569686f8a11343559f9f6d91b000e1ec Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 27 Sep 2020 17:26:46 +0200
Subject: [PATCH] hedgewars: rebuild for fpc-3.2.0.

---
 srcpkgs/hedgewars/patches/fpc-3.2.0.patch | 13 +++++++++++++
 srcpkgs/hedgewars/patches/qt.patch        | 10 ++++++++++
 srcpkgs/hedgewars/template                |  5 ++---
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/hedgewars/patches/fpc-3.2.0.patch
 create mode 100644 srcpkgs/hedgewars/patches/qt.patch

diff --git a/srcpkgs/hedgewars/patches/fpc-3.2.0.patch b/srcpkgs/hedgewars/patches/fpc-3.2.0.patch
new file mode 100644
index 00000000000..6409399f74c
--- /dev/null
+++ b/srcpkgs/hedgewars/patches/fpc-3.2.0.patch
@@ -0,0 +1,13 @@
+--- hedgewars/uWorld.pas
++++ hedgewars/uWorld.pas
+@@ -1168,8 +1168,8 @@ procedure RenderAttackBar();
+ procedure ShiftWorld(Dir: LongInt); inline;
+ begin
+     preShiftWorldDx:= WorldDx;
+-    WorldDx:= WorldDx + LongInt(Dir * LongInt(playWidth));
+-
++    Dir := Dir * LongInt(playWidth);
++    WorldDx:= WorldDx + Dir;
+ end;
+ 
+ procedure UnshiftWorld(); inline;
diff --git a/srcpkgs/hedgewars/patches/qt.patch b/srcpkgs/hedgewars/patches/qt.patch
new file mode 100644
index 00000000000..4d1cb16a7c4
--- /dev/null
+++ b/srcpkgs/hedgewars/patches/qt.patch
@@ -0,0 +1,10 @@
+--- QTfrontend/ui/page/pagegamestats.cpp.orig
++++ QTfrontend/ui/page/pagegamestats.cpp
+@@ -22,6 +22,7 @@
+ #include <QGraphicsScene>
+ #include <QGroupBox>
+ #include <QSizePolicy>
++#include <QPainterPath>
+ 
+ #include "pagegamestats.h"
+ #include "team.h"
diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index 40cdb1086b4..ed711da0cbe 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -1,7 +1,7 @@
 # Template file for 'hedgewars'
 pkgname=hedgewars
 version=1.0.0
-revision=1
+revision=2
 wrksrc="${pkgname}-src-${version}"
 build_style=cmake
 configure_args="-DNOSERVER=1 -DDATA_INSTALL_DIR=/usr/share/${pkgname}
@@ -37,7 +37,7 @@ case $XBPS_TARGET_MACHINE in
 esac
 
 if [ -n "$_use_c_engine" ]; then
-	hostmakedepends+=" glew-devel libatomic-devel ghc"
+	hostmakedepends+=" glew-devel libatomic-devel ghc clang"
 	configure_args+=" -DBUILD_ENGINE_C=1"
 	nopie_files+=" /usr/bin/hedgewars"
 fi
@@ -56,7 +56,6 @@ post_install() {
 
 hedgewars-data_package() {
 	short_desc+=" - data files"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share/hedgewars/Data
 	}