summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlen D'souza2016-11-08 16:23:24 +0530
committerGlen D'souza2016-11-08 16:23:24 +0530
commita6f243dc920b15fed1024d5426fde0f31ae91559 (patch)
treeb38199e0c036e21b7e3d06afa5e11d4ae3575336
parent8547c21b3eac623d1ce5b8a6689c4d35dc23039e (diff)
downloadaur-a6f243dc920b15fed1024d5426fde0f31ae91559.tar.gz
Remove patch - fixed upstream
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD15
-rw-r--r--fix.patch11
3 files changed, 5 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 43e0b3ca0fd9..0e5abfe88f04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Sep 6 16:35:53 UTC 2016
+# Tue Nov 8 10:51:27 UTC 2016
pkgbase = flightgear-git
pkgdesc = An open-source, multi-platform flight simulator
pkgver = 20160906
@@ -25,9 +25,7 @@ pkgbase = flightgear-git
provides = flightgear-git
conflicts = flightgear
source = git://git.code.sf.net/p/flightgear/flightgear
- source = fix.patch
md5sums = SKIP
- md5sums = a90265027eac1a61ec8f8eb5b6b4a03a
pkgname = flightgear-git
diff --git a/PKGBUILD b/PKGBUILD
index 26d4910d9944..76f26ecd91d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Glen Dsouza <glen@teameos.org>
+# Maintainer: Glen Dsouza <gdsouza@linuxmail.org>
# Contributor: jmf <jmf at mesecons dot net>
# Contributor: Pascal Groschwitz <p.groschwitz@googlemail.com>
pkgname=flightgear-git
-pkgver=20160906
+pkgver=20161108
pkgrel=1
_gitname=flightgear
pkgdesc="An open-source, multi-platform flight simulator"
@@ -14,20 +14,13 @@ optdepends=()
makedepends=('boost' 'cmake' 'mesa' 'sharutils' 'simgear-git')
provides=('flightgear-git')
conflicts=('flightgear')
-source=(git://git.code.sf.net/p/flightgear/flightgear
- fix.patch)
-md5sums=('SKIP'
- 'a90265027eac1a61ec8f8eb5b6b4a03a')
+source=(git://git.code.sf.net/p/flightgear/flightgear)
+md5sums=('SKIP')
pkgver() {
echo "$(date +"%Y%m%d")"
}
-prepare() {
- cd ${srcdir}
- patch -p0 -i fix.patch
-}
-
build() {
cd ${srcdir}/${_gitname}
git checkout next
diff --git a/fix.patch b/fix.patch
deleted file mode 100644
index ed758976dd9a..000000000000
--- a/fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- flightgear/src/Navaids/PositionedOctree.hxx 2016-05-15 18:05:44.904316000 +0530
-+++ flightgear/src/Navaids/PositionedOctree.hxx 2016-05-15 18:06:27.696729611 +0530
-@@ -60,7 +60,7 @@
- _order(x),
- _inner(v)
- {
-- assert(!isnan(x));
-+ assert(!std::isnan(x));
- }
-
- Ordered(const Ordered<T>& a) :