diff options
| author | Mark Wagie | 2022-08-23 10:18:42 -0600 |
|---|---|---|
| committer | Mark Wagie | 2022-08-23 10:18:42 -0600 |
| commit | 7b6806ed0a51be13b9c7ac8da1ab01f8883cc4b5 (patch) | |
| tree | abfca7615d8e76e7b2448c99da94c32015d24179 | |
| parent | 68ecda7b7f36abdc6d474fcda9aff98d71bc9e34 (diff) | |
| download | aur-7b6806ed0a51be13b9c7ac8da1ab01f8883cc4b5.tar.gz | |
Use Node.js 14, adjust desktop file categories
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 28 | ||||
| -rw-r--r-- | gmail-desktop.desktop | 4 |
3 files changed, 26 insertions, 12 deletions
@@ -1,11 +1,11 @@ pkgbase = gmail-desktop pkgdesc = Unofficial Gmail desktop app pkgver = 3.0.0.alpha.35 - pkgrel = 1 + pkgrel = 2 url = https://github.com/timche/gmail-desktop arch = x86_64 license = MIT - makedepends = yarn + makedepends = nvm depends = electron20 optdepends = libnotify: desktop notifications optdepends = libappindicator-gtk3: tray icon @@ -14,6 +14,6 @@ pkgbase = gmail-desktop source = gmail-desktop.desktop sha256sums = f22b10215586d5d879ea98a1671e6c0aac4b1166cff765f197f8e21f2bd66998 sha256sums = b3b54bafd3d986492a29f6200abe8857f877a7bdb27f3db02578bd43bc9ba131 - sha256sums = 8c30e207fe88455f63f4c0b2ae9087a2ca2bbeaa68b9be244c31a9ec392373c4 + sha256sums = b9a4fba1916c8b3e2ec55593b5700019c66c05a5da8f2f1b3f91edaddf0009dd pkgname = gmail-desktop @@ -2,14 +2,15 @@ pkgname=gmail-desktop _pkgver=3.0.0-alpha.35 pkgver=${_pkgver//-/.} -pkgrel=1 +pkgrel=2 +_nodeversion=14 _electronversion=20 pkgdesc="Unofficial Gmail desktop app" arch=('x86_64') url="https://github.com/timche/gmail-desktop" license=('MIT') depends=("electron${_electronversion}") -makedepends=('yarn') +makedepends=('nvm') optdepends=('libnotify: desktop notifications' 'libappindicator-gtk3: tray icon') source=("$pkgname-$pkgver.tar.gz::$url/archive/v$_pkgver.tar.gz" @@ -17,7 +18,18 @@ source=("$pkgname-$pkgver.tar.gz::$url/archive/v$_pkgver.tar.gz" "$pkgname.desktop") sha256sums=('f22b10215586d5d879ea98a1671e6c0aac4b1166cff765f197f8e21f2bd66998' 'b3b54bafd3d986492a29f6200abe8857f877a7bdb27f3db02578bd43bc9ba131' - '8c30e207fe88455f63f4c0b2ae9087a2ca2bbeaa68b9be244c31a9ec392373c4') + 'b9a4fba1916c8b3e2ec55593b5700019c66c05a5da8f2f1b3f91edaddf0009dd') + +_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() { cd "$pkgname-$_pkgver" @@ -25,16 +37,18 @@ prepare() { # Disable husky sed -i '/husky/d' package.json - rm -f package-lock.json + _ensure_local_nvm + nvm install "${_nodeversion}" } build() { cd "$pkgname-$_pkgver" electronDist="/usr/lib/electron$_electronversion" electronVer="$(sed s/^v// /usr/lib/electron$_electronversion/version)" - yarn config set cache-folder "$srcdir/yarn-cache" - yarn install - yarn build + _ensure_local_nvm + npm config set cache "$srcdir/npm-cache" + npm ci + npm run build ./node_modules/.bin/electron-builder --linux --x64 --dir \ $dist -c.electronDist=$electronDist -c.electronVersion=$electronVer } diff --git a/gmail-desktop.desktop b/gmail-desktop.desktop index c08062b20384..b9e656e29fde 100644 --- a/gmail-desktop.desktop +++ b/gmail-desktop.desktop @@ -5,5 +5,5 @@ Terminal=false Type=Application Icon=gmail-desktop StartupWMClass=Gmail Desktop -Comment=Unofficial Gmail Desktop App -Categories=Network;Office; +Comment=Nifty Gmail desktop app +Categories=Network;Email; |