aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorlibertylocked2021-04-04 12:06:18 -0700
committerlibertylocked2021-04-04 12:06:18 -0700
commit37179a1ffc1c205caa573a9088ca7d22712567e7 (patch)
tree977e1464b100657070b641d6201edf57b18dc442
parente9b95d8667abac2db6e0e06acf61db86ef5d528f (diff)
downloadaur-37179a1ffc1c205caa573a9088ca7d22712567e7.tar.gz
use electron11 instead of electron
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
-rw-r--r--bitwarden.sh2
3 files changed, 9 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ac0b4f8ac23f..a972875c4ca1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = bitwarden
pkgdesc = Bitwarden Desktop Application
pkgver = 1.25.1
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/bitwarden/desktop
arch = x86_64
arch = aarch64
@@ -15,7 +15,7 @@ pkgbase = bitwarden
makedepends = pkgconf
makedepends = make
makedepends = gcc
- depends = electron
+ depends = electron11
depends = libnotify
depends = libsecret
depends = libxtst
@@ -31,7 +31,7 @@ pkgbase = bitwarden
sha512sums = c9ea45df3dbdf057ea26f98a0b43ffea97c7d042f595505ccf067d59558556f2392b551e6b88cf4efdc6f9b16f58f4dbefe631386342a59d94ef0e9f0403c9c7
sha512sums = 5aa3ede161fb717baad4da559b8f39d6fee3f32c430ea56d2698145ce90af0ee70fb887df41c355747bc9c1edc3f86b7d8a070764a0464682b374404c8bb1ef8
sha512sums = cbe6dff699de7a274b7c5ab1dd25a348443dd3dc50eb8b2290c8c300b6b3a560271aef773b2cd55d25ccaa1527ed25d5626310f6da342f2893d2f63212bd2814
- sha512sums = 724b548688e2af1d8d25e6ebe6e35831e891453f2df011e5fa757b57fcbcfef3c171510be4537652891441c65121bd9766f372f82d3edd5971fb77b726409575
+ sha512sums = 32c29a7baed80351acf5753d35df404a818d5c88cc85f3bbed2daa5351aaf0dba20fd03cbedbcb407324f305d4556adb476ecc9ccd07bac0511ca4a943020ea4
sha512sums = 05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd
pkgname = bitwarden
diff --git a/PKGBUILD b/PKGBUILD
index 613ff8724c37..f9b8191293ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=bitwarden
pkgver=1.25.1
-pkgrel=1
+pkgrel=2
_jslibcommit='7cc23dab72e505ab3cc255f2d035dc0c79ec7a53'
_nodeversion='10.24.0'
pkgdesc='Bitwarden Desktop Application'
@@ -11,7 +11,7 @@ arch=('x86_64' 'aarch64')
url='https://github.com/bitwarden/desktop'
license=('GPL3')
makedepends=('git' 'npm' 'python' 'nvm' 'jq' 'patch' 'pkgconf' 'make' 'gcc')
-depends=('electron' 'libnotify' 'libsecret' 'libxtst')
+depends=('electron11' 'libnotify' 'libsecret' 'libxtst')
conflicts=('bitwarden-git' 'bitwarden-bin')
options=('!strip' '!emptydirs')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/bitwarden/desktop/archive/v${pkgver}.tar.gz"
@@ -22,7 +22,7 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/bitwarden/desktop/archi
sha512sums=('c9ea45df3dbdf057ea26f98a0b43ffea97c7d042f595505ccf067d59558556f2392b551e6b88cf4efdc6f9b16f58f4dbefe631386342a59d94ef0e9f0403c9c7'
'5aa3ede161fb717baad4da559b8f39d6fee3f32c430ea56d2698145ce90af0ee70fb887df41c355747bc9c1edc3f86b7d8a070764a0464682b374404c8bb1ef8'
'cbe6dff699de7a274b7c5ab1dd25a348443dd3dc50eb8b2290c8c300b6b3a560271aef773b2cd55d25ccaa1527ed25d5626310f6da342f2893d2f63212bd2814'
- '724b548688e2af1d8d25e6ebe6e35831e891453f2df011e5fa757b57fcbcfef3c171510be4537652891441c65121bd9766f372f82d3edd5971fb77b726409575'
+ '32c29a7baed80351acf5753d35df404a818d5c88cc85f3bbed2daa5351aaf0dba20fd03cbedbcb407324f305d4556adb476ecc9ccd07bac0511ca4a943020ea4'
'05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd')
prepare() {
@@ -35,9 +35,9 @@ prepare() {
patch --strip=1 package.json ${srcdir}/package.json.patch
# Patch build to make it work with system electron
- SYSTEM_ELECTRON_VERSION=$(pacman -Q electron | cut -d' ' -f2 | cut -d'-' -f1)
+ SYSTEM_ELECTRON_VERSION=$(pacman -Q electron11 | cut -d' ' -f2 | cut -d'-' -f1)
jq < package.json --arg ver $SYSTEM_ELECTRON_VERSION\
- '.build["electronVersion"]=$ver | .build["electronDist"]="/usr/lib/electron"'\
+ '.build["electronVersion"]=$ver | .build["electronDist"]="/usr/lib/electron11"'\
> package.json.patched
mv package.json.patched package.json
}
diff --git a/bitwarden.sh b/bitwarden.sh
index 4897dddbf7af..23d3e7634b40 100644
--- a/bitwarden.sh
+++ b/bitwarden.sh
@@ -1,3 +1,3 @@
#!/bin/sh
export ELECTRON_IS_DEV=0
-exec electron /usr/lib/bitwarden/resources/app.asar $@ \ No newline at end of file
+exec electron11 /usr/lib/bitwarden/resources/app.asar $@ \ No newline at end of file