diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index f6433bd..100c3ff 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -9,13 +9,24 @@ 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') +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") -sha512sums=('d76bec4cc106ed23f09699d702b9d14b76e32f4e34beac2313268c2ef29f6379a970efaee209d4db5dc7c6323d1a47882b10c5c4faa0744087fada227ed91f7b') +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 @@ -25,7 +36,8 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DDATADIR=share/spring \ -DJAVA_HOME=/usr/lib/jvm/java-8-openjdk \ - -DCMAKE_SKIP_RPATH=ON + -DCMAKE_SKIP_RPATH=ON \ + -DPRD_JSONCPP_INTERNAL=OFF make -C build } diff --git a/trunk/spring-gcc11.patch b/trunk/spring-gcc11.patch deleted file mode 100644 index 4b70fc0..0000000 --- a/trunk/spring-gcc11.patch +++ /dev/null @@ -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 - #include -+#include - - - 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 -+ - static std::array udWeaponCounts; - - WeaponMemPool weaponMemPool; diff --git a/trunk/spring-gcc12.patch b/trunk/spring-gcc12.patch new file mode 100644 index 0000000..1cdb11c --- /dev/null +++ b/trunk/spring-gcc12.patch @@ -0,0 +1,28 @@ +From addd1eb2995aed10fd9bcb5c97bbb00872728a85 Mon Sep 17 00:00:00 2001 +From: Elperson <40611324+Elpersonn@users.noreply.github.com> +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 class LuaObjectRendering; + + class LuaObjectRenderingImpl { +-#if __GNUC__ == 11 + public: +-#else +-private: + friend class LuaObjectRendering; + friend class LuaObjectRendering; +-#endif ++ + static void CreateMatRefMetatable(lua_State* L); + static void PushFunction(lua_State* L, int (*fnPntr)(lua_State*), const char* fnName); +