Date: Wednesday, June 15, 2022 @ 10:47:15 Author: alex19ep Revision: 1238026
upgpkg: bitwarden 2022.5.1-1 upstream release Modified: bitwarden/trunk/PKGBUILD ----------+ PKGBUILD | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-06-15 10:10:20 UTC (rev 1238025) +++ PKGBUILD 2022-06-15 10:47:15 UTC (rev 1238026) @@ -2,16 +2,16 @@ # Contributor: libertylocked <libertyloc...@disroot.org> pkgname=bitwarden -pkgver=1.33.0 +pkgver=2022.5.1 pkgrel=1 _electronversion=16 pkgdesc='A secure and free password manager for all of your devices' arch=('x86_64') -url='https://github.com/bitwarden/desktop' +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') -source=(${pkgname}::git+https://github.com/bitwarden/desktop.git#tag=v$pkgver +source=(bitwarden::git+https://github.com/bitwarden/clients.git#tag=desktop-v$pkgver bitwarden-jslib::git+https://github.com/bitwarden/jslib.git messaging.main.ts.patch ${pkgname}.sh @@ -23,31 +23,35 @@ '05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd') prepare() { - cd bitwarden + cd bitwarden/apps/desktop + # Link jslib git submodule init - git config submodule.jslib.url "$srcdir/bitwarden-jslib" + git config 'submodule.apps/browser/jslib.url' "$srcdir/bitwarden-jslib" + git config 'submodule.apps/desktop/jslib.url' "$srcdir/bitwarden-jslib" git submodule update # This patch is required to make "Start automatically on login" work - patch --strip=1 src/main/messaging.main.ts ../messaging.main.ts.patch + patch --strip=1 src/main/messaging.main.ts "$srcdir/messaging.main.ts.patch" + # Patch build to make it work with system electron export SYSTEM_ELECTRON_VERSION=$(electron$_electronversion -v | sed 's/v//g') export ELECTRONVERSION=$_electronversion - sed -i "s|@electronversion@|${ELECTRONVERSION}|" ../bitwarden.sh - jq < package.json \ - '.build["electronVersion"]=$ENV.SYSTEM_ELECTRON_VERSION | .build["electronDist"]="/usr/lib/electron\(env.ELECTRONVERSION)"' \ - > package.json.patched - mv package.json.patched package.json + sed -i "s|@electronversion@|${ELECTRONVERSION}|" "$srcdir/bitwarden.sh" + # jq < package.json \ + # '.build["electronVersion"]=$ENV.SYSTEM_ELECTRON_VERSION | .build["electronDist"]="/usr/lib/electron\(env.ELECTRONVERSION)"' \ + # > package.json.patched + # mv package.json.patched package.json } build() { - cd bitwarden + cd bitwarden/apps/desktop electronDist=/usr/lib/electron$_electronversion electronVer=$(electron$_electronversion --version | tail -c +2) + export npm_config_build_from_source=true export npm_config_cache="$srcdir/npm_cache" export ELECTRON_SKIP_BINARY_DOWNLOAD=1 - npm install --build-from-source + npm install npm run build npm run clean:dist npm exec -c "electron-builder --linux --x64 --dir -c.electronDist=$electronDist \ @@ -55,7 +59,7 @@ } package(){ - cd bitwarden + cd bitwarden/apps/desktop install -vDm644 dist/linux-unpacked/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}" install -vDm644 build/package.json -t "${pkgdir}/usr/lib/${pkgname}" cp -vr dist/linux-unpacked/resources/app.asar.unpacked -t "${pkgdir}/usr/lib/${pkgname}"