[arch-commits] Commit in flightgear/trunk (PKGBUILD build-fix.patch)

[Sergej Pupykin]

    Date: Tuesday, May 17, 2016 @ 23:46:37
  Author: spupykin
Revision: 175596

upgpkg: flightgear 2016.2.1-1

upd

Added:
  flightgear/trunk/build-fix.patch
Modified:
  flightgear/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   16 +++++++++++-----
 build-fix.patch |   20 ++++++++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-17 20:53:52 UTC (rev 175595)
+++ PKGBUILD	2016-05-17 21:46:37 UTC (rev 175596)
@@ -4,8 +4,8 @@
 # Contributor: Hans Janssen <hans at janserv.xs4all.nl>
 
 pkgname=flightgear
-pkgver=2016.1.2
-_pkgver=2016.1
+pkgver=2016.2.1
+_pkgver=2016.2
 pkgrel=1
 pkgdesc="An open-source, multi-platform flight simulator"
 arch=(i686 x86_64)
@@ -14,10 +14,16 @@
 license=("GPL")
 url="http://www.flightgear.org/"
 options=('!makeflags')
-source=("http://downloads.sourceforge.net/project/flightgear/release-${_pkgver}/${pkgname}-${pkgver}.tar.bz2")
-#source=("git://git.code.sf.net/p/flightgear/flightgear#commit=74356e84f70c7c6504fd6711b8e3272184c6ad56")
-md5sums=('4638df5b260b25860aff4dbe4bef5021')
+source=("http://downloads.sourceforge.net/project/flightgear/release-${_pkgver}/${pkgname}-${pkgver}.tar.bz2"
+	"build-fix.patch")
+md5sums=('04b4817ba9d8953013c43f5f201b495f'
+         'b3d60c225955fd4b8d80ac2087288e43')
 
+prepare() {
+  cd $srcdir/flightgear-$pkgver
+  patch -p1 -i $srcdir/build-fix.patch
+}
+
 build() {
   cd $srcdir/flightgear-$pkgver
   cmake \

Added: build-fix.patch
===================================================================
--- build-fix.patch	                        (rev 0)
+++ build-fix.patch	2016-05-17 21:46:37 UTC (rev 175596)
@@ -0,0 +1,20 @@
+diff -wbBur flightgear-2016.2.1.org/src/Navaids/PositionedOctree.hxx flightgear-2016.2.1/src/Navaids/PositionedOctree.hxx
+--- flightgear-2016.2.1.org/src/Navaids/PositionedOctree.hxx	2016-05-17 11:36:25.000000000 +0300
++++ flightgear-2016.2.1/src/Navaids/PositionedOctree.hxx	2016-05-17 21:20:17.788837738 +0300
+@@ -31,6 +31,7 @@
+ #include <cassert>
+ #include <map>
+ #include <functional>
++#include <cmath>
+ 
+ // SimGear
+ #include <simgear/math/SGGeometry.hxx>
+@@ -60,7 +61,7 @@
+     _order(x),
+     _inner(v)
+     {
+-      assert(!isnan(x));
++      assert(!std::isnan(x));
+     }
+     
+     Ordered(const Ordered<T>& a) :