Date: Wednesday, December 8, 2021 @ 20:19:55 Author: alex19ep Revision: 1065692
archrelease: copy trunk to community-x86_64 Added: bitwarden/repos/community-x86_64/PKGBUILD (from rev 1065691, bitwarden/trunk/PKGBUILD) bitwarden/repos/community-x86_64/bitwarden.desktop (from rev 1065691, bitwarden/trunk/bitwarden.desktop) bitwarden/repos/community-x86_64/bitwarden.sh (from rev 1065691, bitwarden/trunk/bitwarden.sh) bitwarden/repos/community-x86_64/messaging.main.ts.patch (from rev 1065691, bitwarden/trunk/messaging.main.ts.patch) bitwarden/repos/community-x86_64/package.json.patch (from rev 1065691, bitwarden/trunk/package.json.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 bitwarden/repos/community-x86_64/package.json.patch -------------------------+ PKGBUILD | 150 +++++++++++++++++++++++----------------------- bitwarden.desktop | 20 +++--- bitwarden.sh | 8 +- messaging.main.ts.patch | 22 +++--- package.json.patch | 26 +++---- 5 files changed, 113 insertions(+), 113 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-12-08 20:19:50 UTC (rev 1065691) +++ PKGBUILD 2021-12-08 20:19:55 UTC (rev 1065692) @@ -1,75 +0,0 @@ -# Maintainer: Alexander Epaneshnikov <alex1...@archlinux.org> -# Contributor: libertylocked <libertyloc...@disroot.org> - -pkgname=bitwarden -pkgver=1.29.1 -pkgrel=1 -_jslibcommit='764dc40b36e0000807e59b8d6feea5ac4577270d' -_electronversion=14 -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=('npm' 'python' 'node-gyp' 'nodejs-lts-fermium' 'jq') -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 - messaging.main.ts.patch - ${pkgname}.sh - ${pkgname}.desktop) -sha512sums=('d5d011cb085bc56bee56212bfd72b7be9438c10985bb88c48329979cd7ebe4ee9ae6b1da54b5bd0f7fb6ef35a697a7681d47c18ed77a1d5b13c2837819b4c2fb' - '08fcfa6e23e405d1a01238268ae55bef263f91173d1d28ec96e20cdc892229304c0b84dfcb3c722615f8dd6bb46cb9c3fad21ace46da06d4a349e1008e49e559' - '87cdb8287cbc0c4eb49b0fd456a66e200551b5da5c14991505f6301cf1b11132d938dfdf795c4df2a4b3e1ae2badf5dfe33c1207923ec8abc6f9b3e064af6015' - '822d97be407c2ac2a6926f5c925b0fd188c541014a623dd3815fdbf5ef67c0542f43aaf8d11535571a83a265f620e330f5326244f42c3902fddab442128fda95' - '44ee70d71abf9cf399736d00df0aa6815d452792c9589f5517fed4454bdfff6ad2a39ffee401eab0db180718b19e9565d9ecff8d1bd96a93d13e4f63eaf4d5fc' - '05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd') - -prepare() { - cd desktop-${pkgver} - # Link jslib - rmdir -v jslib - ln -vs ../jslib-${_jslibcommit} jslib - - # Remove pre and postinstall routines from package.json. - patch --strip=1 package.json ../package.json.patch - # 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 - 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 desktop-${pkgver} - 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 - pushd jslib - npm install - popd - 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 desktop-${pkgver} - install -vDm644 dist/linux-unpacked/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}" - install -vDm644 build/package.json -t "${pkgdir}/usr/lib/${pkgname}" - - for i in 16 32 48 64 128 256 512; 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 1065691, bitwarden/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-12-08 20:19:55 UTC (rev 1065692) @@ -0,0 +1,75 @@ +# Maintainer: Alexander Epaneshnikov <alex1...@archlinux.org> +# Contributor: libertylocked <libertyloc...@disroot.org> + +pkgname=bitwarden +pkgver=1.30.0 +pkgrel=1 +_jslibcommit='f4c66b2c8c243935bf25f689b16afaa5d6345f1b' +_electronversion=14 +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=('npm' 'python' 'node-gyp' 'nodejs-lts-fermium' 'jq') +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 + messaging.main.ts.patch + ${pkgname}.sh + ${pkgname}.desktop) +sha512sums=('b15c4b90b2f541231b090e711b078204de2d9115301b126018b9ab3d828f4d0376a7771ffb30c9eb33e005b684bbc4deb11a83841b9c570eaabd5ebadb38d5ff' + 'b0fa3cd70031dcb87c515beecda35fadb8980ec696a90bbe051a750fd6fdd202902c3c717285a7ccb99d8629b106fbd365b25b39f629001c64123dab2e5521f0' + '87cdb8287cbc0c4eb49b0fd456a66e200551b5da5c14991505f6301cf1b11132d938dfdf795c4df2a4b3e1ae2badf5dfe33c1207923ec8abc6f9b3e064af6015' + '822d97be407c2ac2a6926f5c925b0fd188c541014a623dd3815fdbf5ef67c0542f43aaf8d11535571a83a265f620e330f5326244f42c3902fddab442128fda95' + '44ee70d71abf9cf399736d00df0aa6815d452792c9589f5517fed4454bdfff6ad2a39ffee401eab0db180718b19e9565d9ecff8d1bd96a93d13e4f63eaf4d5fc' + '05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd') + +prepare() { + cd desktop-${pkgver} + # Link jslib + rmdir -v jslib + ln -vs ../jslib-${_jslibcommit} jslib + + # Remove pre and postinstall routines from package.json. + patch --strip=1 package.json ../package.json.patch + # 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 + 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 desktop-${pkgver} + 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 + pushd jslib + npm install + popd + 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 desktop-${pkgver} + install -vDm644 dist/linux-unpacked/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}" + install -vDm644 build/package.json -t "${pkgdir}/usr/lib/${pkgname}" + + for i in 16 32 48 64 128 256 512; 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 2021-12-08 20:19:50 UTC (rev 1065691) +++ bitwarden.desktop 2021-12-08 20:19:55 UTC (rev 1065692) @@ -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 1065691, bitwarden/trunk/bitwarden.desktop) =================================================================== --- bitwarden.desktop (rev 0) +++ bitwarden.desktop 2021-12-08 20:19:55 UTC (rev 1065692) @@ -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 2021-12-08 20:19:50 UTC (rev 1065691) +++ bitwarden.sh 2021-12-08 20:19:55 UTC (rev 1065692) @@ -1,4 +0,0 @@ -#!/bin/sh -export ELECTRON_IS_DEV=0 -cd /usr/lib/bitwarden -exec electron14 /usr/lib/bitwarden/app.asar $@ Copied: bitwarden/repos/community-x86_64/bitwarden.sh (from rev 1065691, bitwarden/trunk/bitwarden.sh) =================================================================== --- bitwarden.sh (rev 0) +++ bitwarden.sh 2021-12-08 20:19:55 UTC (rev 1065692) @@ -0,0 +1,4 @@ +#!/bin/sh +export ELECTRON_IS_DEV=0 +cd /usr/lib/bitwarden +exec electron14 /usr/lib/bitwarden/app.asar $@ Deleted: messaging.main.ts.patch =================================================================== --- messaging.main.ts.patch 2021-12-08 20:19:50 UTC (rev 1065691) +++ messaging.main.ts.patch 2021-12-08 20:19:55 UTC (rev 1065692) @@ -1,11 +0,0 @@ ---- messaging.main.ts.orig 2021-08-27 23:56:00.283768564 -0700 -+++ messaging.main.ts 2021-08-27 23:56:04.442513446 -0700 -@@ -110,7 +110,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 1065691, bitwarden/trunk/messaging.main.ts.patch) =================================================================== --- messaging.main.ts.patch (rev 0) +++ messaging.main.ts.patch 2021-12-08 20:19:55 UTC (rev 1065692) @@ -0,0 +1,11 @@ +--- messaging.main.ts.orig 2021-08-27 23:56:00.283768564 -0700 ++++ messaging.main.ts 2021-08-27 23:56:04.442513446 -0700 +@@ -110,7 +110,7 @@ + Version=${app.getVersion()} + Name=Bitwarden + Comment=Bitwarden startup script +-Exec=${app.getPath('exe')} ++Exec=bitwarden-desktop + StartupNotify=false + Terminal=false`; + Deleted: package.json.patch =================================================================== --- package.json.patch 2021-12-08 20:19:50 UTC (rev 1065691) +++ package.json.patch 2021-12-08 20:19:55 UTC (rev 1065692) @@ -1,13 +0,0 @@ ---- package.json.orig 2021-07-26 05:47:04.787356255 -0700 -+++ package.json 2021-07-26 05:47:20.505211209 -0700 -@@ -22,8 +22,8 @@ - "sub:update": "git submodule update --remote", - "sub:pull": "git submodule foreach git pull origin master", - "sub:commit": "npm run sub:pull && git commit -am \"update submodule\"", -- "preinstall": "npm run sub:init", -- "postinstall": "electron-rebuild", -+ "preinstall": "", -+ "postinstall": "", - "symlink:win": "rm -rf ./jslib && cmd /c mklink /J .\\jslib ..\\jslib", - "symlink:mac": "npm run symlink:lin", - "symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib", Copied: bitwarden/repos/community-x86_64/package.json.patch (from rev 1065691, bitwarden/trunk/package.json.patch) =================================================================== --- package.json.patch (rev 0) +++ package.json.patch 2021-12-08 20:19:55 UTC (rev 1065692) @@ -0,0 +1,13 @@ +--- package.json.orig 2021-07-26 05:47:04.787356255 -0700 ++++ package.json 2021-07-26 05:47:20.505211209 -0700 +@@ -22,8 +22,8 @@ + "sub:update": "git submodule update --remote", + "sub:pull": "git submodule foreach git pull origin master", + "sub:commit": "npm run sub:pull && git commit -am \"update submodule\"", +- "preinstall": "npm run sub:init", +- "postinstall": "electron-rebuild", ++ "preinstall": "", ++ "postinstall": "", + "symlink:win": "rm -rf ./jslib && cmd /c mklink /J .\\jslib ..\\jslib", + "symlink:mac": "npm run symlink:lin", + "symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib",