[arch-commits] Commit in spring/trunk (PKGBUILD optional.patch)

[Sven-Hendrik Haase]

    Date: Saturday, August 16, 2014 @ 12:40:38
  Author: svenstaro
Revision: 117451

upgpkg: spring 97.0-2

boost 1.56.0 rebuild

Added:
  spring/trunk/optional.patch
Modified:
  spring/trunk/PKGBUILD

----------------+
 PKGBUILD       |   11 +++++++----
 optional.patch |   19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-16 05:01:25 UTC (rev 117450)
+++ PKGBUILD	2014-08-16 10:40:38 UTC (rev 117451)
@@ -5,7 +5,7 @@
 
 pkgname=spring
 pkgver=97.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64')
 url="http://springrts.com/"
@@ -16,8 +16,10 @@
 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=('cf37518379c2a3a8c3c9cd689ee9b034')
+source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
+        optional.patch)
+md5sums=('cf37518379c2a3a8c3c9cd689ee9b034'
+         'd7904319b17c32299b44594ccb6ff4ea')
 
 build() {
   bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
@@ -25,10 +27,11 @@
   cd spring_${pkgver}
 
   sed -i "/ory(test)/d" tools/unitsync/CMakeLists.txt
+  patch -Np1 < $srcdir/optional.patch
 
   cmake	. \
     -DCMAKE_INSTALL_PREFIX=/usr \
-	-DDATADIR=share/spring \
+    -DDATADIR=share/spring \
     -DCMAKE_SKIP_RPATH=YES
   make
 }

Added: optional.patch
===================================================================
--- optional.patch	                        (rev 0)
+++ optional.patch	2014-08-16 10:40:38 UTC (rev 117451)
@@ -0,0 +1,19 @@
+diff --git a/rts/System/ThreadPool.cpp b/rts/System/ThreadPool.cpp
+index 0ce4b11..34e53ab 100644
+--- a/rts/System/ThreadPool.cpp
++++ b/rts/System/ThreadPool.cpp
+@@ -136,12 +136,11 @@ static bool DoTask(boost::shared_lock<boost::shared_mutex>& lk_)
+ static bool DoTask(std::shared_ptr<ITaskGroup> tg)
+ {
+ 	auto p = tg->GetTask();
+-	const bool f = p;
+-	if (f) {
++	if (p) {
+ 		SCOPED_MT_TIMER("::ThreadWorkers (accumulated)");
+ 		(*p)();
+ 	}
+-	return f;
++	return static_cast<bool>(p);
+ }
+ 
+