update to 3.32.3079.r284.g3c4b3ee0

3 files changed, 35 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 920b980c560a..1eb5943f855e 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = wire-desktop-git
 	pkgdesc = End-to-end encrypted messenger with file sharing, voice calls and video conferences
-	pkgver = 3.32.3079.r228.gd3c93071
+	pkgver = 3.32.3079.r284.g3c4b3ee0
 	pkgrel = 1
 	url = https://wire.com/
 	arch = any
 	license = GPL3
 	makedepends = git
-	makedepends = npm>=6.14.18
-	makedepends = nodejs>=14.21.3
+	makedepends = npm
+	makedepends = nvm
 	makedepends = yarn
 	makedepends = gendesk
 	depends = electron27
@@ -17,6 +17,6 @@ pkgbase = wire-desktop-git
 	source = wire-desktop::git+https://github.com/wireapp/wire-desktop.git
 	source = wire-desktop.sh
 	sha256sums = SKIP
-	sha256sums = 6c6eb0824060c4e3a363206b30759056a2f92ee9947333c218264c2c0d569091
+	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
 
 pkgname = wire-desktop-git
diff --git a/PKGBUILD b/PKGBUILD
index 8da8faa27880..c5c1ebf86300 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,9 @@
 # Contributor: Conor Anderson <conor@conr.ca>
 # Contributor: Maxim Baz <$pkgname at maximbaz dot com>
 pkgname=wire-desktop-git
-pkgver=3.32.3079.r228.gd3c93071
+pkgver=3.32.3079.r284.g3c4b3ee0
+_electronversion=27
+_nodeversion=14
 pkgrel=1
 pkgdesc='End-to-end encrypted messenger with file sharing, voice calls and video conferences'
 arch=('any')
@@ -16,8 +18,8 @@ depends=(
 )
 makedepends=(
     'git'
-    'npm>=6.14.18'
-    'nodejs>=14.21.3'
+    'npm'
+    'nvm'
     'yarn'
     'gendesk'
 )
@@ -29,16 +31,30 @@ source=(
     "${pkgname%-git}.sh"
 )
 sha256sums=('SKIP'
-            '6c6eb0824060c4e3a363206b30759056a2f92ee9947333c218264c2c0d569091')
+            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
 pkgver() {
     cd "${srcdir}/${pkgname%-git}"
     git describe --tags | sed 's/\w\+\///g;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
+_ensure_local_nvm() {
+    export NVM_DIR="${srcdir}/.nvm"
+    source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+    nvm install "${_nodeversion}"
+    nvm use "${_nodeversion}"
+}
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname%-git}.sh"
+    _ensure_local_nvm
     gendesk -q -f -n --categories "Network" --name "${pkgname%-git}" --exec "${pkgname%-git}"
     cd "${srcdir}/${pkgname%-git}"
+    export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+    export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
+    export ELECTRONVERSION="${_electronversion}"
     sed "s|, 'deb', 'rpm'||g" -i bin/build-tools/lib/build-linux.ts
-    yarn --immutable
+    yarn install --immutable #--cache-folder "${srcdir}/.yarn_cache"
     yarn build:linux:internal
 }
 package() {
diff --git a/wire-desktop.sh b/wire-desktop.sh
index 859474a03c18..2ec4412e5c4f 100644
--- a/wire-desktop.sh
+++ b/wire-desktop.sh
@@ -1,11 +1,14 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron27
-APPDIR="/usr/lib/wire-desktop"
-export PATH="${APPDIR}:${PATH}"
-#export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/app.asar"
+set -e
+_APPDIR="/usr/lib/@appname@"
+export PATH="${_APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${_APPDIR}/@appasar@"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
 fi
\ No newline at end of file