Fix deps, remove obsolete .desktop file

3 files changed, 35 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fac1ae549104..f8cbd53b4a3a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
-# Generated by mksrcinfo v8
-# Mon Feb 12 21:39:09 UTC 2018
+# Generated by makepkg 5.0.2
+# Thu Apr 12 19:29:15 UTC 2018
 pkgbase = gpxsee-git
 	pkgdesc = GPX viewer and analyzer
-	pkgver = r794.18fc6cc
+	pkgver = 5.6.r905.f64e882
 	pkgrel = 1
 	url = http://www.gpxsee.org/
-	arch = any
-	license = gpl3
+	arch = i686
+	arch = x86_64
+	license = GPL3
 	makedepends = git
-	depends = qt5-tools
-	provides = gpxsee
+	makedepends = qt5-tools
+	depends = qt5-base
+	optdepends = qt5-imageformats: Support for TIFF
+	provides = gpxsee=5.6.r905.f64e882
 	conflicts = gpxsee
-	source = gpxsee-git::git+http://github.com/tumic0/GPXSee
-	source = gpxsee.desktop
-	md5sums = SKIP
-	md5sums = 4226c05418da218c2a271e1c5d1453fd
+	source = gpxsee-master::git+http://github.com/tumic0/gpxsee.git#branch=master
+	sha256sums = SKIP
 
 pkgname = gpxsee-git
 
diff --git a/PKGBUILD b/PKGBUILD
index b1c4f0d8a560..d28a815374fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,42 @@
 # Contributor: Raffaele Zamorano
-# Maintainer: Jose Riha <jose1711 gmail com>
-pkgname=gpxsee-git
+# Contributor: Jose Riha <jose1711 gmail com>
+# Maintainer: Nikolay Korotkiy <sikmir@gmail.com>
+_orgname=tumic0
 _pkgname=gpxsee
+_branch=master
+pkgname=${_pkgname}-git
+pkgver=5.6.r905.f64e882
 pkgrel=1
-pkgver=r794.18fc6cc
 pkgdesc='GPX viewer and analyzer'
-arch=('any')
+arch=('i686' 'x86_64')
 url="http://www.gpxsee.org/"
-license=('gpl3')
-depends=('qt5-tools')
-makedepends=('git')
-conflicts=('gpxsee')
-provides=('gpxsee')
-md5sums=('SKIP'
-         '4226c05418da218c2a271e1c5d1453fd')
-
-source=("${pkgname}"::git+http://github.com/tumic0/GPXSee
-        "gpxsee.desktop")
+license=('GPL3')
+depends=('qt5-base')
+makedepends=('git' 'qt5-tools')
+optdepends=('qt5-imageformats: Support for TIFF')
+provides=("${pkgname//-git}=${pkgver}")
+conflicts=(${pkgname//-git})
+source=("${_pkgname}-${_branch}::git+http://github.com/${_orgname}/${_pkgname}.git#branch=${_branch}")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/${pkgname}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd ${_pkgname}-${_branch}
+
+  RELEASE="$(git describe --tags $(git rev-list --tags --max-count=1))"
+  REVISION="$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  printf "%s.r%s" "${RELEASE}" "${REVISION}"
 }
 
 build() {
-  cd "${srcdir}/${pkgname}"
+  cd ${_pkgname}-${_branch}
+
   lrelease-qt5 gpxsee.pro
   qmake gpxsee.pro
   make
 }
 
 package() {
-  cd "${pkgname}"
+  cd ${_pkgname}-${_branch}
 
   install -d 755 ${pkgdir}/usr/bin
   install -d 755 ${pkgdir}/usr/share/applications
diff --git a/gpxsee.desktop b/gpxsee.desktop
deleted file mode 100644
index 192902dbd2ae..000000000000
--- a/gpxsee.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=GPXSee
-Exec=gpxsee %F
-Icon=gpxsee
-Terminal=false
-Type=Application
-Categories=Graphics;Viewer;
-MimeType=application/gpx+xml;application/tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;