[arch-commits] Commit in spring/repos/community-x86_64 (4 files)

[Sven-Hendrik Haase]

    Date: Monday, January 24, 2022 @ 00:08:32
  Author: svenstaro
Revision: 1114042

archrelease: copy trunk to community-x86_64

Added:
  spring/repos/community-x86_64/PKGBUILD
    (from rev 1114041, spring/trunk/PKGBUILD)
  spring/repos/community-x86_64/spring-gcc11.patch
    (from rev 1114041, spring/trunk/spring-gcc11.patch)
Deleted:
  spring/repos/community-x86_64/PKGBUILD
  spring/repos/community-x86_64/spring-gcc11.patch

--------------------+
 PKGBUILD           |   92 ++++++++++++++++++++++-----------------------------
 spring-gcc11.patch |   50 +++++++++++++--------------
 2 files changed, 66 insertions(+), 76 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-24 00:08:20 UTC (rev 1114041)
+++ PKGBUILD	2022-01-24 00:08:32 UTC (rev 1114042)
@@ -1,51 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=spring
-pkgver=105.0.1
-_commit=8581792
-pkgrel=2
-pkgdesc='A free 3D real-time-strategy (RTS) game engine'
-arch=('x86_64')
-url="http://springrts.com/"
-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' 'gcc10')
-optdepends=('python: python-based bots'
-            'java-runtime: java-based bots')
-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 \
-    -DJAVA_HOME=/usr/lib/jvm/java-8-openjdk \
-    -DCMAKE_SKIP_RPATH=ON
-  make
-}
-
-package() {
-  cd spring
-
-  DESTDIR="$pkgdir" make install
-
-  install -d "$pkgdir/etc/spring"
-  echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir"
-}
-
-# vim sw=2:ts=2 et:

Copied: spring/repos/community-x86_64/PKGBUILD (from rev 1114041, spring/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-01-24 00:08:32 UTC (rev 1114042)
@@ -0,0 +1,41 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at archlinux.org>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=spring
+pkgver=106.0
+pkgrel=1
+pkgdesc='A free 3D real-time-strategy (RTS) game engine'
+arch=('x86_64')
+url="http://springrts.com/"
+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')
+optdepends=('python: python-based bots'
+            'java-runtime: java-based bots')
+source=("https://springrts.com/dl/buildbot/default/master/106.0/source/spring_106.0_src.tar.gz")
+sha512sums=('d76bec4cc106ed23f09699d702b9d14b76e32f4e34beac2313268c2ef29f6379a970efaee209d4db5dc7c6323d1a47882b10c5c4faa0744087fada227ed91f7b')
+
+build() {
+  cd spring_$pkgver
+
+  cmake	\
+    -Bbuild \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DDATADIR=share/spring \
+    -DJAVA_HOME=/usr/lib/jvm/java-8-openjdk \
+    -DCMAKE_SKIP_RPATH=ON
+  make -C build
+}
+
+package() {
+  cd spring_$pkgver
+
+  DESTDIR="$pkgdir" make -C build install
+
+  install -d "$pkgdir/etc/spring"
+  echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir"
+}
+
+# vim sw=2:ts=2 et:

Deleted: spring-gcc11.patch
===================================================================
--- spring-gcc11.patch	2022-01-24 00:08:20 UTC (rev 1114041)
+++ spring-gcc11.patch	2022-01-24 00:08:32 UTC (rev 1114042)
@@ -1,25 +0,0 @@
-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;

Copied: spring/repos/community-x86_64/spring-gcc11.patch (from rev 1114041, spring/trunk/spring-gcc11.patch)
===================================================================
--- spring-gcc11.patch	                        (rev 0)
+++ spring-gcc11.patch	2022-01-24 00:08:32 UTC (rev 1114042)
@@ -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;