Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=aaa29167c186d24740ceae5dfa6dc8d5fec65a95
commit aaa29167c186d24740ceae5dfa6dc8d5fec65a95 Author: James Buren <[email protected]> Date: Mon Sep 5 20:36:24 2011 -0500 spring-0.82.7.1-3-i686 * rebuild with xz * drop deprecated lzma package * add gcc 4.6 fixes diff --git a/source/games-extra/spring/FrugalBuild b/source/games-extra/spring/FrugalBuild index 3b7a308..8ff1d90 100644 --- a/source/games-extra/spring/FrugalBuild +++ b/source/games-extra/spring/FrugalBuild @@ -3,11 +3,11 @@ pkgname=spring pkgver=0.82.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="A free 3D game engine for the real-time-strategy (RTS) game Total Annihilation" depends=('glew' 'devil' 'libboost>=1.46.1' 'sdl' 'libxmu' 'libxi' 'libgl' 'libtiff' 'libjpeg>=8a' \ 'libsm' 'libxcb' 'libxdamage' 'e2fsprogs' 'openal' 'libvorbis' 'freetype2' 'libxcursor' 'openal') -makedepends=('lzma' 'boost' '7zip') +makedepends=('xz>=5.0.3' 'boost' '7zip') _F_sourceforge_ext="_src.tar.gz" _F_sourceforge_dirname="springrts" _F_sourceforge_sep="_" @@ -18,9 +18,12 @@ archs=('i686' 'x86_64') _F_cd_path="${pkgname}_${pkgver}" _F_cmake_confopts="-DCMAKE_INSTALL_PREFIX=/usr -DDATADIR=share/spring -DUSE_GML_SIM=ON -DUSE_GML=ON" Finclude cmake -source=($source README.Frugalware) +source=(${source[@]} README.Frugalware $pkgname-gcc-4.6.patch) sha1sums=('fa337d80671c26ebc19b9af3cc0c906b209763c6' \ - '5721b8c82c14fbfc895f86cbfbd7a1b00dcbc894') + '5721b8c82c14fbfc895f86cbfbd7a1b00dcbc894' \ + '8e68c91d397940b3a373fdee61e0532f3a58aad6') +# GCC 4.6 fix +CXXFLAGS="$CXXFLAGS -fpermissive" build() { CMake_build diff --git a/source/games-extra/spring/spring-gcc-4.6.patch b/source/games-extra/spring/spring-gcc-4.6.patch new file mode 100644 index 0000000..0360f98 --- /dev/null +++ b/source/games-extra/spring/spring-gcc-4.6.patch @@ -0,0 +1,33 @@ +diff -aur a/AI/Skirmish/E323AI/AAStar.h b/AI/Skirmish/E323AI/AAStar.h +--- a/AI/Skirmish/E323AI/AAStar.h 2011-01-07 18:45:27.000000000 -0600 ++++ b/AI/Skirmish/E323AI/AAStar.h 2011-09-05 20:12:27.684082517 -0500 +@@ -1,6 +1,7 @@ + #ifndef E323ASTAR_H + #define E323ASTAR_H + ++#include <cstddef> + #include <queue> + #include <vector> + #include <list> +diff -aur a/rts/Rendering/GLContext.h b/rts/Rendering/GLContext.h +--- a/rts/Rendering/GLContext.h 2011-01-07 18:45:23.000000000 -0600 ++++ b/rts/Rendering/GLContext.h 2011-09-05 20:24:56.633049898 -0500 +@@ -23,6 +23,7 @@ + // (use "data" for the pointer to the instance). + + // TODO: add event driven system (like alttab, resolution changed, dualscreen, ...) ++#include <cstddef> + + namespace GLContext + { +diff -aur a/rts/System/MemPool.h b/rts/System/MemPool.h +--- a/rts/System/MemPool.h 2011-01-07 18:45:23.000000000 -0600 ++++ b/rts/System/MemPool.h 2011-09-05 20:29:02.515044723 -0500 +@@ -3,6 +3,7 @@ + #ifndef _MEM_POOL_H_ + #define _MEM_POOL_H_ + ++#include <cstddef> + #include <new> + + const size_t MAX_MEM_SIZE=200; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
