nextcloud-app-keeweb: update to 0.6.13

which supports NC27.
Additionally follow packaging of repo nextcloud-apps

2 files changed, 59 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a77e98c842ab..957ae571f901 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = nextcloud-app-keeweb
 	pkgdesc = Open Keepass stores inside Nextcloud
-	pkgver = 0.6.5
+	pkgver = 0.6.13
 	pkgrel = 1
 	url = https://github.com/jhass/nextcloud-keeweb
 	arch = any
-	license = AGPL
-	depends = nextcloud
+	license = AGPL3
+	makedepends = nextcloud
+	makedepends = yq
 	options = !strip
-	source = https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.5/keeweb-0.6.5.tar.gz
-	sha512sums = c5bdf4a5569b925bfa8248c914852198e4fe53be2e14a9053957e5798e68e3f2025ffefded4582bd08898fbe5d931171a7d00943916f1a7b706be9c9963c9df9
+	source = https://github.com/jhass/nextcloud-keeweb/releases/download/v0.6.13/keeweb-0.6.13.tar.gz
+	sha512sums = d16eabb290d5b88ba9158787b98dd7df2688d79ba792741d0d6d8388924d7645555b97384aec1ef4119982b9ef40e2d1c5399e01dd3a3ef99d6f78d0095fafd6
 
 pkgname = nextcloud-app-keeweb
-
diff --git a/PKGBUILD b/PKGBUILD
index 662930275abe..bdc0fa239f21 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,64 @@
-# Maintainer: Jonas Heinrich <onny@project-insanity.org>
+# Contributor: Lex Black <autumn-wind@web.de>
 # Contributor: Jonas Heinrich <onny@project-insanity.org>
 
+_name=keeweb
 pkgname=nextcloud-app-keeweb
-pkgver=0.6.5
+pkgver=0.6.13
 pkgrel=1
 pkgdesc="Open Keepass stores inside Nextcloud"
 arch=('any')
 url="https://github.com/jhass/nextcloud-keeweb"
-license=('AGPL')
-depends=('nextcloud')
-makedepends=()
+license=('AGPL3')
+makedepends=('nextcloud' 'yq')
 options=('!strip')
-source=("https://github.com/jhass/nextcloud-keeweb/releases/download/v${pkgver}/keeweb-${pkgver}.tar.gz")
-sha512sums=('c5bdf4a5569b925bfa8248c914852198e4fe53be2e14a9053957e5798e68e3f2025ffefded4582bd08898fbe5d931171a7d00943916f1a7b706be9c9963c9df9')
+source=("https://github.com/jhass/nextcloud-keeweb/releases/download/v${pkgver}/${_name}-${pkgver}.tar.gz")
+sha512sums=('d16eabb290d5b88ba9158787b98dd7df2688d79ba792741d0d6d8388924d7645555b97384aec1ef4119982b9ef40e2d1c5399e01dd3a3ef99d6f78d0095fafd6')
+
+
+# BEGIN boilerplate nextcloud app version clamping, see also other packages in group
+# 1. Call respective function helpers in check() and package() *after* cd'ing to the source directory
+# 2. Add makedepends+=(nextcloud yq)
+_phps=(php7 php php-legacy)
+_get_supported_ranges() {
+  _app_min_nextcloud="$(< appinfo/info.xml xq -r '.info.dependencies.nextcloud["@min-version"] | values')"
+  _app_max_nextcloud="$(< appinfo/info.xml xq -r '.info.dependencies.nextcloud["@max-version"] | values | tonumber | .+1')"
+  _app_min_php="$(< appinfo/info.xml xq -r '.info.dependencies.php["@min-version"] | values')"
+  _app_max_php="$(< appinfo/info.xml xq -r '.info.dependencies.php["@max-version"] | values | tonumber | .+0.1')"
+}
+_unsupported_range() {
+  printf "%s requires %s %s, but %s %s is provided.\n" "$pkgname" "$1" "$2" "$1" "$3"
+  exit 1
+}
+_nextcloud_app_check() {
+  _get_supported_ranges
+  for _php in "${_phps[@]}"; do command -v "$_php" > /dev/null && break; done
+  local _nextcloud_ver="$("$_php" <(cat /usr/share/webapps/nextcloud/version.php; echo 'print($OC_VersionString);'))"
+  local _php_ver="$("$_php" -r 'print(phpversion());')"
+  [[ "$(vercmp "${_app_min_nextcloud:-0}" "$_nextcloud_ver")" -le 0 ]] || \
+    _unsupported_range nextcloud "=> $_app_min_nextcloud" "$_nextcloud_ver"
+  [[ "$(vercmp "${_app_max_nextcloud:-999}" "$_nextcloud_ver")" -gt 0 ]] || \
+    _unsupported_range nextcloud "< $_app_max_nextcloud" "$_nextcloud_ver"
+  [[ "$(vercmp "${_app_min_php:-0}" "$_php_ver")" -le 0 ]] || \
+    _unsupported_range php ">= $_app_min_php" "$_php_ver"
+  [[ "$(vercmp "${_app_max_php:-999}" "$_php_ver")" -gt 0 ]] || \
+    _unsupported_range php "< $_app_max_php" "$_php_ver"
+}
+_nextcloud_app_package() {
+  _get_supported_ranges
+  depends+=("nextcloud>=${_app_min_nextcloud:-0}" "nextcloud<${_app_max_nextcloud:-999}")
+  depends+=("php-interpreter${_app_min_php:+>=$_app_min_php}" ${_app_max_php:+"php-interpreter<$_app_max_php"})
+}
+# END boilerplate nextcloud app version clamping
+
+check() {
+  cd $_name
+  _nextcloud_app_check
+}
 
 package() {
-  install -d "${pkgdir}/usr/share/webapps/nextcloud/apps"
-  cp -a "${srcdir}/keeweb" "${pkgdir}/usr/share/webapps/nextcloud/apps/keeweb"
+  install -vdm 755 "$pkgdir/usr/share/webapps/nextcloud/apps/"
+  cp -av $_name "$pkgdir/usr/share/webapps/nextcloud/apps/"
+  cd $_name
+  _nextcloud_app_package
 }
+