Date: Monday, November 28, 2016 @ 12:53:34
Author: spupykin
Revision: 197125
upgpkg: flightgear 2016.4.2-1
upd
Modified:
flightgear/trunk/PKGBUILD
Deleted:
flightgear/trunk/build-fix.patch
-----------------+
PKGBUILD | 15 ++++-----------
build-fix.patch | 20 --------------------
2 files changed, 4 insertions(+), 31 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-11-28 12:36:53 UTC (rev 197124)
+++ PKGBUILD 2016-11-28 12:53:34 UTC (rev 197125)
@@ -4,8 +4,8 @@
# Contributor: Hans Janssen <h...@janserv.xs4all.nl>
pkgname=flightgear
-pkgver=2016.4.1
-_pkgver=2016.4
+pkgver=2016.4.2
+_pkgver=${pkgver%.*}
pkgrel=1
pkgdesc="An open-source, multi-platform flight simulator"
arch=(i686 x86_64)
@@ -15,16 +15,9 @@
license=("GPL")
url="http://www.flightgear.org/";
options=('!makeflags')
-source=("http://downloads.sourceforge.net/project/flightgear/release-${_pkgver}/${pkgname}-${pkgver}.tar.bz2";
- "build-fix.patch")
-sha256sums=('714183cd1e3eb926b0a37dca0192981aef791ca369a238afdaa05e4f4b91efc8'
- '439a9a63b6a6c7e3cfc647946bb1f749022c27d921aad574a17d1cf575256ed2')
+source=("http://downloads.sourceforge.net/project/flightgear/release-${_pkgver}/${pkgname}-${pkgver}.tar.bz2";)
+sha256sums=('c42f3b6e3f5f15fa0b9f5b56682d50319c648f45a4671d5b58d82f2468f793b7')
-prepare() {
- cd "$srcdir"/flightgear-$pkgver
-# patch -p1 -i "$srcdir"/build-fix.patch
-}
-
build() {
cd "$srcdir"/flightgear-$pkgver
cmake \
Deleted: build-fix.patch
===================================================================
--- build-fix.patch 2016-11-28 12:36:53 UTC (rev 197124)
+++ build-fix.patch 2016-11-28 12:53:34 UTC (rev 197125)
@@ -1,20 +0,0 @@
-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) :
