[arch-commits] Commit in bitwarden/trunk (4 files)
Alexander Epaneshnikov
alex19ep at gemini.archlinux.org
Sun Feb 13 18:08:03 UTC 2022
Date: Sunday, February 13, 2022 @ 18:08:03
Author: alex19ep
Revision: 1133074
upgpkg: bitwarden 1.31.2-1 upstream release
switch to git sources
Modified:
bitwarden/trunk/PKGBUILD
bitwarden/trunk/bitwarden.sh
bitwarden/trunk/messaging.main.ts.patch
Deleted:
bitwarden/trunk/package.json.patch
-------------------------+
PKGBUILD | 45 ++++++++++++++++++++-------------------------
bitwarden.sh | 2 +-
messaging.main.ts.patch | 8 ++++----
package.json.patch | 13 -------------
4 files changed, 25 insertions(+), 43 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-02-13 18:00:27 UTC (rev 1133073)
+++ PKGBUILD 2022-02-13 18:08:03 UTC (rev 1133074)
@@ -2,68 +2,63 @@
# Contributor: libertylocked <libertylocked at disroot.org>
pkgname=bitwarden
-pkgver=1.30.0
+pkgver=1.31.2
pkgrel=1
-_jslibcommit='f4c66b2c8c243935bf25f689b16afaa5d6345f1b'
-_electronversion=14
+_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=('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
+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=('b15c4b90b2f541231b090e711b078204de2d9115301b126018b9ab3d828f4d0376a7771ffb30c9eb33e005b684bbc4deb11a83841b9c570eaabd5ebadb38d5ff'
- 'b0fa3cd70031dcb87c515beecda35fadb8980ec696a90bbe051a750fd6fdd202902c3c717285a7ccb99d8629b106fbd365b25b39f629001c64123dab2e5521f0'
- '87cdb8287cbc0c4eb49b0fd456a66e200551b5da5c14991505f6301cf1b11132d938dfdf795c4df2a4b3e1ae2badf5dfe33c1207923ec8abc6f9b3e064af6015'
- '822d97be407c2ac2a6926f5c925b0fd188c541014a623dd3815fdbf5ef67c0542f43aaf8d11535571a83a265f620e330f5326244f42c3902fddab442128fda95'
- '44ee70d71abf9cf399736d00df0aa6815d452792c9589f5517fed4454bdfff6ad2a39ffee401eab0db180718b19e9565d9ecff8d1bd96a93d13e4f63eaf4d5fc'
+sha512sums=('SKIP'
+ 'SKIP'
+ 'babcae0dba4d036e5d2cd04d8932b63253bc7b27b14d090932066e9d39383f7565c06d72dae9f96e741b494ef7e50a1fe7ec33905aa3124b427a8bf404df5762'
+ '98d2860bef2283fd09710fbbc5362d7ef2cd8eca26f35805ea258f2dacba78bd6aab14c834388a5089a8150eb0f32a82577aab10f8ad68e1a6371959b2802ad4'
'05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd')
prepare() {
- cd desktop-${pkgver}
+ cd bitwarden
# Link jslib
- rmdir -v jslib
- ln -vs ../jslib-${_jslibcommit} jslib
+ git submodule init
+ git config submodule.jslib.url "$srcdir/bitwarden-jslib"
+ git submodule update
- # 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
+ sed -i "s|@electronversion@|${ELECTRONVERSION}|" ../bitwarden.sh
jq < package.json \
- '.build["electronVersion"]=$ENV.SYSTEM_ELECTRON_VERSION | .build["electronDist"]="/usr/lib/electron\(env.ELECTRONVERSION)"' \
+ '.build["electronVersion"]=$ENV.SYSTEM_ELECTRON_VERSION | .build["electronDist"]="/usr/lib/electron"' \
> package.json.patched
mv package.json.patched package.json
}
build() {
- cd desktop-${pkgver}
- electronDist=/usr/lib/electron$_electronversion
+ cd bitwarden
+ electronDist=/usr/lib/electron
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 run clean:dist
npm exec -c "electron-builder --linux --x64 --dir -c.electronDist=$electronDist \
-c.electronVersion=$electronVer"
}
package(){
- cd desktop-${pkgver}
+ 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 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"
Modified: bitwarden.sh
===================================================================
--- bitwarden.sh 2022-02-13 18:00:27 UTC (rev 1133073)
+++ bitwarden.sh 2022-02-13 18:08:03 UTC (rev 1133074)
@@ -1,4 +1,4 @@
#!/bin/sh
export ELECTRON_IS_DEV=0
cd /usr/lib/bitwarden
-exec electron14 /usr/lib/bitwarden/app.asar $@
+exec electron at electronversion@ /usr/lib/bitwarden/app.asar $@
Modified: messaging.main.ts.patch
===================================================================
--- messaging.main.ts.patch 2022-02-13 18:00:27 UTC (rev 1133073)
+++ messaging.main.ts.patch 2022-02-13 18:08:03 UTC (rev 1133074)
@@ -1,10 +1,10 @@
---- 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 @@
+--- 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=${app.getPath("exe")}
+Exec=bitwarden-desktop
StartupNotify=false
Terminal=false`;
Deleted: package.json.patch
===================================================================
--- package.json.patch 2022-02-13 18:00:27 UTC (rev 1133073)
+++ package.json.patch 2022-02-13 18:08:03 UTC (rev 1133074)
@@ -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",
More information about the arch-commits
mailing list