summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wagie2024-05-16 09:43:44 -0600
committerMark Wagie2024-05-16 09:43:44 -0600
commitf8a9fc649797a300a254f5e941d5ee722e87c089 (patch)
tree59ec3980a96fc8501aa7753687e9daa8f9b5b6ce
parent4e84459e6bbc2a9bbe2ac3b6908bd541088cfd07 (diff)
downloadaur-f8a9fc649797a300a254f5e941d5ee722e87c089.tar.gz
fix patch & actually apply it
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--no-publish.diff4
3 files changed, 7 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4aec47c3043e..364336c1b500 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mullvad-vpn-beta
pkgdesc = The Mullvad VPN client app for desktop (beta channel)
pkgver = 2024.3.stable
- pkgrel = 2
+ pkgrel = 3
url = https://www.mullvad.net
install = mullvad-vpn.install
arch = x86_64
@@ -31,7 +31,7 @@ pkgbase = mullvad-vpn-beta
sha256sums = 8064e0181b1d30352f25eab563bade47b2fd157ca9646b97aff928241d9870ea
sha256sums = 76015a774788a2274d29e3fa1e06cb752a8488f24a973b5143d8659d5b290e9c
sha256sums = ea35edffea2cbbb05586abce19581fdd9f133801ed47e6af30fa64a29c5cf116
- sha256sums = ef7a74e0c26c315e8f5a7b62c19ec0d30ab49f053c8f6215cce2f746ef79366b
+ sha256sums = 462bb42d3121058fc54faae310303caa91533da533b5265dac1d2013faa6d7bd
sha256sums = 2262346cb57deb187fe32a88ccd873dab669598889269088e749197c6e88954f
pkgname = mullvad-vpn-beta
diff --git a/PKGBUILD b/PKGBUILD
index ebcd7eb0f3e7..6cb2aeed6970 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _channel=stable
_rel=1
#pkgver=${_pkgver}.${_channel}${_rel} # beta
pkgver=${_pkgver}.${_channel} # stable
-pkgrel=2
+pkgrel=3
_nodeversion=20
pkgdesc="The Mullvad VPN client app for desktop (beta channel)"
arch=('x86_64')
@@ -31,7 +31,7 @@ source=(
sha256sums=('8064e0181b1d30352f25eab563bade47b2fd157ca9646b97aff928241d9870ea'
'76015a774788a2274d29e3fa1e06cb752a8488f24a973b5143d8659d5b290e9c'
'ea35edffea2cbbb05586abce19581fdd9f133801ed47e6af30fa64a29c5cf116'
- 'ef7a74e0c26c315e8f5a7b62c19ec0d30ab49f053c8f6215cce2f746ef79366b'
+ '462bb42d3121058fc54faae310303caa91533da533b5265dac1d2013faa6d7bd'
'2262346cb57deb187fe32a88ccd873dab669598889269088e749197c6e88954f')
validpgpkeys=('225E40C8F1C8DEB7977ABF59F293063FECE2E8ED' # Linus Färnstrand <linus@mullvad.net>
'8339C7D2942EB854E3F27CE5AEE9DECFD582E984' # David Lönnhager (code signing) <david.l@mullvad.net>
@@ -58,6 +58,9 @@ prepare() {
# Disable building rpm
patch --strip=1 gui/tasks/distribution.js < ../no-rpm.diff
+ # Disabling 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"
diff --git a/no-publish.diff b/no-publish.diff
index d4720118039a..2a4373b41a50 100644
--- a/no-publish.diff
+++ b/no-publish.diff
@@ -1,8 +1,4 @@
diff --git a/no-publish.diff b/no-publish.diff
-new file mode 100644
-index 0000000..6a4c209
---- /dev/null
-+++ b/no-publish.diff
@@ -0,0 +1,10 @@
+--- distribution.js.old 2024-05-16 10:13:58.328775776 +0000
++++ distribution.js.new 2024-05-16 10:13:32.759370789 +0000