General package updates

- Specify additional dependencies
- Use QT5 launcher
- Use .desktop file & FG icon
- Use date as pkgver
- Include bash-completion script

2 files changed, 32 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 089f68ea7f64..c737081d5564 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,25 @@
+# Generated by mksrcinfo v8
+# Thu Dec 10 14:57:56 UTC 2015
 pkgbase = flightgear-git
 	pkgdesc = An open-source, multi-platform flight simulator
-	pkgver = 20150829
+	pkgver = 20151210
 	pkgrel = 1
 	url = http://flightgear.org/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = boost
-	depends = simgear-git
+	makedepends = cmake
+	makedepends = mesa
+	makedepends = sharutils
+	makedepends = simgear-git
 	depends = libxmu
 	depends = libxi
 	depends = zlib
+	depends = libxrandr
+	depends = glu
+	depends = openal
+	depends = qt5-base
 	depends = fgdata-git
 	depends = openscenegraph-git
 	provides = flightgear-git
diff --git a/PKGBUILD b/PKGBUILD
index b7ef5c6f3b19..7ed9d54d4507 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,46 @@
 # Contributor: Pascal Groschwitz <p.groschwitz@googlemail.com>
 # Contributor: jmf <jmf at mesecons dot net>
 pkgname=flightgear-git
-pkgver=20150829
+pkgver=20151210
 pkgrel=1
 _gitname=flightgear
 pkgdesc="An open-source, multi-platform flight simulator"
 arch=('i686' 'x86_64')
 url="http://flightgear.org/"
 license=('GPL')
-depends=('simgear-git' 'libxmu' 'libxi' 'zlib' 'fgdata-git' 'openscenegraph-git')
+depends=('libxmu' 'libxi' 'zlib' 'libxrandr' 'glu' 'openal' 'qt5-base' 'fgdata-git' 'openscenegraph-git')
 optdepends=()
-makedepends=('boost')
+makedepends=('boost' 'cmake' 'mesa' 'sharutils' 'simgear-git')
 provides=('flightgear-git')
 conflicts=('flightgear')
 source=(git://git.code.sf.net/p/flightgear/flightgear)
 md5sums=('SKIP')
 
+pkgver() {
+  echo "$(date +"%Y%m%d")"
+}
+
 build() {
   cd ${srcdir}/${_gitname}
   git checkout next
-  mkdir ${srcdir}/${_gitname}-build/
-  cd "${srcdir}/${_gitname}-build/"
-  cmake ../${_gitname} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_QT=1 -DFG_DATA_DIR:STRING="/usr/share/flightgear" -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCMAKE_BUILD_TYPE=Debug
+  cmake \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DENABLE_QT=1 \
+  -DFG_DATA_DIR:STRING="/usr/share/flightgear" \
+  -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+  -DCMAKE_BUILD_TYPE=Debug .
+  uudecode -o package/flightgear.png package/flightgear.png.uue
   make || return 1
+  sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear --launcher|' package/flightgear.desktop
 }
 
 package(){
-  cd "$srcdir/${_gitname}-build"
+  cd "$srcdir/${_gitname}"
   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
 }