Rewrite PKGBUILD

Updates version scheme
Adds new dependencies

2 files changed, 35 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5978b152960b..cedaa9659f4f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Fri May 26 17:05:01 UTC 2017
 pkgbase = flightgear-git
 	pkgdesc = An open-source, multi-platform flight simulator
-	pkgver = 20170526
+	pkgver = 2018.3.0r13757.4eaeb594a
 	pkgrel = 1
-	url = http://flightgear.org/
-	arch = i686
+	url = https://home.flightgear.org
 	arch = x86_64
 	license = GPL
 	makedepends = boost
@@ -15,21 +12,23 @@ pkgbase = flightgear-git
 	makedepends = simgear-git
 	makedepends = qt5-base
 	makedepends = qt5-declarative
+	makedepends = qt5-tools
 	depends = libxmu
 	depends = libxi
 	depends = zlib
 	depends = libxrandr
 	depends = glu
+	depends = glew
 	depends = openal
-	depends = fgdata-git
 	depends = openscenegraph
 	depends = subversion
 	optdepends = qt5-base: fgfs --launcher
 	optdepends = qt5-declarative: fgfs --launcher
-	provides = flightgear-git
-	provides = flightgear
+	optdepends = qt5-tools: fgfs --launcher
+	optdepends = flightgear-data-git
+	provides = flightgear=2018.3.0
 	conflicts = flightgear
-	source = git://git.code.sf.net/p/flightgear/flightgear
+	source = flightgear::git+https://git.code.sf.net/p/flightgear/flightgear#branch=next
 	md5sums = SKIP
 
 pkgname = flightgear-git
diff --git a/PKGBUILD b/PKGBUILD
index 7554631588be..6fd19a44af3b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,44 +3,49 @@
 # Contributor: Pascal Groschwitz <p.groschwitz@googlemail.com>
 
 pkgname=flightgear-git
-pkgver=20170526
+pkgver=2018.3.0r13757.4eaeb594a
+_pkgver=2018.3.0
 pkgrel=1
-_gitname=flightgear
 pkgdesc="An open-source, multi-platform flight simulator"
-arch=('i686' 'x86_64')
-url="http://flightgear.org/"
+arch=('x86_64')
+url="https://home.flightgear.org"
 license=('GPL')
-depends=('libxmu' 'libxi' 'zlib' 'libxrandr' 'glu' 'openal' 'fgdata-git' 'openscenegraph' 'subversion')
+depends=('libxmu' 'libxi' 'zlib' 'libxrandr' 'glu' 'glew' 'openal' 'openscenegraph' 'subversion')
+makedepends=('boost' 'cmake' 'mesa' 'sharutils' 'simgear-git' 'qt5-base' 'qt5-declarative' 'qt5-tools')
 optdepends=('qt5-base: fgfs --launcher'
-            'qt5-declarative: fgfs --launcher')
-makedepends=('boost' 'cmake' 'mesa' 'sharutils' 'simgear-git' 'qt5-base' 'qt5-declarative')
-provides=('flightgear-git' 'flightgear')
+            'qt5-declarative: fgfs --launcher'
+            'qt5-tools: fgfs --launcher'
+            'flightgear-data-git')
+provides=('flightgear=2018.3.0')
 conflicts=('flightgear')
-source=(git://git.code.sf.net/p/flightgear/flightgear)
+source=("flightgear::git+https://git.code.sf.net/p/flightgear/flightgear#branch=next")
 md5sums=('SKIP')
 
 pkgver() {
-  echo "$(date +"%Y%m%d")"
+  cd "${srcdir}/${pkgname%-git}"
+  printf "%sr%s.%s" "${_pkgver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd ${srcdir}/${_gitname}
-  git checkout next
-  mkdir -p ${srcdir}/${_gitname}-build
-  cd "${srcdir}/${_gitname}-build/"
+  cd "$srcdir/${pkgname%-git}"
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DENABLE_QT=1 \
-    -DFG_DATA_DIR:STRING="/usr/share/flightgear" \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DFG_DATA_DIR:STRING="/usr/share/flightgear/data" \
     -DCMAKE_BUILD_TYPE=Release \
-    ../${_gitname}
-
-  make || return 1
+    -DFG_BUILD_TYPE=Release \
+    .
+  make
+  sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|' package/org.flightgear.FlightGear.desktop
 }
 
-package(){
-  cd "${srcdir}/${_gitname}-build/"
+package() {
+  cd "$srcdir/${pkgname%-git}"
   make DESTDIR="$pkgdir" install
+
+  install -Dm0644 package/flightgear.ico "$pkgdir"/usr/share/icons/flightgear.ico
+  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
 }