Date: Tuesday, June 14, 2022 @ 13:05:06 Author: dvzrv Revision: 1237857
archrelease: copy trunk to community-any Added: nextcloud-app-mail/repos/community-any/PKGBUILD (from rev 1237856, nextcloud-app-mail/trunk/PKGBUILD) Deleted: nextcloud-app-mail/repos/community-any/PKGBUILD ----------+ PKGBUILD | 157 +++++++++++++++++++++++++------------------------------------ 1 file changed, 66 insertions(+), 91 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-06-14 13:04:51 UTC (rev 1237856) +++ PKGBUILD 2022-06-14 13:05:06 UTC (rev 1237857) @@ -1,91 +0,0 @@ -# Maintainer: Sergej Pupykin <arch+...@sergej.pp.ru> -# Maintainer: Jonas Heinrich <o...@project-insanity.org> -# Contributor: Jonas Heinrich <o...@project-insanity.org> - -pkgname=nextcloud-app-mail -_name=mail -pkgver=1.13.0 -pkgrel=1 -pkgdesc="An email app for NextCloud" -arch=('any') -url="https://github.com/nextcloud/mail" -license=('AGPL') -makedepends=('nextcloud' 'php7' 'ripgrep' 'yq') -groups=('nextcloud-apps') -options=('!strip') -source=("$pkgname-$pkgver.tar.gz::https://github.com/nextcloud-releases/mail/releases/download/v${pkgver}/mail-v${pkgver}.tar.gz") -sha512sums=('5572c4ccb9196806c175651200e363911f44201754087873c9b3126b2a3e355fb34e2529b3c7119584ab9fad440b07240aa4ab82e1fac901d364665c08368fba') - -_get_nextcloud_versions() { - _app_min_major_version="$(xq '.info.dependencies.nextcloud["@min-version"]' "${_name}/appinfo/info.xml"| sed 's/"//g')" - _app_max_major_version="$(xq '.info.dependencies.nextcloud["@max-version"]' "${_name}/appinfo/info.xml"| sed 's/"//g')" - _app_max_major_version=$(expr ${_app_max_major_version} + 1) -} - -_get_php_versions() { - local _phps=(php7 php) - - _app_min_php="$(xq '.info.dependencies.php["@min-version"]' "$_name/appinfo/info.xml"| sed 's/"//g')" - _app_max_php="$(xq '.info.dependencies.php["@max-version"]' "$_name/appinfo/info.xml"| sed 's/"//g')" - - if [[ $_app_max_php != 'null' ]]; then - _app_max_php="$(echo $_app_max_php | awk -F '.' '{print $1"."$2+1}')" - fi - - _system_php="" - for _php in "${_phps[@]}"; do - if command -v "$_php" > /dev/null; then - if [[ -z "$_system_php" ]]; then - _system_php="$_php" - fi - fi - done -} - -check() { - local _app_min_major_version - local _app_max_major_version - _get_nextcloud_versions - _get_php_versions - - local _nextcloud_major_version="$(rg "OC_Version = " /usr/share/webapps/nextcloud/version.php |cut -d'(' -f2| cut -d ',' -f1)" - if [[ "$(vercmp "${_nextcloud_major_version}" "${_app_min_major_version}")" -lt 0 ]] || [[ "$(vercmp "${_nextcloud_major_version}" "${_app_max_major_version}")" -gt 0 ]] ; then - printf "%s requires nextcloud >= %s/ nextcloud <= %s, but nextcloud %s is provided.\n" "$pkgname" "${_app_min_major_version}" "${_app_max_major_version}" "${_nextcloud_major_version}" - exit 1 - fi - - local _php_version="$($_system_php --version |head -n1 |cut -d ' ' -f2 |sed 's/.[0-9]*$//g')" - if [[ "$(vercmp "$_php_version" "$_app_min_php" )" -lt 0 ]]; then - printf "%s requires php-interpreter >= %s, but %s is provided\n" $pkgname $_app_min_php $_php_version - exit 1 - fi - if [[ $_app_max_php != 'null' ]]; then - if [[ "$(vercmp "$_php_version" "$_app_max_php" )" -ge 0 ]]; then - printf "%s requires php-interpreter < %s, but %s is provided\n" $pkgname $_app_max_php $_php_version - exit 1 - fi - fi -} - -package() { - _get_nextcloud_versions - _get_php_versions - - depends=("nextcloud>=${_app_min_major_version}" "nextcloud<${_app_max_major_version}") - if [[ "$_app_min_php" != 'null' ]]; then - depends+=( - "php-interpreter>=$_app_min_php" - ) - fi - if [[ "$_app_max_php" != 'null' ]]; then - depends+=( - "php-interpreter<$_app_max_php" - ) - fi - if [[ "$_app_min_php" == 'null' ]] && [[ "$_app_max_php" == 'null' ]]; then - depends+=(php-interpreter) - fi - - install -d "${pkgdir}/usr/share/webapps/nextcloud/apps" - cp -a "${srcdir}/mail" "${pkgdir}/usr/share/webapps/nextcloud/apps/mail" -} Copied: nextcloud-app-mail/repos/community-any/PKGBUILD (from rev 1237856, nextcloud-app-mail/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-06-14 13:05:06 UTC (rev 1237857) @@ -0,0 +1,66 @@ +# Maintainer: Sergej Pupykin <arch+...@sergej.pp.ru> +# Maintainer: Jonas Heinrich <o...@project-insanity.org> +# Contributor: Jonas Heinrich <o...@project-insanity.org> + +pkgname=nextcloud-app-mail +_name=mail +pkgver=1.13.4 +pkgrel=1 +pkgdesc="An email app for NextCloud" +arch=('any') +url="https://github.com/nextcloud/mail" +license=('AGPL') +makedepends=(nextcloud yq) +groups=('nextcloud-apps') +options=('!strip') +source=("$pkgname-$pkgver.tar.gz::https://github.com/nextcloud-releases/mail/releases/download/v${pkgver}/$_name-v${pkgver}.tar.gz") +sha512sums=('5b4792c066ada1605ca572a3d57270e2c489f014ce9043e7ed3a933a7ca631a5ba0a41f4d19cc92642476de003be9c6e4c2c948da1b6d66c78c286c0eb017c44') +b2sums=('13868b78e3202687367b9eed2bf5c982aba119a0732eb246a0576327c01d5563001f14163b72d47fa0598f3ef2be0bbf256ad770e8b6c0946566e1064964455b') + +# 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) +_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() { + # TODO: build usr/share/webapps/nextcloud/apps/mail/vendor/christophwurst/kitinerary-bin/bin/kitinerary-extractor manually! + install -vdm 755 "$pkgdir/usr/share/webapps/nextcloud/apps/" + cp -av $_name "$pkgdir/usr/share/webapps/nextcloud/apps/" + cd $_name + _nextcloud_app_package +}