Date: Monday, January 9, 2023 @ 22:46:54
Author: svenstaro
Revision: 1382194
archrelease: copy trunk to community-x86_64
Added:
spring/repos/community-x86_64/PKGBUILD
(from rev 1382193, spring/trunk/PKGBUILD)
spring/repos/community-x86_64/spring-gcc12.patch
(from rev 1382193, spring/trunk/spring-gcc12.patch)
Deleted:
spring/repos/community-x86_64/PKGBUILD
spring/repos/community-x86_64/spring-gcc11.patch
--------------------+
PKGBUILD | 94 ++++++++++++++++++++++++++++-----------------------
spring-gcc11.patch | 25 -------------
spring-gcc12.patch | 28 +++++++++++++++
3 files changed, 81 insertions(+), 66 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-09 22:46:45 UTC (rev 1382193)
+++ PKGBUILD 2023-01-09 22:46:54 UTC (rev 1382194)
@@ -1,41 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <[email protected]>
-# 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:
Copied: spring/repos/community-x86_64/PKGBUILD (from rev 1382193,
spring/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-01-09 22:46:54 UTC (rev 1382194)
@@ -0,0 +1,53 @@
+# Maintainer: Sven-Hendrik Haase <[email protected]>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=spring
+pkgver=106.0
+pkgrel=2
+pkgdesc='A free 3D real-time-strategy (RTS) game engine'
+arch=('x86_64')
+url="http://springrts.com/";
+license=('GPL')
+depends=('openal' 'glew' 'minizip' 'freetype2' 'devil' 'libvorbis' 'sdl2'
'libunwind'
+ 'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils' 'libx11'
'jsoncpp')
+makedepends=('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";
+ spring-gcc12.patch)
+sha512sums=('d76bec4cc106ed23f09699d702b9d14b76e32f4e34beac2313268c2ef29f6379a970efaee209d4db5dc7c6323d1a47882b10c5c4faa0744087fada227ed91f7b'
+
'68bbffe545fe5200ab7273954a1aad7fdc67ba904a0a3d86f9fb6b02cd2e716ab9623da8b8bf92c1efda269b161ee28432aa7e0f8899ad914491648fae13e34a')
+
+prepare() {
+ cd spring_$pkgver
+
+ patch -Np1 -i ../spring-gcc12.patch
+ #remove bundled libraries
+ rm -r tools/pr-downloader/src/lib/jsoncpp
+ rm -r tools/pr-downloader/src/lib/minizip
+}
+
+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 \
+ -DPRD_JSONCPP_INTERNAL=OFF
+ 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 2023-01-09 22:46:45 UTC (rev 1382193)
+++ spring-gcc11.patch 2023-01-09 22:46:54 UTC (rev 1382194)
@@ -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-gcc12.patch (from rev 1382193,
spring/trunk/spring-gcc12.patch)
===================================================================
--- spring-gcc12.patch (rev 0)
+++ spring-gcc12.patch 2023-01-09 22:46:54 UTC (rev 1382194)
@@ -0,0 +1,28 @@
+From addd1eb2995aed10fd9bcb5c97bbb00872728a85 Mon Sep 17 00:00:00 2001
+From: Elperson <[email protected]>
+Date: Wed, 20 Jul 2022 17:02:07 +0200
+Subject: [PATCH] Fix compile error (#574)
+
+---
+ rts/Lua/LuaObjectRendering.h | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/rts/Lua/LuaObjectRendering.h b/rts/Lua/LuaObjectRendering.h
+index 13ecc7562bd..7e63ab5c4cb 100644
+--- a/rts/Lua/LuaObjectRendering.h
++++ b/rts/Lua/LuaObjectRendering.h
+@@ -11,13 +11,10 @@ struct lua_State;
+ template<LuaObjType T> class LuaObjectRendering;
+
+ class LuaObjectRenderingImpl {
+-#if __GNUC__ == 11
+ public:
+-#else
+-private:
+ friend class LuaObjectRendering<LUAOBJ_UNIT>;
+ friend class LuaObjectRendering<LUAOBJ_FEATURE>;
+-#endif
++
+ static void CreateMatRefMetatable(lua_State* L);
+ static void PushFunction(lua_State* L, int (*fnPntr)(lua_State*), const
char* fnName);
+
