Date: Tuesday, May 17, 2016 @ 23:46:52
Author: spupykin
Revision: 175597
archrelease: copy trunk to community-i686
Added:
flightgear/repos/community-i686/PKGBUILD
(from rev 175596, flightgear/trunk/PKGBUILD)
flightgear/repos/community-i686/build-fix.patch
(from rev 175596, flightgear/trunk/build-fix.patch)
Deleted:
flightgear/repos/community-i686/PKGBUILD
-----------------+
PKGBUILD | 92 ++++++++++++++++++++++++++++--------------------------
build-fix.patch | 20 +++++++++++
2 files changed, 69 insertions(+), 43 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-05-17 21:46:37 UTC (rev 175596)
+++ PKGBUILD 2016-05-17 21:46:52 UTC (rev 175597)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Maintainer: William Rea <sillywi...@gmail.com>
-# Contributor: Hans Janssen <h...@janserv.xs4all.nl>
-
-pkgname=flightgear
-pkgver=2016.1.2
-_pkgver=2016.1
-pkgrel=1
-pkgdesc="An open-source, multi-platform flight simulator"
-arch=(i686 x86_64)
-depends=('libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr'
'glu' 'openal')
-makedepends=('boost' 'cmake' 'mesa' 'sharutils' 'simgear')
-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')
-
-build() {
- cd $srcdir/flightgear-$pkgver
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DFG_DATA_DIR:STRING="/usr/share/flightgear/data" .
- uudecode -o package/flightgear.png package/flightgear.png.uue
- make
- sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|'
package/flightgear.desktop
-}
-
-package() {
- depends=(${depends[@]} 'flightgear-data')
-
- cd $srcdir/flightgear-$pkgver
- make DESTDIR=$pkgdir install
-
- install -Dm0644 package/flightgear.desktop
$pkgdir/usr/share/applications/flightgear.desktop
- install -Dm0644 package/flightgear.ico $pkgdir/usr/share/icons/flightgear.ico
- install -Dm0644 package/flightgear.png $pkgdir/usr/share/icons/flightgear.png
- install -Dm0644 scripts/completion/fg-completion.bash
$pkgdir/usr/share/bash-completion/completions/fgfs
- ln -sf flightgear $pkgdir/usr/share/FlightGear
-}
Copied: flightgear/repos/community-i686/PKGBUILD (from rev 175596,
flightgear/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-05-17 21:46:52 UTC (rev 175597)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Maintainer: William Rea <sillywi...@gmail.com>
+# Contributor: Hans Janssen <h...@janserv.xs4all.nl>
+
+pkgname=flightgear
+pkgver=2016.2.1
+_pkgver=2016.2
+pkgrel=1
+pkgdesc="An open-source, multi-platform flight simulator"
+arch=(i686 x86_64)
+depends=('libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr'
'glu' 'openal')
+makedepends=('boost' 'cmake' 'mesa' 'sharutils' 'simgear')
+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")
+md5sums=('04b4817ba9d8953013c43f5f201b495f'
+ 'b3d60c225955fd4b8d80ac2087288e43')
+
+prepare() {
+ cd $srcdir/flightgear-$pkgver
+ patch -p1 -i $srcdir/build-fix.patch
+}
+
+build() {
+ cd $srcdir/flightgear-$pkgver
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DFG_DATA_DIR:STRING="/usr/share/flightgear/data" .
+ uudecode -o package/flightgear.png package/flightgear.png.uue
+ make
+ sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|'
package/flightgear.desktop
+}
+
+package() {
+ depends=(${depends[@]} 'flightgear-data')
+
+ cd $srcdir/flightgear-$pkgver
+ make DESTDIR=$pkgdir install
+
+ install -Dm0644 package/flightgear.desktop
$pkgdir/usr/share/applications/flightgear.desktop
+ install -Dm0644 package/flightgear.ico $pkgdir/usr/share/icons/flightgear.ico
+ install -Dm0644 package/flightgear.png $pkgdir/usr/share/icons/flightgear.png
+ install -Dm0644 scripts/completion/fg-completion.bash
$pkgdir/usr/share/bash-completion/completions/fgfs
+ ln -sf flightgear $pkgdir/usr/share/FlightGear
+}
Copied: flightgear/repos/community-i686/build-fix.patch (from rev 175596,
flightgear/trunk/build-fix.patch)
===================================================================
--- build-fix.patch (rev 0)
+++ build-fix.patch 2016-05-17 21:46:52 UTC (rev 175597)
@@ -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) :
