Minor improvement

2 files changed, 33 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2880205ccce..74c51978f2ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 # Generated by makepkg 5.1.1
-# Sat Sep 15 19:20:43 UTC 2018
+# Thu Sep 20 09:26:38 UTC 2018
 pkgbase = gpxsee-git
 	pkgdesc = GPS log file viewer and analyzer
-	pkgver = 5.18.r1131.7432459c
+	pkgver = 5.18.r1143.0a746847
 	pkgrel = 1
 	url = http://www.gpxsee.org/
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	makedepends = python
 	makedepends = qt5-tools
+	makedepends = python
 	depends = qt5-base
 	optdepends = qt5-imageformats: Support for TIFF
-	provides = gpxsee=5.18.r1131.7432459c
+	provides = gpxsee=5.18.r1143.0a746847
 	conflicts = gpxsee
 	source = https://github.com/tumic0/GPXSee/archive/master.tar.gz
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 605770154120..d72b4ea17809 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,43 +4,52 @@
 _orgname=tumic0
 _pkgname=GPXSee
 _branch=master
+_use_gh_api=true
 wl_project=${_pkgname}
 wl_component=Translations
 wl_dl="https://hosted.weblate.org/download/${wl_project}/${wl_component}"
 pkgname=${_pkgname,,}-git
-pkgver=5.18.r1131.7432459c
+pkgver=5.18.r1143.0a746847
 pkgrel=1
 pkgdesc='GPS log file viewer and analyzer'
 arch=('i686' 'x86_64')
 url="http://www.gpxsee.org/"
 license=('GPL3')
 depends=('qt5-base')
-#makedepends=('git' 'qt5-tools')
-makedepends=('python' 'qt5-tools')
+makedepends=('qt5-tools')
+if [ "${_use_gh_api}" = true ]; then
+  makedepends+=('python')
+else
+  makedepends+=('git')
+fi
 optdepends=('qt5-imageformats: Support for TIFF')
 provides=("${pkgname//-git}=${pkgver}")
 conflicts=(${pkgname//-git})
-#source=("${_pkgname}-${_branch}::git://github.com/${_orgname}/${_pkgname}.git#branch=${_branch}")
-source=("https://github.com/${_orgname}/${_pkgname}/archive/${_branch}.tar.gz")
+if [ "${_use_gh_api}" = true ]; then
+  source=("https://github.com/${_orgname}/${_pkgname}/archive/${_branch}.tar.gz")
+else
+  source=("${_pkgname}-${_branch}::git://github.com/${_orgname}/${_pkgname}.git#branch=${_branch}")
+fi
 sha256sums=('SKIP')
 
-#pkgver() {
-#  cd ${_pkgname}-${_branch}
+pkgver() {
+  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}"
-#}
+  if [ "${_use_gh_api}" = true ]; then
+    api_url="https://api.github.com/repos/${_orgname}/${_pkgname}"
+    base="928e259d"
+    head=$(curl -s "$api_url/git/refs/heads/${_branch}" | \
+      python -c "import sys, json; print(json.load(sys.stdin)['object']['sha'][:8])")
+    count=$(curl -s "$api_url/compare/${base}...${head}" | \
+      python -c "import sys, json; print(json.load(sys.stdin)['total_commits'] + 1)")
+    release=$(curl -s "$api_url/tags" | \
+      python -c "import sys, json; r = json.load(sys.stdin)[0]; print(r['name'])")
+  else
+    release="$(git describe --tags $(git rev-list --tags --max-count=1))"
+    count="$(git rev-list --count HEAD)"
+    head="$(git rev-parse --short HEAD)"
+  fi
 
-pkgver() {
-  api_url="https://api.github.com/repos/${_orgname}/${_pkgname}"
-  base="928e259d"
-  head=$(curl -s "$api_url/git/refs/heads/${_branch}" | \
-    python -c "import sys, json; print(json.load(sys.stdin)['object']['sha'][:8])")
-  count=$(curl -s "$api_url/compare/${base}...${head}" | \
-    python -c "import sys, json; print(json.load(sys.stdin)['total_commits'] + 1)")
-  release=$(curl -s "$api_url/tags" | \
-    python -c "import sys, json; r = json.load(sys.stdin)[0]; print(r['name'])")
   printf "%s.r%s.%s" "${release}" "${count}" "${head}"
 }