3.0.0-alpha.28

3 files changed, 23 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9ad39105fc2b..bcada2a2a072 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = gmail-desktop
 	pkgdesc = Unofficial Gmail desktop app
-	pkgver = 2.25.3
-	pkgrel = 6
+	pkgver = 3.0.0.alpha.28
+	pkgrel = 1
 	url = https://github.com/timche/gmail-desktop
 	arch = x86_64
 	license = MIT
-	makedepends = nvm
 	makedepends = yarn
-	depends = electron12
+	depends = electron
 	optdepends = libnotify: desktop notifications
 	optdepends = libappindicator-gtk3: tray icon
-	source = gmail-desktop-2.25.3.tar.gz::https://github.com/timche/gmail-desktop/archive/v2.25.3.tar.gz
+	source = gmail-desktop-3.0.0.alpha.28.tar.gz::https://github.com/timche/gmail-desktop/archive/v3.0.0-alpha.28.tar.gz
 	source = gmail-desktop.sh
 	source = gmail-desktop.desktop
-	sha256sums = 0720125a9fcd15f7892bc498de85684f3bc48e89e9c59fd9dc4e1a8c96cb990f
-	sha256sums = 9e7336fab6cd1d4bce6fd4046737fa8e502bf6ae6a8c18d83a3a2847deba7505
+	sha256sums = fc554353fd565c31cc82d1466f7d5e2897843d66a4a919143f8ef92cf6f1869d
+	sha256sums = a1f2eb9525dd10556ffde37a4dc9e06636a81d1d9ce815d1167e48954abee1dc
 	sha256sums = 8c30e207fe88455f63f4c0b2ae9087a2ca2bbeaa68b9be244c31a9ec392373c4
 
 pkgname = gmail-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 0aacc5492370..ceb5eb85e1c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,21 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=gmail-desktop
-pkgver=2.25.3
-pkgrel=6
-_electronversion=12
-_nodeversion=14
+_pkgver=3.0.0-alpha.28
+pkgver=${_pkgver//-/.}
+pkgrel=1
 pkgdesc="Unofficial Gmail desktop app"
 arch=('x86_64')
 url="https://github.com/timche/gmail-desktop"
 license=('MIT')
-depends=("electron${_electronversion}")
-makedepends=('nvm' 'yarn')
+depends=('electron')
+makedepends=('yarn')
 optdepends=('libnotify: desktop notifications'
             'libappindicator-gtk3: tray icon')
-source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$_pkgver.tar.gz"
         "$pkgname.sh"
         "$pkgname.desktop")
-sha256sums=('0720125a9fcd15f7892bc498de85684f3bc48e89e9c59fd9dc4e1a8c96cb990f'
-            '9e7336fab6cd1d4bce6fd4046737fa8e502bf6ae6a8c18d83a3a2847deba7505'
+sha256sums=('fc554353fd565c31cc82d1466f7d5e2897843d66a4a919143f8ef92cf6f1869d'
+            'a1f2eb9525dd10556ffde37a4dc9e06636a81d1d9ce815d1167e48954abee1dc'
             '8c30e207fe88455f63f4c0b2ae9087a2ca2bbeaa68b9be244c31a9ec392373c4')
 
 _ensure_local_nvm() {
@@ -31,29 +30,28 @@ _ensure_local_nvm() {
 }
 
 prepare() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgname-$_pkgver"
 
   # Disable husky
   sed -i '/husky/d' package.json
 
-  _ensure_local_nvm
-  nvm install "$_nodeversion"
+#  _ensure_local_nvm
+#  nvm install "$_nodeversion"
 }
 
 build() {
-  cd "$pkgname-$pkgver"
-  _ensure_local_nvm
-  electronDist="/usr/lib/electron$_electronversion"
-  electronVer="$(sed s/^v// /usr/lib/electron$_electronversion/version)"
+  cd "$pkgname-$_pkgver"
+  electronDist="/usr/lib/electron"
+  electronVer="$(sed s/^v// /usr/lib/electron/version)"
   yarn config set cache-folder "$srcdir/yarn-cache"
   yarn install
-  yarn compile
+  yarn build
   ./node_modules/.bin/electron-builder --linux --x64 --dir \
     $dist -c.electronDist=$electronDist -c.electronVersion=$electronVer
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgname-$_pkgver"
   install -d "$pkgdir/usr/lib/$pkgname"
   cp -r --no-preserve=ownership dist/linux-unpacked/resources \
     "$pkgdir/usr/lib/$pkgname"
diff --git a/gmail-desktop.sh b/gmail-desktop.sh
index 99bcd7dda6d0..145adc7f4363 100644
--- a/gmail-desktop.sh
+++ b/gmail-desktop.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec electron12 /usr/lib/gmail-desktop/resources/app.asar "$@"
+exec electron /usr/lib/gmail-desktop/resources/app.asar "$@"