5.3.0

3 files changed, 13 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 15a661c57a3f..99c623bb2a91 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
 pkgbase = android-messages-desktop
 	pkgdesc = Android Messages as a cross-platform desktop app
-	pkgver = 5.2.1
+	pkgver = 5.3.0
 	pkgrel = 1
 	url = https://github.com/OrangeDrangon/android-messages-desktop
 	arch = x86_64
 	license = MIT
 	makedepends = git
-	makedepends = nvm
 	makedepends = yarn
-	depends = electron11
-	source = android-messages-desktop-5.2.1.tar.gz::https://github.com/OrangeDrangon/android-messages-desktop/archive/v5.2.1.tar.gz
+	depends = electron
+	source = android-messages-desktop-5.3.0.tar.gz::https://github.com/OrangeDrangon/android-messages-desktop/archive/v5.3.0.tar.gz
 	source = android-messages-desktop.sh
 	source = android-messages-desktop.desktop
-	sha256sums = c5c7aca59cc84a3dd1a42c3cc2e574d30c02db1ac360805c4fef04b51d6b6c3e
-	sha256sums = 5d4a885c7a4cf6330df5b00b39f51da85af38c715ed72233286bd296f2bb2c57
+	sha256sums = 0467dae2aa47b02f8d89782176275ff80bd2b75cd55cc4e7cb4567b19b2de4c9
+	sha256sums = ef967c944762e6032c78db578be46a89e5eac2bc8bee856e21d67a6029e1dc69
 	sha256sums = 1bf16b8864712b0c1de72d8c3764db14b75ecf64dae44d206a26aa036ac53b1a
 
 pkgname = android-messages-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 4bcc3fd20372..29651c47dcd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,28 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=android-messages-desktop
-pkgver=5.2.1
+pkgver=5.3.0
 pkgrel=1
-_electronversion=11
-_nodeversion=15
 pkgdesc="Android Messages as a cross-platform desktop app"
 arch=('x86_64')
 url="https://github.com/OrangeDrangon/android-messages-desktop"
 license=('MIT')
-depends=("electron${_electronversion}")
-makedepends=('git' 'nvm' 'yarn')
+depends=('electron')
+makedepends=('git' 'yarn')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
         "$pkgname.sh"
         "$pkgname.desktop")
-sha256sums=('c5c7aca59cc84a3dd1a42c3cc2e574d30c02db1ac360805c4fef04b51d6b6c3e'
-            '5d4a885c7a4cf6330df5b00b39f51da85af38c715ed72233286bd296f2bb2c57'
+sha256sums=('0467dae2aa47b02f8d89782176275ff80bd2b75cd55cc4e7cb4567b19b2de4c9'
+            'ef967c944762e6032c78db578be46a89e5eac2bc8bee856e21d67a6029e1dc69'
             '1bf16b8864712b0c1de72d8c3764db14b75ecf64dae44d206a26aa036ac53b1a')
 
-_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 "$_nodeversion"
-}
-
 build() {
   cd "$pkgname-$pkgver"
   electronDist="/usr/lib/electron$_electronversion"
   electronVer="$(sed s/^v// /usr/lib/electron$_electronversion/version)"
-  _ensure_local_nvm
   yarn config set cache-folder "$srcdir/yarn-cache"
   yarn install
-  yarn build
-  ./node_modules/.bin/electron-builder --linux --x64 --dir \
+  yarn webpack --mode=production
+  yarn electron-builder --linux --x64 --dir \
     $dist -c.electronDist=$electronDist -c.electronVersion=$electronVer
 }
 
diff --git a/android-messages-desktop.sh b/android-messages-desktop.sh
index eca222171c8b..76a9337d50ed 100644
--- a/android-messages-desktop.sh
+++ b/android-messages-desktop.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec electron11 /usr/lib/android-messages-desktop/resources/app.asar "$@"
+exec electron /usr/lib/android-messages-desktop/resources/app.asar "$@"