Use GitHub API v3

2 files changed, 27 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2a6939cc82e0..049935469cd8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 # Generated by makepkg 5.1.1
-# Sun Sep  9 20:35:10 UTC 2018
+# Sun Sep  9 20:40:32 UTC 2018
 pkgbase = gpxsee-git
 	pkgdesc = GPS log file viewer and analyzer
-	pkgver = 5.17.r1115.2501f83
+	pkgver = 5.17.r1115.2501f834
 	pkgrel = 1
 	url = http://www.gpxsee.org/
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	makedepends = git
+	makedepends = python
 	makedepends = qt5-tools
 	depends = qt5-base
 	optdepends = qt5-imageformats: Support for TIFF
-	provides = gpxsee=5.17.r1115.2501f83
+	provides = gpxsee=5.17.r1115.2501f834
 	conflicts = gpxsee
-	source = GPXSee-master::git://github.com/tumic0/GPXSee.git#branch=master
+	source = https://github.com/tumic0/GPXSee/archive/master.tar.gz
 	sha256sums = SKIP
 
 pkgname = gpxsee-git
diff --git a/PKGBUILD b/PKGBUILD
index 54f8185c04fd..96d0989b57f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,42 +8,42 @@ wl_project=${_pkgname}
 wl_component=Translations
 wl_dl="https://hosted.weblate.org/download/${wl_project}/${wl_component}"
 pkgname=${_pkgname,,}-git
-pkgver=5.17.r1115.2501f83
+pkgver=5.17.r1115.2501f834
 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=('git' 'qt5-tools')
+makedepends=('python' 'qt5-tools')
 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")
+#source=("${_pkgname}-${_branch}::git://github.com/${_orgname}/${_pkgname}.git#branch=${_branch}")
+source=("https://github.com/${_orgname}/${_pkgname}/archive/${_branch}.tar.gz")
 sha256sums=('SKIP')
 
-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}"
-}
-
 #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}"
+#  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}"
 #}
 
+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}"
+}
+
 prepare() {
   cd ${_pkgname}-${_branch}