Use GitHub API v3

2 files changed, 24 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ceaf02714180..3b9d761e8a54 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 5.0.2
-# Sat Dec 23 14:39:11 UTC 2017
+# Sat Jan 13 21:58:02 UTC 2018
 pkgbase = openorienteering-mapper-git
 	pkgdesc = Map drawing program from OpenOrienteering
-	pkgver = 0.7.93.r4292.55145fc4
+	pkgver = 0.7.93pre.r4311.0c8cf890
 	pkgrel = 1
 	url = http://www.openorienteering.org/apps/mapper/
 	install = openorienteering-mapper.install
@@ -18,9 +18,9 @@ pkgbase = openorienteering-mapper-git
 	depends = proj>=4.9.2
 	depends = gdal
 	optdepends = qt5-imageformats: Support for TIFF etc.
-	provides = openorienteering-mapper=0.7.93.r4292.55145fc4
+	provides = openorienteering-mapper=0.7.93pre.r4311.0c8cf890
 	conflicts = openorienteering-mapper
-	source = mapper-master::git://github.com/openorienteering/mapper.git
+	source = https://github.com/openorienteering/mapper/archive/master.tar.gz
 	sha256sums = SKIP
 
 pkgname = openorienteering-mapper-git
diff --git a/PKGBUILD b/PKGBUILD
index a82a04cb412b..8fb5f738b394 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 _orgname=openorienteering
 _pkgname=mapper
 pkgname=${_orgname}-${_pkgname}-git
-pkgver=0.7.93.r4292.55145fc4
+pkgver=0.7.93pre.r4311.0c8cf890
 pkgrel=1
 pkgdesc="Map drawing program from OpenOrienteering"
 arch=('i686' 'x86_64')
@@ -14,15 +14,28 @@ optdepends=('qt5-imageformats: Support for TIFF etc.')
 provides=("${pkgname//-git}=${pkgver}")
 conflicts=(${pkgname//-git})
 install=${pkgname//-git}.install
-source=("${_pkgname}-master::git://github.com/${_orgname}/${_pkgname}.git")
+#source=("${_pkgname}-master::git://github.com/${_orgname}/${_pkgname}.git")
+source=("https://github.com/${_orgname}/${_pkgname}/archive/master.tar.gz")
 sha256sums=('SKIP')
 
-pkgver() {
-  cd ${_pkgname}-master
+#pkgver() {
+#  cd ${_pkgname}-master
+#
+#  RELEASE="$(git describe --tags $(git rev-list --tags --max-count=1) | tr '-' '.')"
+#  REVISION="$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+#  printf "%s.r%s" "${RELEASE#?}" "${REVISION}"
+#}
 
-  RELEASE="$(git describe --tags $(git rev-list --tags --max-count=1) | tr '-' '.')"
-  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="8a8986ec"
+  head=$(curl -s "$api_url/git/refs/heads/master" | \
+    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/releases" | \
+    python -c "import sys, json; r = json.load(sys.stdin)[0]; print(r['tag_name'] + 'pre' if r['prerelease'] else '')")
+  printf "%s.r%s.%s" "${release#?}" "${count}" "${head}"
 }
 
 prepare() {