games/fgrun: Updated for version 1.6.2

8 files changed, 97 insertions, 21 deletions

diff --git a/games/fgrun/doinst.sh b/games/fgrun/doinst.sh
new file mode 100644
index 000000000000..4e8ba7071dea
--- /dev/null
+++ b/games/fgrun/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/games/fgrun/fgrun-1.6.1-fix-crash-when-setting-defaults.patch b/games/fgrun/fgrun-1.6.1-fix-crash-when-setting-defaults.patch
new file mode 100644
index 000000000000..52b56d4055c6
--- /dev/null
+++ b/games/fgrun/fgrun-1.6.1-fix-crash-when-setting-defaults.patch
@@ -0,0 +1,18 @@
+--- fgrun-1.6.1/src/wizard_funcs.cxx.orig	2012-02-27 22:56:08.000000000 +0100
++++ fgrun-1.6.1/src/wizard_funcs.cxx	2012-03-21 21:00:52.072609457 +0100
+@@ -1200,7 +1200,6 @@ Wizard::~Wizard()
+     aircraft->clear();
+ 
+     delete logwin;
+-    delete win;
+     delete adv;
+ }
+ 
+@@ -2265,7 +2264,6 @@ Wizard::reset_settings()
+     prefs.set( "time_of_day_value", "noon" );
+ 
+     aircraft->value( 0 );
+-    preview->make_current();
+     preview->clear();
+     preview->redraw();
+ 
diff --git a/games/fgrun/fgrun-1.6.2-fix-reloadpath-logic.patch b/games/fgrun/fgrun-1.6.2-fix-reloadpath-logic.patch
new file mode 100644
index 000000000000..0fb90069281d
--- /dev/null
+++ b/games/fgrun/fgrun-1.6.2-fix-reloadpath-logic.patch
@@ -0,0 +1,29 @@
+--- fgrun-1.6.2/src/wizard_funcs.cxx.orig	2012-09-11 14:57:53.176639212 +0200
++++ fgrun-1.6.2/src/wizard_funcs.cxx	2012-09-11 15:11:35.995000085 +0200
+@@ -296,7 +296,7 @@
+     {
+         fg_scenery = buf;
+     }
+-    else if (reloadPath && systemPrefs.get( "fg_scenery", buf, "", buflen-1))
++    else if (systemPrefs.get( "fg_scenery", buf, "", buflen-1))
+     {
+         fg_scenery = buf;
+         prefs.set("fg_scenery", buf);
+@@ -338,7 +338,7 @@
+     {
+         ts_dir = iVal;
+     }
+-    else if (reloadPath && systemPrefs.get("ts_dir", iVal, 0))
++    else if (systemPrefs.get("ts_dir", iVal, 0))
+     {
+         prefs.set("ts_dir", ts_dir);
+         systemPrefs.get("ts_dir_init", iVal, 0);
+@@ -353,7 +353,7 @@
+     {
+         ts_exe_->value(buf);
+     }
+-    else if (reloadPath && systemPrefs.get( "ts_exe", buf, "", buflen-1))
++    else if (systemPrefs.get( "ts_exe", buf, "", buflen-1))
+     {
+         ts_exe_->value( buf );
+         prefs.set("ts_exe", buf);
diff --git a/games/fgrun/fgrun.SlackBuild b/games/fgrun/fgrun.SlackBuild
index f118d932504c..944b6f20f208 100644
--- a/games/fgrun/fgrun.SlackBuild
+++ b/games/fgrun/fgrun.SlackBuild
@@ -3,16 +3,14 @@
 # Written by Diego Pantano <poplin.dp@gmail.com>
 
 PRGNAM=fgrun
-VERSION=${VERSION:-1.5.2}
+VERSION=${VERSION:-1.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -42,7 +40,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -51,32 +49,40 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-x \
-  --build=$ARCH-slackware-linux
+# Fix a few bugs.
+patch -p1 < $CWD/fgrun-1.6.1-fix-crash-when-setting-defaults.patch
+patch -p1 < $CWD/fgrun-1.6.2-fix-reloadpath-logic.patch
 
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make 
+  make install DESTDIR=$PKG
+cd ..
+
+mkdir -p $PKG/etc/fltk/flightgear.org
+install -m 0644 $CWD/fgrun.prefs $PKG/etc/fltk/flightgear.org/fgrun.prefs
+
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+install -m 0644 $CWD/fgrun.desktop $PKG/usr/share/applications/
+install -m 0644 $CWD/fgrun.png $PKG/usr/share/pixmaps/
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README* \
+  AUTHORS COPYING ChangeLog NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/fgrun/fgrun.desktop b/games/fgrun/fgrun.desktop
new file mode 100644
index 000000000000..ed1c42afaeff
--- /dev/null
+++ b/games/fgrun/fgrun.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=FlightGear Launcher
+Comment=Graphical front-end for launching FlightGear flight simulator
+Exec=fgrun
+Icon=fgrun
+Terminal=false
+Type=Application
+Categories=Game;Simulation;
diff --git a/games/fgrun/fgrun.info b/games/fgrun/fgrun.info
index 30dcb5efc5e9..83748eec01bc 100644
--- a/games/fgrun/fgrun.info
+++ b/games/fgrun/fgrun.info
@@ -1,8 +1,8 @@
 PRGNAM="fgrun"
-VERSION="1.5.2"
+VERSION="1.6.2"
 HOMEPAGE="http://sourceforge.net/projects/fgrun/"
-DOWNLOAD="http://downloads.sourceforge.net/fgrun/fgrun-1.5.2.tar.gz"
-MD5SUM="cee32c8359a61e0db3156f7bd271321c" 
+DOWNLOAD="http://downloads.sourceforge.net/fgrun/fgrun-1.6.2.tar.bz2"
+MD5SUM="683c0f97be2163e85a518ee706d92177" 
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fltk"
diff --git a/games/fgrun/fgrun.png b/games/fgrun/fgrun.png
new file mode 100644
index 000000000000..e846c32f0c2e
--- /dev/null
+++ b/games/fgrun/fgrun.png
diff --git a/games/fgrun/fgrun.prefs b/games/fgrun/fgrun.prefs
new file mode 100644
index 000000000000..d64bae9cac05
--- /dev/null
+++ b/games/fgrun/fgrun.prefs
@@ -0,0 +1,11 @@
+; FLTK preferences file format 1.0
+; vendor: flightgear.org
+; application: fgrun
+
+[.]
+
+fg_exe:/usr/bin/fgfs
+fg_root:/usr/share/FlightGear
+fg_scenery:/usr/share/FlightGear/Scenery
+aircraft:c172-3d
+airport:KSFO