summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD26
2 files changed, 26 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 176929804ce3..3030667af5ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
pkgbase = tutanota-desktop
pkgdesc = Official Tutanota email client
- pkgver = 3.91.10
+ pkgver = 3.93.4
pkgrel = 1
url = https://tutanota.com
arch = x86_64
license = GPL3
- makedepends = node-gyp>=8.1.0
- makedepends = nodejs>=16.3.0
- makedepends = npm>=7.0.0
+ makedepends = nvm
depends = nss
depends = libappindicator-gtk3
depends = libnotify
depends = org.freedesktop.secrets
- source = https://github.com/tutao/tutanota/archive/tutanota-release-3.91.10.tar.gz
+ source = https://github.com/tutao/tutanota/archive/tutanota-release-3.93.4.tar.gz
source = tutanota-desktop
source = tutanota-desktop.desktop
- sha256sums = 54b1fb7463d4c7e4179b97eca3bc9de2e8caabbf27e2e59d1638f2c49734cc6c
+ sha256sums = b9cf1b845b6597da098ffe9597d8b25a319a2d3547efa259bf1e59ae2eb7091c
sha256sums = 4f91e842bd92a3312943854383e4929f9baf6cb684a7027aa55edcce1bf4ca16
sha256sums = 9a41e5474e1568b13093c91fd54538fe614003f5f5d4f895553f73207c28cb08
diff --git a/PKGBUILD b/PKGBUILD
index b28dbb0821f6..8d618793d6cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,27 +2,45 @@
# Co-Maintainer: Aaron J. Graves <linux@ajgraves.com>
# Contributor: ganthern <https://github.com/ganthern>
pkgname=tutanota-desktop
-pkgver=3.91.10
+pkgver=3.93.4
pkgrel=1
+_node_version=16
pkgdesc="Official Tutanota email client"
arch=('x86_64')
url="https://tutanota.com"
license=('GPL3')
depends=('nss' 'libappindicator-gtk3' 'libnotify' 'org.freedesktop.secrets')
-makedepends=('node-gyp>=8.1.0' 'nodejs>=16.3.0' 'npm>=7.0.0')
+#makedepends=('node-gyp>=8.1.0' 'nodejs>=16.3.0' 'npm>=7.0.0')
+makedepends=('nvm')
source=("https://github.com/tutao/tutanota/archive/${pkgname%-*}-release-$pkgver.tar.gz"
"$pkgname"
"$pkgname.desktop")
-sha256sums=('54b1fb7463d4c7e4179b97eca3bc9de2e8caabbf27e2e59d1638f2c49734cc6c'
+sha256sums=('b9cf1b845b6597da098ffe9597d8b25a319a2d3547efa259bf1e59ae2eb7091c'
'4f91e842bd92a3312943854383e4929f9baf6cb684a7027aa55edcce1bf4ca16'
'9a41e5474e1568b13093c91fd54538fe614003f5f5d4f895553f73207c28cb08')
+_ensure_local_nvm() {
+ # let's be sure we are starting clean
+ which nvm >/dev/null 2>&1 && nvm deactivate && nvm unload
+ export NVM_DIR="${srcdir}/.nvm"
+ # The init script returns 3 if version specified
+ # in ./.nvrc is not (yet) installed in $NVM_DIR
+ # but nvm itself still gets loaded ok
+ source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+}
+
+prepare() {
+ _ensure_local_nvm
+ nvm install "$_node_version"
+}
+
build() {
cd "${pkgname%-*}-${pkgname%-*}-release-$pkgver"
export npm_config_cache="$srcdir/npm_cache"
+ _ensure_local_nvm
npm ci
npm run build-packages
- node dist -l --custom-desktop-release --unpacked
+ node desktop -l --custom-desktop-release --unpacked
}
package() {