diff options
| -rw-r--r-- | .SRCINFO | 23 | ||||
| -rw-r--r-- | PKGBUILD | 96 | ||||
| -rw-r--r-- | gmail-desktop.desktop | 9 | ||||
| -rw-r--r-- | gmail-desktop.sh | 3 |
4 files changed, 55 insertions, 76 deletions
@@ -1,19 +1,16 @@ pkgbase = gmail-desktop - pkgdesc = Unofficial Gmail desktop app - pkgver = 3.0.0.alpha.36 + pkgdesc = Nifty Gmail desktop app + pkgver = 3.0.0_alpha.37 pkgrel = 1 - url = https://github.com/timche/gmail-desktop + url = https://github.com/timche/gmail-desktop/tree/develop arch = x86_64 license = MIT - makedepends = nvm - depends = electron25 - optdepends = libnotify: desktop notifications - optdepends = libappindicator-gtk3: tray icon - source = gmail-desktop-3.0.0.alpha.36.tar.gz::https://github.com/timche/gmail-desktop/archive/v3.0.0-alpha.36.tar.gz - source = gmail-desktop.sh - source = gmail-desktop.desktop - sha256sums = 0ac24a4c5db9fa5b0c9a46f0812014a9c95fb6c8b7443510f653b07cc35392f9 - sha256sums = 061a908aff82379fbaaabdf0227479b4a9efed96a7558fd9fbe0f12da837b2cb - sha256sums = b9a4fba1916c8b3e2ec55593b5700019c66c05a5da8f2f1b3f91edaddf0009dd + makedepends = gendesk + makedepends = npm + depends = electron21 + optdepends = libnotify: Desktop notifications + optdepends = libappindicator-gtk3: Tray icon + source = gmail-desktop-3.0.0-alpha.37.tar.gz::https://github.com/timche/gmail-desktop/archive/refs/tags/v3.0.0-alpha.37.tar.gz + sha256sums = f6edd6bc221ca57a98bb5a551266f040b3158b1a6aac4ab17111c78edcf2a24c pkgname = gmail-desktop @@ -1,67 +1,61 @@ -# Maintainer: +# Maintainer: Alec Mev <alec@mev.earth> # Contributor: Mark Wagie <mark dot wagie at proton dot me> + pkgname=gmail-desktop -_pkgver=3.0.0-alpha.36 -pkgver=${_pkgver//-/.} +_ver=3.0.0-alpha.37 +pkgver="${_ver//-/_}" pkgrel=1 -_nodeversion=14 -_electronversion=25 -pkgdesc="Unofficial Gmail desktop app" +pkgdesc='Nifty Gmail desktop app' arch=('x86_64') -url="https://github.com/timche/gmail-desktop" +url='https://github.com/timche/gmail-desktop/tree/develop' license=('MIT') -depends=("electron${_electronversion}") -makedepends=('nvm') -optdepends=('libnotify: desktop notifications' - 'libappindicator-gtk3: tray icon') -source=("$pkgname-$pkgver.tar.gz::$url/archive/v$_pkgver.tar.gz" - "$pkgname.sh" - "$pkgname.desktop") -sha256sums=('0ac24a4c5db9fa5b0c9a46f0812014a9c95fb6c8b7443510f653b07cc35392f9' - '061a908aff82379fbaaabdf0227479b4a9efed96a7558fd9fbe0f12da837b2cb' - '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 ]] -} +_electronv=21 # https://github.com/timche/gmail-desktop/issues/385#issuecomment-1634102694 +depends=("electron${_electronv}") +makedepends=( + 'gendesk' + 'npm' +) +optdepends=( + 'libnotify: Desktop notifications' + 'libappindicator-gtk3: Tray icon' +) +_dir="${pkgname}-${_ver}" +source=("${_dir}.tar.gz::https://github.com/timche/gmail-desktop/archive/refs/tags/v${_ver}.tar.gz") +sha256sums=('f6edd6bc221ca57a98bb5a551266f040b3158b1a6aac4ab17111c78edcf2a24c') prepare() { - cd "$pkgname-$_pkgver" - - # Disable husky + cd "${_dir}" sed -i '/husky/d' package.json - - _ensure_local_nvm - nvm install "${_nodeversion}" + cat > "${pkgname}" <<EOF +#!/usr/bin/env bash +exec electron${_electronv} /usr/share/${pkgname}/app.asar "\$@" +EOF + gendesk \ + --pkgname "${pkgname}" \ + --pkgdesc "${pkgdesc}" \ + --name 'Gmail Desktop' \ + --categories 'Network;Office;Email' \ + -n \ + -f } build() { - cd "$pkgname-$_pkgver" - electronDist="/usr/lib/electron$_electronversion" - electronVer="$(sed s/^v// /usr/lib/electron$_electronversion/version)" - _ensure_local_nvm - export npm_config_cache="$srcdir/npm_cache" - npm ci + cd "${_dir}" + npm i npm run build - ./node_modules/.bin/electron-builder --linux --x64 --dir \ - $dist -c.electronDist=$electronDist -c.electronVersion=$electronVer + npx electron-builder \ + --linux \ + --dir \ + -c.electronDist="/usr/lib/electron${_electronv}" \ + -c.electronVersion="$(cat "/usr/lib/electron${_electronv}/version")" } package() { - cd "$pkgname-$_pkgver" - install -d "$pkgdir/usr/lib/$pkgname" - cp -r --no-preserve=ownership dist/linux-unpacked/resources \ - "$pkgdir/usr/lib/$pkgname" - - install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname" - install -Dm644 build/icon.png "$pkgdir/usr/share/pixmaps/$pkgname.png" - install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname" - install -Dm644 "$srcdir/$pkgname.desktop" -t "$pkgdir/usr/share/applications" + cd "${_dir}" + mkdir -p "${pkgdir}/usr/share" + cp -r dist/linux-unpacked/resources "${pkgdir}/usr/share/${pkgname}" + install -Dm755 -t "${pkgdir}/usr/bin/" "${pkgname}" + install -Dm644 -t "${pkgdir}/usr/share/applications/" "${pkgname}.desktop" + install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE + install -Dm644 -t "${pkgdir}/usr/share/pixmaps/" build/icon.png } diff --git a/gmail-desktop.desktop b/gmail-desktop.desktop deleted file mode 100644 index b9e656e29fde..000000000000 --- a/gmail-desktop.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Gmail Desktop -Exec=gmail-desktop -Terminal=false -Type=Application -Icon=gmail-desktop -StartupWMClass=Gmail Desktop -Comment=Nifty Gmail desktop app -Categories=Network;Email; diff --git a/gmail-desktop.sh b/gmail-desktop.sh deleted file mode 100644 index ce518457a3cd..000000000000 --- a/gmail-desktop.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -exec electron25 /usr/lib/gmail-desktop/resources/app.asar "$@" |