diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 38 |
1 files changed, 26 insertions, 12 deletions
@@ -4,33 +4,41 @@ # Contributor: David Birks <david at tellus dot space> # Contributor: Jeff Henson <jeff at henson dot io> pkgname=mullvad-vpn -pkgver=2024.1 -pkgrel=1 +pkgver=2024.3 +pkgrel=2 +_nodeversion=20 pkgdesc="The Mullvad VPN client app for desktop" 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') install="$pkgname.install" -_tag=b261238598f0237aaf420354445797a12a45d907 # tags/2024.1^0 -_commit=d5772339cee9c1a0d7671968746f02499b78e245 -source=("git+https://github.com/mullvad/mullvadvpn-app.git#commit=${_tag}" # signed by Oskar Nyberg (raksooo), public key not uploaded yet +_commit=7db2c76522e29b4acd8f461fc87f794954c6df95 +source=("git+https://github.com/mullvad/mullvadvpn-app.git#tag=$pkgver" # signed by Oskar Nyberg (raksooo), public key not uploaded yet "git+https://github.com/mullvad/mullvadvpn-app-binaries.git#commit=${_commit}?signed" 'no-rpm.diff' + 'no-publish.diff' "$pkgname.sh") -sha256sums=('SKIP' - 'SKIP' +sha256sums=('8064e0181b1d30352f25eab563bade47b2fd157ca9646b97aff928241d9870ea' + '76015a774788a2274d29e3fa1e06cb752a8488f24a973b5143d8659d5b290e9c' 'ea35edffea2cbbb05586abce19581fdd9f133801ed47e6af30fa64a29c5cf116' + '968967efff8e9588f15c382825b609cf89d54c47e0632e92e9ef2354aa46f31b' '2262346cb57deb187fe32a88ccd873dab669598889269088e749197c6e88954f') validpgpkeys=('225E40C8F1C8DEB7977ABF59F293063FECE2E8ED' # Linus Färnstrand <linus@mullvad.net> '8339C7D2942EB854E3F27CE5AEE9DECFD582E984' # David Lönnhager (code signing) <david.l@mullvad.net> '4B986EF5222BA1B810230C602F391DE6B00D619C' # Oskar Nyberg (code signing) <oskar@mullvad.net> ) -pkgver() { - cd mullvadvpn-app - git describe --tags | sed 's/-/./g' +_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() { @@ -42,6 +50,9 @@ prepare() { # Disable building rpm patch --strip=1 gui/tasks/distribution.js < ../no-rpm.diff + # Disable publishing for CIs + patch --strip=1 gui/tasks/distribution.js < ../no-publish.diff + export CARGO_HOME="$srcdir/cargo-home" export RUSTUP_TOOLCHAIN=stable cargo fetch --locked --target "$CARCH-unknown-linux-gnu" @@ -55,6 +66,8 @@ prepare() { pushd gui echo "Installing JavaScript dependencies..." export npm_config_cache="$srcdir/npm_cache" + _ensure_local_nvm + nvm install "${_nodeversion}" npm ci popd } @@ -105,7 +118,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=( @@ -124,6 +137,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 } |