Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=da8f088cd10d21dd744c2db65cbccc654e6d97b0
commit da8f088cd10d21dd744c2db65cbccc654e6d97b0 Author: DeX77 <[email protected]> Date: Sun Jun 28 21:04:36 2015 +0200 spring-99.0-1-x86_64 * version bump diff --git a/source/games-extra/spring/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch b/source/games-extra/spring/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch deleted file mode 100644 index dc9f58f..0000000 --- a/source/games-extra/spring/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9e0db5f602407de4e7875ca85761b41782c1bb9c Mon Sep 17 00:00:00 2001 -From: Johan Rehnberg <[email protected]> -Date: Wed, 31 Dec 2014 11:35:19 +0100 -Subject: [PATCH] fix GetListOfSubModules to support GLOB returning both "//" - and "/" - -I needed this when building on archlinux with cmake 3.1.0 where GLOB returns "/" ---- - rts/build/cmake/Util.cmake | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/rts/build/cmake/Util.cmake b/rts/build/cmake/Util.cmake -index 9f49e54..e23db7b 100644 ---- a/rts/build/cmake/Util.cmake -+++ b/rts/build/cmake/Util.cmake -@@ -166,10 +166,11 @@ EndFunction (MakeGlobal) - # Find all CMakeLists.txt files in sub-directories - Macro (GetListOfSubModules list_var) - File(GLOB ${list_var} RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" FOLLOW_SYMLINKS "${CMAKE_CURRENT_SOURCE_DIR}/*/CMakeLists.txt") -- - # Strip away the "/CMakeLists.txt" parts, so we end up with just a list of dirs, - # for example: AAI;RAI;KAIK -- String(REPLACE "//CMakeLists.txt" "" ${list_var} "${${list_var}}") -+ # GLOB can prefix with "//" or "/" (perhaps changed in cmake 3.1.0), this double replace will support both "//" and "/" -+ String(REPLACE "/CMakeLists.txt" "" ${list_var} "${${list_var}}") -+ String(REPLACE "/" "" ${list_var} "${${list_var}}") - EndMacro (GetListOfSubModules list_var) - - --- -2.2.1 - diff --git a/source/games-extra/spring/FrugalBuild b/source/games-extra/spring/FrugalBuild index 21a50d3..cb887c4 100644 --- a/source/games-extra/spring/FrugalBuild +++ b/source/games-extra/spring/FrugalBuild @@ -4,13 +4,13 @@ # Contributor: Devil505 <[email protected]> pkgname=spring -pkgver=98.0 -pkgrel=4 +pkgver=99.0 +pkgrel=1 pkgdesc="A free 3D game engine for the real-time-strategy (RTS) game Total Annihilation" url="http://spring.clan-sy.com"; depends=('glew>=1.12' 'devil' 'libboost>=1.58.0' 'sdl2' 'libxmu' 'libxi' 'libgl' 'libtiff' \ 'libjpeg>=8a' 'libsm' 'libxcb' 'libxdamage' 'e2fsprogs' 'openal>=1.15.1' \ - 'libvorbis' 'freetype2' 'libxcursor' 'libglu') + 'libvorbis' 'freetype2' 'libxcursor' 'libglu' 'libunwind') makedepends=('xz>=5.0.3' 'boost>=1.58.0' '7zip' 'asciidoc' 'docbook-xsl') _F_sourceforge_ext="_src.tar.gz" _F_sourceforge_dirname="springrts" @@ -26,11 +26,9 @@ options=('asneeded' 'scriptlet') groups=('games-extra') archs=('i686' 'x86_64') source=(${source[@]} \ - http://springfiles.com/sites/default/files/downloads/spring/spring-maps/DeltaSiegeDry.sd7 \ - 0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch) -sha1sums=('30dea8615ba23524fb16add29f60b76a1dd3436c' \ - 'd24892f8ad284a83b878612a3d3b20daf7e2b98a' \ - 'a7cf0c066db4c7eb0fc379526bd4cc58d8d8b71e') + http://springfiles.com/sites/default/files/downloads/spring/spring-maps/DeltaSiegeDry.sd7) +sha1sums=('c2d9dd013b6b041e5ff46ccc9a0c1bd696643dae' \ + 'd24892f8ad284a83b878612a3d3b20daf7e2b98a') build() _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
