[arch-commits] Commit in flightgear/repos (6 files)
Sergej Pupykin
spupykin at archlinux.org
Mon Nov 28 12:53:56 UTC 2016
Date: Monday, November 28, 2016 @ 12:53:55
Author: spupykin
Revision: 197126
archrelease: copy trunk to community-i686, community-x86_64
Added:
flightgear/repos/community-i686/PKGBUILD
(from rev 197125, flightgear/trunk/PKGBUILD)
flightgear/repos/community-x86_64/PKGBUILD
(from rev 197125, flightgear/trunk/PKGBUILD)
Deleted:
flightgear/repos/community-i686/PKGBUILD
flightgear/repos/community-i686/build-fix.patch
flightgear/repos/community-x86_64/PKGBUILD
flightgear/repos/community-x86_64/build-fix.patch
----------------------------------+
/PKGBUILD | 86 +++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 50 ---------------------
community-i686/build-fix.patch | 20 --------
community-x86_64/PKGBUILD | 50 ---------------------
community-x86_64/build-fix.patch | 20 --------
5 files changed, 86 insertions(+), 140 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-11-28 12:53:34 UTC (rev 197125)
+++ community-i686/PKGBUILD 2016-11-28 12:53:55 UTC (rev 197126)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: William Rea <sillywilly at gmail.com>
-# Contributor: Hans Janssen <hans at janserv.xs4all.nl>
-
-pkgname=flightgear
-pkgver=2016.4.1
-_pkgver=2016.4
-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' 'qt5-base')
-optdepends=('qt5-base: fgfs --launcher')
-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')
-
-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/PKGBUILD (from rev 197125, flightgear/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-11-28 12:53:55 UTC (rev 197126)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: William Rea <sillywilly at gmail.com>
+# Contributor: Hans Janssen <hans at janserv.xs4all.nl>
+
+pkgname=flightgear
+pkgver=2016.4.2
+_pkgver=${pkgver%.*}
+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' 'qt5-base')
+optdepends=('qt5-base: fgfs --launcher')
+license=("GPL")
+url="http://www.flightgear.org/"
+options=('!makeflags')
+source=("http://downloads.sourceforge.net/project/flightgear/release-${_pkgver}/${pkgname}-${pkgver}.tar.bz2")
+sha256sums=('c42f3b6e3f5f15fa0b9f5b56682d50319c648f45a4671d5b58d82f2468f793b7')
+
+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
+}
Deleted: community-i686/build-fix.patch
===================================================================
--- community-i686/build-fix.patch 2016-11-28 12:53:34 UTC (rev 197125)
+++ community-i686/build-fix.patch 2016-11-28 12:53:55 UTC (rev 197126)
@@ -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) :
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-11-28 12:53:34 UTC (rev 197125)
+++ community-x86_64/PKGBUILD 2016-11-28 12:53:55 UTC (rev 197126)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: William Rea <sillywilly at gmail.com>
-# Contributor: Hans Janssen <hans at janserv.xs4all.nl>
-
-pkgname=flightgear
-pkgver=2016.4.1
-_pkgver=2016.4
-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' 'qt5-base')
-optdepends=('qt5-base: fgfs --launcher')
-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')
-
-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-x86_64/PKGBUILD (from rev 197125, flightgear/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-11-28 12:53:55 UTC (rev 197126)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: William Rea <sillywilly at gmail.com>
+# Contributor: Hans Janssen <hans at janserv.xs4all.nl>
+
+pkgname=flightgear
+pkgver=2016.4.2
+_pkgver=${pkgver%.*}
+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' 'qt5-base')
+optdepends=('qt5-base: fgfs --launcher')
+license=("GPL")
+url="http://www.flightgear.org/"
+options=('!makeflags')
+source=("http://downloads.sourceforge.net/project/flightgear/release-${_pkgver}/${pkgname}-${pkgver}.tar.bz2")
+sha256sums=('c42f3b6e3f5f15fa0b9f5b56682d50319c648f45a4671d5b58d82f2468f793b7')
+
+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
+}
Deleted: community-x86_64/build-fix.patch
===================================================================
--- community-x86_64/build-fix.patch 2016-11-28 12:53:34 UTC (rev 197125)
+++ community-x86_64/build-fix.patch 2016-11-28 12:53:55 UTC (rev 197126)
@@ -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) :
More information about the arch-commits
mailing list