2024.3

2 files changed, 27 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b32c7b3fab71..4136b8e20075 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mullvad-vpn-beta
 	pkgdesc = The Mullvad VPN client app for desktop (beta channel)
-	pkgver = 2024.3.beta1
+	pkgver = 2024.3.stable
 	pkgrel = 1
 	url = https://www.mullvad.net
 	install = mullvad-vpn.install
@@ -10,7 +10,7 @@ pkgbase = mullvad-vpn-beta
 	makedepends = git
 	makedepends = go
 	makedepends = libxcrypt-compat
-	makedepends = npm
+	makedepends = nvm
 	makedepends = protobuf
 	depends = alsa-lib
 	depends = gtk3
@@ -20,14 +20,14 @@ pkgbase = mullvad-vpn-beta
 	depends = nss
 	provides = mullvad-vpn
 	conflicts = mullvad-vpn
-	source = git+https://github.com/mullvad/mullvadvpn-app.git#tag=2024.3-beta1
+	source = git+https://github.com/mullvad/mullvadvpn-app.git#tag=2024.3
 	source = git+https://github.com/mullvad/mullvadvpn-app-binaries.git#commit=7db2c76522e29b4acd8f461fc87f794954c6df95?signed
 	source = no-rpm.diff
 	source = mullvad-vpn.sh
 	validpgpkeys = 225E40C8F1C8DEB7977ABF59F293063FECE2E8ED
 	validpgpkeys = 8339C7D2942EB854E3F27CE5AEE9DECFD582E984
 	validpgpkeys = 4B986EF5222BA1B810230C602F391DE6B00D619C
-	sha256sums = 0686d45a62e8d88691b48f30096d013e3d3eab85560e638cf387bf124fc37850
+	sha256sums = 8064e0181b1d30352f25eab563bade47b2fd157ca9646b97aff928241d9870ea
 	sha256sums = 76015a774788a2274d29e3fa1e06cb752a8488f24a973b5143d8659d5b290e9c
 	sha256sums = ea35edffea2cbbb05586abce19581fdd9f133801ed47e6af30fa64a29c5cf116
 	sha256sums = 2262346cb57deb187fe32a88ccd873dab669598889269088e749197c6e88954f
diff --git a/PKGBUILD b/PKGBUILD
index 66b0f252fe76..634e016cf7a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,30 +3,31 @@
 # Contributor: Jeff Henson <jeff at henson dot io>
 pkgname=mullvad-vpn-beta
 _pkgver=2024.3
-_channel=beta
+_channel=stable
 _rel=1
-pkgver=${_pkgver}.${_channel}${_rel}  # beta
-#pkgver=${_pkgver}.${_channel}   stable
+#pkgver=${_pkgver}.${_channel}${_rel}  # beta
+pkgver=${_pkgver}.${_channel}  # stable
 pkgrel=1
+_nodeversion=20
 pkgdesc="The Mullvad VPN client app for desktop (beta channel)"
 arch=('x86_64')
 url="https://www.mullvad.net"
 license=('GPL-3.0-or-later')
 depends=('alsa-lib' 'gtk3' 'iputils' 'libnftnl' 'libnotify' 'nss')
-makedepends=('cargo' 'git' 'go' 'libxcrypt-compat' 'npm' 'protobuf')
+makedepends=('cargo' 'git' 'go' 'libxcrypt-compat' 'nvm' 'protobuf')
 provides=("${pkgname%-beta}")
 conflicts=("${pkgname%-beta}")
 install="${pkgname%-beta}.install"
 _commit=7db2c76522e29b4acd8f461fc87f794954c6df95
 source=(
   # tag signed by Oskar Nyberg (raksooo), public key not uploaded yet
-  "git+https://github.com/mullvad/mullvadvpn-app.git#tag=${_pkgver}-${_channel}${_rel}"  # beta
-#  "git+https://github.com/mullvad/mullvadvpn-app.git#tag=${_pkgver}"  # stable
+#  "git+https://github.com/mullvad/mullvadvpn-app.git#tag=${_pkgver}-${_channel}${_rel}"  # beta
+  "git+https://github.com/mullvad/mullvadvpn-app.git#tag=${_pkgver}"  # stable
   "git+https://github.com/mullvad/mullvadvpn-app-binaries.git#commit=${_commit}?signed"
   'no-rpm.diff'
   "${pkgname%-beta}.sh"
 )
-sha256sums=('0686d45a62e8d88691b48f30096d013e3d3eab85560e638cf387bf124fc37850'
+sha256sums=('8064e0181b1d30352f25eab563bade47b2fd157ca9646b97aff928241d9870ea'
             '76015a774788a2274d29e3fa1e06cb752a8488f24a973b5143d8659d5b290e9c'
             'ea35edffea2cbbb05586abce19581fdd9f133801ed47e6af30fa64a29c5cf116'
             '2262346cb57deb187fe32a88ccd873dab669598889269088e749197c6e88954f')
@@ -35,6 +36,17 @@ validpgpkeys=('225E40C8F1C8DEB7977ABF59F293063FECE2E8ED' # Linus Färnstrand <li
               '4B986EF5222BA1B810230C602F391DE6B00D619C' # Oskar Nyberg (code signing) <oskar@mullvad.net>
               )
 
+_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 mullvadvpn-app
   git submodule init
@@ -57,6 +69,8 @@ prepare() {
   pushd gui
   echo "Installing JavaScript dependencies..."
   export npm_config_cache="$srcdir/npm_cache"
+  _ensure_local_nvm
+  nvm install "${_nodeversion}"
   npm ci
   popd
 }
@@ -107,7 +121,7 @@ build() {
   done
 
   echo "Updating relays.json..."
-  cargo run --bin relay_list --frozen --release > dist-assets/relays.json
+  cargo run --bin relay_list "${CARGO_ARGS[@]}" > build/relays.json
 
   # Move binaries to correct locations in dist-assets
   binaries=(
@@ -126,6 +140,7 @@ build() {
   pushd gui
   echo "Packing Mullvad VPN ${PRODUCT_VERSION} artifact(s)..."
   export npm_config_cache="$srcdir/npm_cache"
+  _ensure_local_nvm
   npm run pack:linux --release
   popd
 }