Date: Wednesday, June 15, 2022 @ 10:47:20 Author: alex19ep Revision: 1238027
archrelease: copy trunk to community-x86_64 Added: bitwarden/repos/community-x86_64/PKGBUILD (from rev 1238026, bitwarden/trunk/PKGBUILD) bitwarden/repos/community-x86_64/bitwarden.desktop (from rev 1238026, bitwarden/trunk/bitwarden.desktop) bitwarden/repos/community-x86_64/bitwarden.sh (from rev 1238026, bitwarden/trunk/bitwarden.sh) bitwarden/repos/community-x86_64/messaging.main.ts.patch (from rev 1238026, bitwarden/trunk/messaging.main.ts.patch) Deleted: bitwarden/repos/community-x86_64/PKGBUILD bitwarden/repos/community-x86_64/bitwarden.desktop bitwarden/repos/community-x86_64/bitwarden.sh bitwarden/repos/community-x86_64/messaging.main.ts.patch -------------------------+ PKGBUILD | 144 +++++++++++++++++++++++----------------------- bitwarden.desktop | 20 +++--- bitwarden.sh | 8 +- messaging.main.ts.patch | 22 +++---- 4 files changed, 99 insertions(+), 95 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-06-15 10:47:15 UTC (rev 1238026) +++ PKGBUILD 2022-06-15 10:47:20 UTC (rev 1238027) @@ -1,70 +0,0 @@ -# Maintainer: Alexander Epaneshnikov <alex1...@archlinux.org> -# Contributor: libertylocked <libertyloc...@disroot.org> - -pkgname=bitwarden -pkgver=1.33.0 -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' -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 - bitwarden-jslib::git+https://github.com/bitwarden/jslib.git - messaging.main.ts.patch - ${pkgname}.sh - ${pkgname}.desktop) -sha512sums=('SKIP' - 'SKIP' - 'babcae0dba4d036e5d2cd04d8932b63253bc7b27b14d090932066e9d39383f7565c06d72dae9f96e741b494ef7e50a1fe7ec33905aa3124b427a8bf404df5762' - '98d2860bef2283fd09710fbbc5362d7ef2cd8eca26f35805ea258f2dacba78bd6aab14c834388a5089a8150eb0f32a82577aab10f8ad68e1a6371959b2802ad4' - '05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd') - -prepare() { - cd bitwarden - # Link jslib - git submodule init - git config submodule.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 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 -} - -build() { - cd bitwarden - electronDist=/usr/lib/electron$_electronversion - electronVer=$(electron$_electronversion --version | tail -c +2) - export npm_config_cache="$srcdir/npm_cache" - export ELECTRON_SKIP_BINARY_DOWNLOAD=1 - npm install --build-from-source - npm run build - npm run clean:dist - npm exec -c "electron-builder --linux --x64 --dir -c.electronDist=$electronDist \ - -c.electronVersion=$electronVer" -} - -package(){ - cd bitwarden - 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}" - - for i in 16 32 64 128 256 512 1024; do - install -vDm644 resources/icons/${i}x${i}.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png" - done - install -vDm644 resources/icon.png "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/${pkgname}.png" - - install -vDm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/bitwarden-desktop" - install -vDm644 "${srcdir}"/${pkgname}.desktop -t "${pkgdir}"/usr/share/applications -} Copied: bitwarden/repos/community-x86_64/PKGBUILD (from rev 1238026, bitwarden/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-06-15 10:47:20 UTC (rev 1238027) @@ -0,0 +1,74 @@ +# Maintainer: Alexander Epaneshnikov <alex1...@archlinux.org> +# Contributor: libertylocked <libertyloc...@disroot.org> + +pkgname=bitwarden +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/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=(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 + ${pkgname}.desktop) +sha512sums=('SKIP' + 'SKIP' + 'babcae0dba4d036e5d2cd04d8932b63253bc7b27b14d090932066e9d39383f7565c06d72dae9f96e741b494ef7e50a1fe7ec33905aa3124b427a8bf404df5762' + '98d2860bef2283fd09710fbbc5362d7ef2cd8eca26f35805ea258f2dacba78bd6aab14c834388a5089a8150eb0f32a82577aab10f8ad68e1a6371959b2802ad4' + '05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd') + +prepare() { + cd bitwarden/apps/desktop + + # Link jslib + git submodule init + 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 "$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}|" "$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/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 + npm run build + npm run clean:dist + npm exec -c "electron-builder --linux --x64 --dir -c.electronDist=$electronDist \ + -c.electronVersion=$electronVer" +} + +package(){ + 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}" + + for i in 16 32 64 128 256 512 1024; do + install -vDm644 resources/icons/${i}x${i}.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png" + done + install -vDm644 resources/icon.png "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/${pkgname}.png" + + install -vDm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/bitwarden-desktop" + install -vDm644 "${srcdir}"/${pkgname}.desktop -t "${pkgdir}"/usr/share/applications +} Deleted: bitwarden.desktop =================================================================== --- bitwarden.desktop 2022-06-15 10:47:15 UTC (rev 1238026) +++ bitwarden.desktop 2022-06-15 10:47:20 UTC (rev 1238027) @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Bitwarden -GenericName=Password Manager -Comment=A secure and free password manager for all of your devices. -Exec=bitwarden-desktop -Terminal=false -Type=Application -Icon=bitwarden -Categories=Utility; -StartupWMClass=Bitwarden Copied: bitwarden/repos/community-x86_64/bitwarden.desktop (from rev 1238026, bitwarden/trunk/bitwarden.desktop) =================================================================== --- bitwarden.desktop (rev 0) +++ bitwarden.desktop 2022-06-15 10:47:20 UTC (rev 1238027) @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Bitwarden +GenericName=Password Manager +Comment=A secure and free password manager for all of your devices. +Exec=bitwarden-desktop +Terminal=false +Type=Application +Icon=bitwarden +Categories=Utility; +StartupWMClass=Bitwarden Deleted: bitwarden.sh =================================================================== --- bitwarden.sh 2022-06-15 10:47:15 UTC (rev 1238026) +++ bitwarden.sh 2022-06-15 10:47:20 UTC (rev 1238027) @@ -1,4 +0,0 @@ -#!/bin/sh -export ELECTRON_IS_DEV=0 -cd /usr/lib/bitwarden -exec electron@electronversion@ /usr/lib/bitwarden/app.asar $@ Copied: bitwarden/repos/community-x86_64/bitwarden.sh (from rev 1238026, bitwarden/trunk/bitwarden.sh) =================================================================== --- bitwarden.sh (rev 0) +++ bitwarden.sh 2022-06-15 10:47:20 UTC (rev 1238027) @@ -0,0 +1,4 @@ +#!/bin/sh +export ELECTRON_IS_DEV=0 +cd /usr/lib/bitwarden +exec electron@electronversion@ /usr/lib/bitwarden/app.asar $@ Deleted: messaging.main.ts.patch =================================================================== --- messaging.main.ts.patch 2022-06-15 10:47:15 UTC (rev 1238026) +++ messaging.main.ts.patch 2022-06-15 10:47:20 UTC (rev 1238027) @@ -1,11 +0,0 @@ ---- messaging.main.ts.orig 2022-02-11 15:39:49.768671680 +0300 -+++ messaging.main.ts 2022-02-11 15:42:22.326127915 +0300 -@@ -114,7 +114,7 @@ - Version=${app.getVersion()} - Name=Bitwarden - Comment=Bitwarden startup script --Exec=${app.getPath("exe")} -+Exec=bitwarden-desktop - StartupNotify=false - Terminal=false`; - Copied: bitwarden/repos/community-x86_64/messaging.main.ts.patch (from rev 1238026, bitwarden/trunk/messaging.main.ts.patch) =================================================================== --- messaging.main.ts.patch (rev 0) +++ messaging.main.ts.patch 2022-06-15 10:47:20 UTC (rev 1238027) @@ -0,0 +1,11 @@ +--- messaging.main.ts.orig 2022-02-11 15:39:49.768671680 +0300 ++++ messaging.main.ts 2022-02-11 15:42:22.326127915 +0300 +@@ -114,7 +114,7 @@ + Version=${app.getVersion()} + Name=Bitwarden + Comment=Bitwarden startup script +-Exec=${app.getPath("exe")} ++Exec=bitwarden-desktop + StartupNotify=false + Terminal=false`; +