summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorlilac2021-04-29 06:58:04 +0800
committerlilac2021-04-29 06:58:04 +0800
commite42f99707f075a8dfc31f9f2b8909d2378b6cc89 (patch)
tree08b7208b69c80a9d2fd0a2cb5e7947f4feafd9aa
parented49f0732ce7ed69e8b4257885e46de9287236ff (diff)
downloadaur-nextcloud-app-calendar-git.tar.gz
[lilac] updated to 1:2.1.1.r441.g902994dd-1
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD19
2 files changed, 13 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ab84a90ceb3b..8e7698922f92 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,14 @@
pkgbase = nextcloud-app-calendar-git
pkgdesc = Calendar app for nextcloud
- pkgver = 2.0.0.r1.g6a8575a0
+ pkgver = 2.1.1.r441.g902994dd
pkgrel = 1
epoch = 1
url = http://nextcloud.com
arch = any
license = AGPL
+ makedepends = nodejs-lts-fermium
makedepends = npm
+ makedepends = composer
makedepends = git
depends = nextcloud
provides = nextcloud-app-calendar
diff --git a/PKGBUILD b/PKGBUILD
index f220e4425359..4505bb149841 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,15 @@
pkgname=nextcloud-app-calendar-git
epoch=1
-pkgver=2.0.0.r1.g6a8575a0
+pkgver=2.1.1.r441.g902994dd
pkgrel=1
pkgdesc="Calendar app for nextcloud"
arch=('any')
url="http://nextcloud.com"
license=('AGPL')
depends=('nextcloud')
-makedepends=('npm' 'git')
+# Using older node.js due to https://github.com/sass/node-sass/issues/3077
+makedepends=('nodejs-lts-fermium' 'npm' 'composer' 'git')
conflicts=('nextcloud-app-calendar')
provides=('nextcloud-app-calendar')
options=('!strip')
@@ -26,14 +27,14 @@ pkgver() {
build() {
cd "${srcdir}/calendar"
# -j1 so that `npm install` runs before other steps
- make -j1 dev-setup build-js-production appstore
+ make -j1 dev-setup build-js-production composer-init
}
package() {
- install -d "$pkgdir"/usr/share/webapps/nextcloud/apps
- tar -xvf "${srcdir}/calendar/build/artifacts/appstore/calendar.tar.gz" -C "${pkgdir}/usr/share/webapps/nextcloud/apps/"
- # npm polishments
- chown -R root:root "$pkgdir"
- find "${pkgdir}"/usr -type d -exec chmod 755 {} +
- find "${pkgdir}"/usr -type f -exec chmod 644 {} +
+ cd "${srcdir}/calendar"
+
+ install -Ddm755 "$pkgdir"/usr/share/webapps/nextcloud/apps/calendar
+ # Upstream `appstore` target now creates tarball from a separate cloned repo
+ cp -dr --no-preserve=ownership CHANGELOG.md appinfo css img js l10n lib templates vendor \
+ "$pkgdir"/usr/share/webapps/nextcloud/apps/calendar
}