[arch-commits] Commit in bitwarden/trunk (PKGBUILD)

2022-08-11 Thread Alexander Epaneshnikov via arch-commits 
Date: Thursday, August 11, 2022 @ 22:03:02
  Author: alex19ep
Revision: 1265292

upgpkg: bitwarden 2022.8.1-1 upstream release

Modified:
  bitwarden/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-08-11 21:45:01 UTC (rev 1265291)
+++ PKGBUILD2022-08-11 22:03:02 UTC (rev 1265292)
@@ -2,7 +2,7 @@
 # Contributor: libertylocked 
 
 pkgname=bitwarden
-pkgver=2022.8.0 
+pkgver=2022.8.1
 pkgrel=1
 _electronversion=19
 pkgdesc='A secure and free password manager for all of your devices'

[arch-commits] Commit in bitwarden/trunk (PKGBUILD)

2022-08-09 Thread Alexander Epaneshnikov via arch-commits 
Date: Tuesday, August 9, 2022 @ 22:08:56
  Author: alex19ep
Revision: 1264578

upgpkg: bitwarden 2022.8.0-1 upstream release

Modified:
  bitwarden/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 3 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-08-09 21:25:02 UTC (rev 1264577)
+++ PKGBUILD2022-08-09 22:08:56 UTC (rev 1264578)
@@ -2,8 +2,8 @@
 # Contributor: libertylocked 
 
 pkgname=bitwarden
-pkgver=2022.6.2
-pkgrel=2
+pkgver=2022.8.0 
+pkgrel=1
 _electronversion=19
 pkgdesc='A secure and free password manager for all of your devices'
 arch=('x86_64')
@@ -12,12 +12,10 @@
 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')
@@ -29,12 +27,6 @@
export npm_config_cache="$srcdir/npm_cache"
export ELECTRON_SKIP_BINARY_DOWNLOAD=1
 
-   # 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"
 
@@ -52,7 +44,7 @@
 
 build() {
cd bitwarden/apps/desktop
-   electronDist=/usr/lib/electron
+   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"

[arch-commits] Commit in bitwarden/trunk (PKGBUILD)

2022-07-15 Thread Alexander Epaneshnikov via arch-commits 
Date: Friday, July 15, 2022 @ 18:04:14
  Author: alex19ep
Revision: 1252983

upgpkg: bitwarden 2022.6.2-2 switch to electron 19

Modified:
  bitwarden/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-07-15 17:43:56 UTC (rev 1252982)
+++ PKGBUILD2022-07-15 18:04:14 UTC (rev 1252983)
@@ -3,8 +3,8 @@
 
 pkgname=bitwarden
 pkgver=2022.6.2
-pkgrel=1
-_electronversion=16
+pkgrel=2
+_electronversion=19
 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'
@@ -52,7 +52,7 @@
 
 build() {
cd bitwarden/apps/desktop
-   electronDist=/usr/lib/electron$_electronversion
+   electronDist=/usr/lib/electron
electronVer=$(electron$_electronversion --version | tail -c +2)
export npm_config_build_from_source=true
export npm_config_cache="$srcdir/npm_cache"

[arch-commits] Commit in bitwarden/trunk (PKGBUILD)

2022-07-13 Thread Alexander Epaneshnikov via arch-commits 
Date: Wednesday, July 13, 2022 @ 10:40:57
  Author: alex19ep
Revision: 1252516

upgpkg: bitwarden 2022.6.2-1

Modified:
  bitwarden/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-07-13 09:02:17 UTC (rev 1252515)
+++ PKGBUILD2022-07-13 10:40:57 UTC (rev 1252516)
@@ -2,7 +2,7 @@
 # Contributor: libertylocked 
 
 pkgname=bitwarden
-pkgver=2022.6.0
+pkgver=2022.6.2
 pkgrel=1
 _electronversion=16
 pkgdesc='A secure and free password manager for all of your devices'

[arch-commits] Commit in bitwarden/trunk (PKGBUILD)

2022-07-02 Thread Alexander Epaneshnikov via arch-commits 
Date: Saturday, July 2, 2022 @ 15:54:37
  Author: alex19ep
Revision: 1243633

upgpkg: bitwarden 2022.6.0-1 upstream release

Modified:
  bitwarden/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-07-02 15:54:31 UTC (rev 1243632)
+++ PKGBUILD2022-07-02 15:54:37 UTC (rev 1243633)
@@ -2,7 +2,7 @@
 # Contributor: libertylocked 
 
 pkgname=bitwarden
-pkgver=2022.5.1 
+pkgver=2022.6.0
 pkgrel=1
 _electronversion=16
 pkgdesc='A secure and free password manager for all of your devices'
@@ -25,6 +25,10 @@
 prepare() {
cd bitwarden/apps/desktop
 
+   export npm_config_build_from_source=true
+   export npm_config_cache="$srcdir/npm_cache"
+   export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+
# Link jslib
git submodule init
git config 'submodule.apps/browser/jslib.url' "$srcdir/bitwarden-jslib"
@@ -42,6 +46,8 @@
#'.build["electronVersion"]=$ENV.SYSTEM_ELECTRON_VERSION | 
.build["electronDist"]="/usr/lib/electron\(env.ELECTRONVERSION)"' \
#> package.json.patched
# mv package.json.patched package.json
+   cd ../../
+   npm ci
 }
 
 build() {
@@ -51,7 +57,6 @@
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 \

[arch-commits] Commit in bitwarden/trunk (PKGBUILD)

2022-06-15 Thread Alexander Epaneshnikov via arch-commits 
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
===
--- PKGBUILD2022-06-15 10:10:20 UTC (rev 1238025)
+++ PKGBUILD2022-06-15 10:47:15 UTC (rev 1238026)
@@ -2,16 +2,16 @@
 # Contributor: libertylocked 
 
 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}"

[arch-commits] Commit in bitwarden/trunk (PKGBUILD)

2022-04-25 Thread Alexander Epaneshnikov via arch-commits 
Date: Monday, April 25, 2022 @ 19:20:32
  Author: alex19ep
Revision: 1190058

upgpkg: bitwarden 1.33.0-1 upstream release

Modified:
  bitwarden/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-04-25 19:04:46 UTC (rev 1190057)
+++ PKGBUILD2022-04-25 19:20:32 UTC (rev 1190058)
@@ -2,7 +2,7 @@
 # Contributor: libertylocked 
 
 pkgname=bitwarden
-pkgver=1.32.1
+pkgver=1.33.0
 pkgrel=1
 _electronversion=16
 pkgdesc='A secure and free password manager for all of your devices'
@@ -60,7 +60,7 @@
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
+   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"

[arch-commits] Commit in bitwarden/trunk (PKGBUILD)

2022-03-22 Thread Alexander Epaneshnikov via arch-commits 
Date: Tuesday, March 22, 2022 @ 21:26:06
  Author: alex19ep
Revision: 1170558

upgpkg: bitwarden 1.32.1-1 upstream release

Modified:
  bitwarden/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-03-22 21:20:10 UTC (rev 1170557)
+++ PKGBUILD2022-03-22 21:26:06 UTC (rev 1170558)
@@ -2,7 +2,7 @@
 # Contributor: libertylocked 
 
 pkgname=bitwarden
-pkgver=1.32.0
+pkgver=1.32.1
 pkgrel=1
 _electronversion=16
 pkgdesc='A secure and free password manager for all of your devices'

[arch-commits] Commit in bitwarden/trunk (PKGBUILD)

2022-03-16 Thread Alexander Epaneshnikov via arch-commits 
Date: Thursday, March 17, 2022 @ 01:27:49
  Author: alex19ep
Revision: 1156243

upgpkg: bitwarden 1.32.0-1 upstream release

Modified:
  bitwarden/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-03-17 00:59:37 UTC (rev 1156242)
+++ PKGBUILD2022-03-17 01:27:49 UTC (rev 1156243)
@@ -2,8 +2,8 @@
 # Contributor: libertylocked 
 
 pkgname=bitwarden
-pkgver=1.31.3
-pkgrel=2
+pkgver=1.32.0
+pkgrel=1
 _electronversion=16
 pkgdesc='A secure and free password manager for all of your devices'
 arch=('x86_64')

[arch-commits] Commit in bitwarden/trunk (PKGBUILD)

2022-02-28 Thread Alexander Epaneshnikov via arch-commits 
Date: Monday, February 28, 2022 @ 20:13:29
  Author: alex19ep
Revision: 1138644

upgpkg: bitwarden 1.31.3-2 bump to fix FS#73975

Modified:
  bitwarden/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-02-28 19:40:31 UTC (rev 1138643)
+++ PKGBUILD2022-02-28 20:13:29 UTC (rev 1138644)
@@ -3,7 +3,7 @@
 
 pkgname=bitwarden
 pkgver=1.31.3
-pkgrel=1
+pkgrel=2
 _electronversion=16
 pkgdesc='A secure and free password manager for all of your devices'
 arch=('x86_64')
@@ -36,7 +36,7 @@
export ELECTRONVERSION=$_electronversion
sed -i "s|@electronversion@|${ELECTRONVERSION}|" ../bitwarden.sh
jq < package.json \
-  '.build["electronVersion"]=$ENV.SYSTEM_ELECTRON_VERSION | 
.build["electronDist"]="/usr/lib/electron"' \
+  '.build["electronVersion"]=$ENV.SYSTEM_ELECTRON_VERSION | 
.build["electronDist"]="/usr/lib/electron\(env.ELECTRONVERSION)"' \
   > package.json.patched
mv package.json.patched package.json
 }
@@ -43,7 +43,7 @@
 
 build() {
cd bitwarden
-   electronDist=/usr/lib/electron
+   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

[arch-commits] Commit in bitwarden/trunk (PKGBUILD)

2022-02-15 Thread Alexander Epaneshnikov via arch-commits 
Date: Tuesday, February 15, 2022 @ 15:26:47
  Author: alex19ep
Revision: 1133363

upgpkg: bitwarden 1.31.3-1 upstream release

Modified:
  bitwarden/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-02-15 13:52:32 UTC (rev 1133362)
+++ PKGBUILD2022-02-15 15:26:47 UTC (rev 1133363)
@@ -2,7 +2,7 @@
 # Contributor: libertylocked 
 
 pkgname=bitwarden
-pkgver=1.31.2
+pkgver=1.31.3
 pkgrel=1
 _electronversion=16
 pkgdesc='A secure and free password manager for all of your devices'
@@ -47,7 +47,7 @@
electronVer=$(electron$_electronversion --version | tail -c +2)
export npm_config_cache="$srcdir/npm_cache"
export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-   npm install
+   npm install --build-from-source
npm run build
npm run clean:dist 
npm exec -c "electron-builder --linux --x64 --dir 
-c.electronDist=$electronDist \

[arch-commits] Commit in bitwarden/trunk (PKGBUILD)

2021-12-08 Thread Alexander Epaneshnikov via arch-commits 
Date: Wednesday, December 8, 2021 @ 20:19:50
  Author: alex19ep
Revision: 1065691

upgpkg: bitwarden 1.30.0-1 upstream release

Modified:
  bitwarden/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-12-08 20:18:40 UTC (rev 1065690)
+++ PKGBUILD2021-12-08 20:19:50 UTC (rev 1065691)
@@ -2,9 +2,9 @@
 # Contributor: libertylocked 
 
 pkgname=bitwarden
-pkgver=1.29.1
+pkgver=1.30.0
 pkgrel=1
-_jslibcommit='764dc40b36e807e59b8d6feea5ac4577270d'
+_jslibcommit='f4c66b2c8c243935bf25f689b16afaa5d6345f1b'
 _electronversion=14
 pkgdesc='A secure and free password manager for all of your devices'
 arch=('x86_64')
@@ -18,8 +18,8 @@
 messaging.main.ts.patch
 ${pkgname}.sh
 ${pkgname}.desktop)
-sha512sums=('d5d011cb085bc56bee56212bfd72b7be9438c10985bb88c48329979cd7ebe4ee9ae6b1da54b5bd0f7fb6ef35a697a7681d47c18ed77a1d5b13c2837819b4c2fb'
-
'08fcfa6e23e405d1a01238268ae55bef263f91173d1d28ec96e20cdc892229304c0b84dfcb3c722615f8dd6bb46cb9c3fad21ace46da06d4a349e1008e49e559'
+sha512sums=('b15c4b90b2f541231b090e711b078204de2d9115301b126018b9ab3d828f4d0376a7771ffb30c9eb33e005b684bbc4deb11a83841b9c570eaabd5ebadb38d5ff'
+
'b0fa3cd70031dcb87c515beecda35fadb8980ec696a90bbe051a750fd6fdd202902c3c717285a7ccb99d8629b106fbd365b25b39f629001c64123dab2e5521f0'
 
'87cdb8287cbc0c4eb49b0fd456a66e200551b5da5c14991505f6301cf1b11132d938dfdf795c4df2a4b3e1ae2badf5dfe33c1207923ec8abc6f9b3e064af6015'
 
'822d97be407c2ac2a6926f5c925b0fd188c541014a623dd3815fdbf5ef67c0542f43aaf8d11535571a83a265f620e330f5326244f42c3902fddab442128fda95'
 
'44ee70d71abf9cf399736d00df0aa6815d452792c9589f5517fed4454bdfff6ad2a39ffee401eab0db180718b19e9565d9ecff8d1bd96a93d13e4f63eaf4d5fc'

[arch-commits] Commit in bitwarden/trunk (PKGBUILD)

2021-10-29 Thread Alexander Epaneshnikov via arch-commits 
Date: Friday, October 29, 2021 @ 19:45:04
  Author: alex19ep
Revision: 1034919

upgpkg: bitwarden 1.29.1-1

new upstream release

Modified:
  bitwarden/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-10-29 18:08:45 UTC (rev 1034918)
+++ PKGBUILD2021-10-29 19:45:04 UTC (rev 1034919)
@@ -2,7 +2,7 @@
 # Contributor: libertylocked 
 
 pkgname=bitwarden
-pkgver=1.29.0
+pkgver=1.29.1
 pkgrel=1
 _jslibcommit='764dc40b36e807e59b8d6feea5ac4577270d'
 _electronversion=14
@@ -18,7 +18,7 @@
 messaging.main.ts.patch
 ${pkgname}.sh
 ${pkgname}.desktop)
-sha512sums=('70323734681fa766390ac00831f371bff3ee023169e27b5348216e9cbf9fbaa8e14d4d689d5d5aa3ffc36b88c0b71b23a90c0cf418f7fc60ac5feae6f8bfea2d'
+sha512sums=('d5d011cb085bc56bee56212bfd72b7be9438c10985bb88c48329979cd7ebe4ee9ae6b1da54b5bd0f7fb6ef35a697a7681d47c18ed77a1d5b13c2837819b4c2fb'
 
'08fcfa6e23e405d1a01238268ae55bef263f91173d1d28ec96e20cdc892229304c0b84dfcb3c722615f8dd6bb46cb9c3fad21ace46da06d4a349e1008e49e559'
 
'87cdb8287cbc0c4eb49b0fd456a66e200551b5da5c14991505f6301cf1b11132d938dfdf795c4df2a4b3e1ae2badf5dfe33c1207923ec8abc6f9b3e064af6015'
 
'822d97be407c2ac2a6926f5c925b0fd188c541014a623dd3815fdbf5ef67c0542f43aaf8d11535571a83a265f620e330f5326244f42c3902fddab442128fda95'

[arch-commits] Commit in bitwarden/trunk (PKGBUILD bitwarden.sh package.json.patch)

2021-10-27 Thread Alexander Epaneshnikov via arch-commits 
Date: Wednesday, October 27, 2021 @ 22:48:34
  Author: alex19ep
Revision: 1034808

upgpkg: bitwarden 1.29.0-1

new upstream release

Modified:
  bitwarden/trunk/PKGBUILD
  bitwarden/trunk/bitwarden.sh
  bitwarden/trunk/package.json.patch

+
 PKGBUILD   |   40 +---
 bitwarden.sh   |3 ++-
 package.json.patch |4 ++--
 3 files changed, 25 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-10-27 21:51:49 UTC (rev 1034807)
+++ PKGBUILD2021-10-27 22:48:34 UTC (rev 1034808)
@@ -2,15 +2,16 @@
 # Contributor: libertylocked 
 
 pkgname=bitwarden
-pkgver=1.28.3
+pkgver=1.29.0
 pkgrel=1
-_jslibcommit='1c28396d1a819d9d7838c65517c9953a078b29bb'
+_jslibcommit='764dc40b36e807e59b8d6feea5ac4577270d'
+_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=('electron11' 'libnotify' 'libsecret' 'libxtst' 'libxss' 'libnss_nis')
-makedepends=('git' 'npm' 'python' 'node-gyp' 'nodejs-lts-fermium' 'jq')
+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
@@ -17,11 +18,11 @@
 messaging.main.ts.patch
 ${pkgname}.sh
 ${pkgname}.desktop)
-sha512sums=('d140fe33977e964d2075854b29f53fa0aa01ec104b959b64a648292958da8bad9ba9ee85d174fed6229282d1077e7252cf8caf259b6e7206a88dd26cee19a2a8'
-
'2d15bfa4554dcb355f070cbbdeff1a26e132a316184b7e6e2a4376ff9549529692d718e6265c5fd62d42f4eef2fc62aacb4bb89c95f698f2493212f8a4abb516'
-
'd884221c615db95d6fd0da2d3470fb7514b6a5d2a2b3b20c8353ebb4a938dc39f93783fe7ef2b9f69f034db8f26abfa479616f9fd1c1b241af605da837fba20e'
+sha512sums=('70323734681fa766390ac00831f371bff3ee023169e27b5348216e9cbf9fbaa8e14d4d689d5d5aa3ffc36b88c0b71b23a90c0cf418f7fc60ac5feae6f8bfea2d'
+
'08fcfa6e23e405d1a01238268ae55bef263f91173d1d28ec96e20cdc892229304c0b84dfcb3c722615f8dd6bb46cb9c3fad21ace46da06d4a349e1008e49e559'
+
'87cdb8287cbc0c4eb49b0fd456a66e200551b5da5c14991505f6301cf1b11132d938dfdf795c4df2a4b3e1ae2badf5dfe33c1207923ec8abc6f9b3e064af6015'
 
'822d97be407c2ac2a6926f5c925b0fd188c541014a623dd3815fdbf5ef67c0542f43aaf8d11535571a83a265f620e330f5326244f42c3902fddab442128fda95'
-
'32c29a7baed80351acf5753d35df404a818d5c88cc85f3bbed2daa5351aaf0dba20fd03cbedbcb407324f305d4556adb476ecc9ccd07bac0511ca4a943020ea4'
+
'44ee70d71abf9cf399736d00df0aa6815d452792c9589f5517fed4454bdfff6ad2a39ffee401eab0db180718b19e9565d9ecff8d1bd96a93d13e4f63eaf4d5fc'
 
'05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd')
 
 prepare() {
@@ -34,11 +35,11 @@
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
-   SYSTEM_ELECTRON_VERSION=$(electron11 -v | sed 's/v//g')
-   jq < package.json --arg ver $SYSTEM_ELECTRON_VERSION \
-  '.build["electronVersion"]=$ver | 
.build["electronDist"]="/usr/lib/electron11"' \
+   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
 }
@@ -45,10 +46,10 @@
 
 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
-   electronDist=$(dirname $(realpath $(which electron11)))
-   electronVer=$(electron11 --version | tail -c +2)
pushd jslib
npm install
popd
@@ -61,13 +62,14 @@
 
 package(){
cd desktop-${pkgver}
-   install -vDm755 dist/linux-unpacked/resources/app.asar -t 
"${pkgdir}/usr/lib/${pkgname%-git}/resources"
+   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

[arch-commits] Commit in bitwarden/trunk (PKGBUILD)

2021-09-22 Thread Alexander Epaneshnikov via arch-commits 
Date: Wednesday, September 22, 2021 @ 19:37:34
  Author: alex19ep
Revision: 1021665

upgpkg: bitwarden 1.28.3-1

new upstream release

Modified:
  bitwarden/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-09-22 19:27:30 UTC (rev 1021664)
+++ PKGBUILD2021-09-22 19:37:34 UTC (rev 1021665)
@@ -2,9 +2,9 @@
 # Contributor: libertylocked 
 
 pkgname=bitwarden
-pkgver=1.28.2
-pkgrel=2
-_jslibcommit='5ab045499f8a6a26ee10115f458136546a54bc22'
+pkgver=1.28.3
+pkgrel=1
+_jslibcommit='1c28396d1a819d9d7838c65517c9953a078b29bb'
 pkgdesc='A secure and free password manager for all of your devices'
 arch=('x86_64')
 url='https://github.com/bitwarden/desktop'
@@ -17,8 +17,8 @@
 messaging.main.ts.patch
 ${pkgname}.sh
 ${pkgname}.desktop)
-sha512sums=('e950423968043480dcf9c93dafe0acad042baa93d04261292ce2e7d223c78f444d59d8f382e1a390ac942431c5b67f6950de4c6bba7e7deed685b3d9b11748c5'
-
'c3705b257c080b72f15c62462bf8713cfc24a044395415d8884b31e7bdf5f4d7d04f56cdb1ac4ec3a7b92dc4eb2373f6135203925882357c886a4359908f210f'
+sha512sums=('d140fe33977e964d2075854b29f53fa0aa01ec104b959b64a648292958da8bad9ba9ee85d174fed6229282d1077e7252cf8caf259b6e7206a88dd26cee19a2a8'
+
'2d15bfa4554dcb355f070cbbdeff1a26e132a316184b7e6e2a4376ff9549529692d718e6265c5fd62d42f4eef2fc62aacb4bb89c95f698f2493212f8a4abb516'
 
'd884221c615db95d6fd0da2d3470fb7514b6a5d2a2b3b20c8353ebb4a938dc39f93783fe7ef2b9f69f034db8f26abfa479616f9fd1c1b241af605da837fba20e'
 
'822d97be407c2ac2a6926f5c925b0fd188c541014a623dd3815fdbf5ef67c0542f43aaf8d11535571a83a265f620e330f5326244f42c3902fddab442128fda95'
 
'32c29a7baed80351acf5753d35df404a818d5c88cc85f3bbed2daa5351aaf0dba20fd03cbedbcb407324f305d4556adb476ecc9ccd07bac0511ca4a943020ea4'