Date: Sunday, February 1, 2015 @ 01:27:57 Author: foutrelis Revision: 126892
upgpkg: spring 98.0-4 GLEW 1.12 rebuild. Added: spring/trunk/0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch Modified: spring/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch | 32 ++++++++++ PKGBUILD | 18 ++++- 2 files changed, 45 insertions(+), 5 deletions(-) Added: 0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch =================================================================== --- 0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch (rev 0) +++ 0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch 2015-02-01 00:27:57 UTC (rev 126892) @@ -0,0 +1,32 @@ +From 9e0db5f602407de4e7875ca85761b41782c1bb9c Mon Sep 17 00:00:00 2001 +From: Johan Rehnberg <cleanr...@gmail.com> +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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-02-01 00:23:09 UTC (rev 126891) +++ PKGBUILD 2015-02-01 00:27:57 UTC (rev 126892) @@ -5,7 +5,7 @@ pkgname=spring pkgver=98.0 -pkgrel=3 +pkgrel=4 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64') url="http://springrts.com/" @@ -16,14 +16,22 @@ optdepends=('python2: python-based bots' 'java-runtime: java-based bots') install=spring.install -source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma) -md5sums=('fbe60dff4d39918157869f45738e0a8a') +source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma + 0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch) +md5sums=('fbe60dff4d39918157869f45738e0a8a' + 'a8a8e5038439d43baaeac26585f5caf9') -build() { +prepare() { bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma - + cd spring_${pkgver} + patch -Np1 -i ../0001-fix-GetListOfSubModules-to-support-GLOB-returning-bo.patch +} + +build() { + cd spring_${pkgver} + cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATADIR=share/spring \