no more python2 makedepends

1 files changed, 12 insertions, 10 deletions

diff --git a/PKGBUILD b/PKGBUILD
index da0d1648a068..f86369cb3f36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,35 +3,40 @@
 
 pkgname=bitwarden
 pkgver=1.16.6
-pkgrel=5
+pkgrel=6
 _jslibcommit='53d08067df953e7a66ebf0b972e6443e1f275d86'
 _nodeversion='10.19.0'
 pkgdesc='Bitwarden Desktop Application'
 arch=('x86_64')
 url='https://github.com/bitwarden/desktop'
 license=('GPL3')
-makedepends=('git' 'npm' 'nvm' 'jq' 'python2')
+makedepends=('git' 'npm' 'nvm' 'jq' 'patch')
 depends=('alsa-lib' 'electron' 'gtk2' 'libnotify' 'libsecret' 'libxss' 'libxtst' 'nss')
 conflicts=('bitwarden-git' 'bitwarden-bin')
 options=('!strip' '!emptydirs')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/bitwarden/desktop/archive/v${pkgver}.tar.gz"
         "jslib-${_jslibcommit}.tar.gz::https://github.com/bitwarden/jslib/archive/${_jslibcommit}.tar.gz"
+        "package.json.patch"
         "${pkgname}.sh"
         "${pkgname}.desktop")
 sha512sums=('9b372488a6521443c78a68114f83b8bbcabd2adc366e993e11e79cc5f7e60417fe21bd050eb0eea7a352c4b24f96c7f8cda96a3c90afebe6b424a2973d4f2f54'
             'db30beb20b9dbde28336f48ff315e552000c878cd62eea7cf5f42ba24759be605b49066489367973463aa4a8eb0d3ce0e69b0918706e40858810d53208bbaab4'
-            '72e86cb727ad0223937ad0fc95867e1485fa5180e5ed28010f732bc3fe7e562750c88c8b54d47cfa6fbbbc573c489961f1e024f7cd8a356c905650fc56a3c224'
+            'f51ad4e9d3cf7a3f266f4a5341c46a11c053c1c1f4ba834ac6ae75ad4f1f383d0f3aea6127cbb83693bc75df77f59ffc038bbf2d67af1f732479634fe76dfa7a'
+            '724b548688e2af1d8d25e6ebe6e35831e891453f2df011e5fa757b57fcbcfef3c171510be4537652891441c65121bd9766f372f82d3edd5971fb77b726409575'
             '05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd')
 
 prepare() {
   # Link jslib
   rmdir "${srcdir}/desktop-${pkgver}/jslib"
   ln -s "${srcdir}/jslib-${_jslibcommit}" "${srcdir}/desktop-${pkgver}/jslib"
-  sed -i 's/ && npm run sub:init//' "${srcdir}/desktop-${pkgver}/package.json"
-  # Patch the build config in package.json so it works with system electron
-  SYSTEM_ELECTRON_VERSION=$(electron --version | sed -r 's/v//')
   cd "${srcdir}/desktop-${pkgver}"
-  jq < package.json --arg ver $SYSTEM_ELECTRON_VERSION '.build["electronVersion"]=$ver | .build["electronDist"]="/usr/lib/electron"' > package.json.patched
+  # Patch out postinstall routines
+  patch --strip=1 package.json ${srcdir}/package.json.patch
+  # Patch build to make it work with system electron
+  SYSTEM_ELECTRON_VERSION=$(electron --version | sed -r 's/v//')
+  jq < package.json --arg ver $SYSTEM_ELECTRON_VERSION\
+  '.build["electronVersion"]=$ver | .build["electronDist"]="/usr/lib/electron"'\
+  > package.json.patched
   mv package.json.patched package.json
 }
 
@@ -48,9 +53,6 @@ build() {
   npm install
   npm run build
   npm run clean:dist
-  # Make unpacked dist using electron-builder.
-  # Don't use `npm run dist:lin` because it builds a bunch of other irrelevant
-  # platforms as it uses the config in package.json
   npx electron-builder --dir build
 
   # Restore node config from nvm