Date: Tuesday, September 27, 2022 @ 15:14:12 Author: alex19ep Revision: 1312610
upgpkg: bitwarden 2022.9.1-1 upstream release Added: bitwarden/trunk/nativelib.patch Modified: bitwarden/trunk/PKGBUILD -----------------+ PKGBUILD | 10 ++++++++-- nativelib.patch | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-27 15:14:02 UTC (rev 1312609) +++ PKGBUILD 2022-09-27 15:14:12 UTC (rev 1312610) @@ -2,7 +2,7 @@ # Contributor: libertylocked <[email protected]> pkgname=bitwarden -pkgver=2022.8.1 +pkgver=2022.9.1 pkgrel=1 _electronversion=19 pkgdesc='A secure and free password manager for all of your devices' @@ -10,13 +10,15 @@ url='https://github.com/bitwarden/clients/tree/master/apps/desktop' license=('GPL3') depends=("electron$_electronversion" 'libnotify' 'libsecret' 'libxtst' 'libxss' 'libnss_nis') -makedepends=('git' 'npm' 'python' 'node-gyp' 'nodejs-lts-gallium' 'jq') +makedepends=('git' 'npm' 'python' 'node-gyp' 'nodejs-lts-gallium' 'jq' 'rust') source=(bitwarden::git+https://github.com/bitwarden/clients.git#tag=desktop-v$pkgver messaging.main.ts.patch + nativelib.patch ${pkgname}.sh ${pkgname}.desktop) sha512sums=('SKIP' 'babcae0dba4d036e5d2cd04d8932b63253bc7b27b14d090932066e9d39383f7565c06d72dae9f96e741b494ef7e50a1fe7ec33905aa3124b427a8bf404df5762' + '88610cba9dea99aefdfea51139f5770f04f1e877d75e86f2eea3470c99880282c5ff91060cb08d92cdf00d0a1b3bd40c5f3ee887cee11946dd31ca06da978272' '98d2860bef2283fd09710fbbc5362d7ef2cd8eca26f35805ea258f2dacba78bd6aab14c834388a5089a8150eb0f32a82577aab10f8ad68e1a6371959b2802ad4' '05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd') @@ -39,6 +41,7 @@ # > package.json.patched # mv package.json.patched package.json cd ../../ + patch --strip=1 apps/desktop/desktop_native/index.js "$srcdir/nativelib.patch" npm ci } @@ -49,7 +52,10 @@ export npm_config_build_from_source=true export npm_config_cache="$srcdir/npm_cache" export ELECTRON_SKIP_BINARY_DOWNLOAD=1 + pushd desktop_native/ npm run build + popd + npm run build npm run clean:dist npm exec -c "electron-builder --linux --x64 --dir -c.electronDist=$electronDist \ -c.electronVersion=$electronVer" Added: nativelib.patch =================================================================== --- nativelib.patch (rev 0) +++ nativelib.patch 2022-09-27 15:14:12 UTC (rev 1312610) @@ -0,0 +1,21 @@ +diff --git i/apps/desktop/desktop_native/index.js w/apps/desktop/desktop_native/index.js +index 8b48ac994..db9e13eb8 100644 +--- i/apps/desktop/desktop_native/index.js ++++ w/apps/desktop/desktop_native/index.js +@@ -151,13 +151,13 @@ switch (platform) { + switch (arch) { + case 'x64': + localFileExisted = existsSync( +- join(__dirname, 'desktop_native.linux-x64-musl.node') ++ join(__dirname, 'desktop_native.linux-x64-gnu.node') + ) + try { + if (localFileExisted) { +- nativeBinding = require('./desktop_native.linux-x64-musl.node') ++ nativeBinding = require('./desktop_native.linux-x64-gnu.node') + } else { +- nativeBinding = require('@bitwarden/desktop-native-linux-x64-musl') ++ nativeBinding = require('@bitwarden/desktop-native-linux-x64-gnu') + } + } catch (e) { + loadError = e
