[arch-commits] Commit in spring/trunk (PKGBUILD spring-gcc11.patch)

[Sven-Hendrik Haase]

    Date: Sunday, June 13, 2021 @ 01:01:55
  Author: svenstaro
Revision: 963236

upgpkg: spring 105.0.1-1

Added:
  spring/trunk/spring-gcc11.patch
Modified:
  spring/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   14 ++++++++++----
 spring-gcc11.patch |   25 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-13 00:46:21 UTC (rev 963235)
+++ PKGBUILD	2021-06-13 01:01:55 UTC (rev 963236)
@@ -3,7 +3,8 @@
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=spring
-pkgver=105.0
+pkgver=105.0.1
+_commit=8581792
 pkgrel=1
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('x86_64')
@@ -11,20 +12,25 @@
 license=('GPL')
 depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl2' 'libunwind'
          'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils' 'libx11')
-makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python' 'jdk8-openjdk' 'mesa' 'git')
+makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python' 'jdk8-openjdk' 'mesa' 'git' 'gcc10')
 optdepends=('python: python-based bots'
             'java-runtime: java-based bots')
-source=(git+https://github.com/spring/spring.git#commit=575e223)
-sha512sums=('SKIP')
+source=(git+https://github.com/spring/spring.git#commit=$_commit
+        spring-gcc11.patch)
+sha512sums=('SKIP'
+            'b30c666828fd2a1acdd64b505928f7d732479d6985590ea0d8926f3a19dc4b7aa95c80326e72f283d6de1ff17b9763ea0cbc88c71da0d6a77a2db301da9dce49')
 
 prepare() {
   cd spring
   git submodule update --init
+
+  patch -Np1 -i "$srcdir"/spring-gcc11.patch
 }
 
 build() {
   cd spring
 
+  export CXX=g++-10
   cmake	. \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DDATADIR=share/spring \

Added: spring-gcc11.patch
===================================================================
--- spring-gcc11.patch	                        (rev 0)
+++ spring-gcc11.patch	2021-06-13 01:01:55 UTC (rev 963236)
@@ -0,0 +1,25 @@
+diff --git a/rts/Map/SMF/ROAM/Patch.h b/rts/Map/SMF/ROAM/Patch.h
+index c7f311beee..f3a6fba96f 100644
+--- a/rts/Map/SMF/ROAM/Patch.h
++++ b/rts/Map/SMF/ROAM/Patch.h
+@@ -10,6 +10,7 @@
+ 
+ #include <array>
+ #include <vector>
++#include <limits>
+ 
+ 
+ class CSMFGroundDrawer;
+diff --git a/rts/Sim/Weapons/WeaponLoader.cpp b/rts/Sim/Weapons/WeaponLoader.cpp
+index fd98590971..771d830583 100644
+--- a/rts/Sim/Weapons/WeaponLoader.cpp
++++ b/rts/Sim/Weapons/WeaponLoader.cpp
+@@ -26,6 +26,8 @@
+ #include "Sim/Units/UnitDef.h"
+ #include "System/Log/ILog.h"
+ 
++#include <limits>
++
+ static std::array<uint8_t, 2048> udWeaponCounts;
+ 
+ WeaponMemPool weaponMemPool;