[arch-commits] Commit in flightgear/repos/community-x86_64 (3 files)
Sergej Pupykin
spupykin at archlinux.org
Mon Dec 19 15:42:10 UTC 2016
Date: Monday, December 19, 2016 @ 15:42:09
Author: spupykin
Revision: 200319
archrelease: copy trunk to community-x86_64
Added:
flightgear/repos/community-x86_64/PKGBUILD
(from rev 200318, flightgear/trunk/PKGBUILD)
flightgear/repos/community-x86_64/sec-fix.patch
(from rev 200318, flightgear/trunk/sec-fix.patch)
Deleted:
flightgear/repos/community-x86_64/PKGBUILD
---------------+
PKGBUILD | 93 ++++++++++++++++++++++++++++++--------------------------
sec-fix.patch | 42 +++++++++++++++++++++++++
2 files changed, 92 insertions(+), 43 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-12-19 15:08:17 UTC (rev 200318)
+++ PKGBUILD 2016-12-19 15:42:09 UTC (rev 200319)
@@ -1,43 +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.3
-_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=('35a9c439265e4a9caf794458bb42917d93280b2e561cc7b9a02aaba1226d2822')
-
-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 200318, flightgear/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-12-19 15:42:09 UTC (rev 200319)
@@ -0,0 +1,50 @@
+# $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.3
+_pkgver=${pkgver%.*}
+pkgrel=2
+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"
+ sec-fix.patch)
+sha256sums=('35a9c439265e4a9caf794458bb42917d93280b2e561cc7b9a02aaba1226d2822'
+ 'c45d9596ee8269594ee600e3fe1de10422f202c2ce4b3fb733062ce92f37b11b')
+
+prepare() {
+ cd "$srcdir"/flightgear-$pkgver
+ patch -p1 -i $srcdir/sec-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/sec-fix.patch (from rev 200318, flightgear/trunk/sec-fix.patch)
===================================================================
--- sec-fix.patch (rev 0)
+++ sec-fix.patch 2016-12-19 15:42:09 UTC (rev 200319)
@@ -0,0 +1,42 @@
+--- a/src/Autopilot/route_mgr.cxx
++++ b/src/Autopilot/route_mgr.cxx
+@@ -44,6 +44,7 @@
+ #include <simgear/timing/sg_time.hxx>
+ #include <simgear/sg_inlines.h>
+
++#include <Main/globals.hxx>
+ #include "Main/fg_props.hxx"
+ #include "Navaids/positioned.hxx"
+ #include <Navaids/waypoint.hxx>
+@@ -54,6 +55,8 @@
+ #include "Airports/runways.hxx"
+ #include <GUI/new_gui.hxx>
+ #include <GUI/dialog.hxx>
++#include <Main/util.hxx> // fgValidatePath()
++#include <GUI/MessageBox.hxx>
+
+ #define RM "/autopilot/route-manager/"
+
+@@ -709,7 +712,21 @@
+ mgr->loadRoute(path);
+ } else if (!strcmp(s, "@SAVE")) {
+ SGPath path(mgr->_pathNode->getStringValue());
+- mgr->saveRoute(path);
++ SGPath authorizedPath = fgValidatePath(path, true /* write */);
++
++ if (!authorizedPath.isNull()) {
++ mgr->saveRoute(authorizedPath);
++ } else {
++ std::string msg =
++ "The route manager was asked to write the flightplan to '" +
++ path.utf8Str() + "', but this path is not authorized for writing. " +
++ "Please choose another location, for instance in the $FG_HOME/Export "
++ "folder (" + (globals->get_fg_home() / "Export").utf8Str() + ").";
++
++ SG_LOG(SG_AUTOPILOT, SG_ALERT, msg);
++ modalMessageBox("FlightGear", "Unable to write to the specified file",
++ msg);
++ }
+ } else if (!strcmp(s, "@NEXT")) {
+ mgr->jumpToIndex(mgr->currentIndex() + 1);
+ } else if (!strcmp(s, "@PREVIOUS")) {
More information about the arch-commits
mailing list