[arch-commits] Commit in flightgear/repos/community-x86_64 (3 files)

[Sergej Pupykin]

    Date: Monday, February 27, 2017 @ 15:57:38
  Author: spupykin
Revision: 214057

archrelease: copy trunk to community-x86_64

Added:
  flightgear/repos/community-x86_64/PKGBUILD
    (from rev 214056, flightgear/trunk/PKGBUILD)
Deleted:
  flightgear/repos/community-x86_64/PKGBUILD
  flightgear/repos/community-x86_64/sec-fix.patch

---------------+
 PKGBUILD      |   95 +++++++++++++++++++++++++-------------------------------
 sec-fix.patch |   42 ------------------------
 2 files changed, 44 insertions(+), 93 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-27 15:01:15 UTC (rev 214056)
+++ PKGBUILD	2017-02-27 15:57:38 UTC (rev 214057)
@@ -1,51 +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.4
-_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=('d51992cbe40f1812f9821ab27b838d52e04c10551772d57fc2e815f4444dfafc'
-            '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
-  install -Dm0644 scripts/completion/fg-completion.zsh "$pkgdir"/usr/share/zsh/site-functions/_fgfs
-  ln -sf flightgear "$pkgdir"/usr/share/FlightGear
-}

Copied: flightgear/repos/community-x86_64/PKGBUILD (from rev 214056, flightgear/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-02-27 15:57:38 UTC (rev 214057)
@@ -0,0 +1,44 @@
+# $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=2017.1.1
+_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=('8f98bbdc027164564cddf660856e0b2f4924c5c9b6a32735b14cd57b4338a028')
+
+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
+  install -Dm0644 scripts/completion/fg-completion.zsh "$pkgdir"/usr/share/zsh/site-functions/_fgfs
+  ln -sf flightgear "$pkgdir"/usr/share/FlightGear
+}

Deleted: sec-fix.patch
===================================================================
--- sec-fix.patch	2017-02-27 15:01:15 UTC (rev 214056)
+++ sec-fix.patch	2017-02-27 15:57:38 UTC (rev 214057)
@@ -1,42 +0,0 @@
---- 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")) {