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

[George Rawlinson]

    Date: Thursday, October 28, 2021 @ 06:31:53
  Author: grawlinson
Revision: 1034839

upgpkg: vaultwarden-web 2.24.1-1

* New upstream release.
* Remove workaround for FTBFS (fixed upstream).

Modified:
  vaultwarden-web/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-28 06:10:10 UTC (rev 1034838)
+++ PKGBUILD	2021-10-28 06:31:53 UTC (rev 1034839)
@@ -1,13 +1,14 @@
 # Maintainer: Daniel M. Capella <polyzen at archlinux.org>
+# Maintainer: George Rawlinson <grawlinson at archlinux.org>
 # Contributor: Markus Richter <mqus at disroot dot org>
 
 pkgname=vaultwarden-web
-_pkgver=2.23.0c
-pkgver=2.23.0.c
+_pkgver=2.24.1
+pkgver=2.24.1
 _upstreamver=${_pkgver%[[:lower:]]}
-_patchver=$_upstreamver
+_patchver=2.24.0 # relabel to _upstreamver later
 pkgrel=1
-pkgdesc='Bitwarden web vault with the patches to make it work with vaultwarden'
+pkgdesc='Bitwarden web vault with the patches to make it work with Vaultwarden'
 arch=('any')
 url=https://github.com/dani-garcia/bw_web_builds
 license=('GPL3')
@@ -17,9 +18,9 @@
 replaces=('bitwarden_rs-vault' 'bitwarden_rs-web')
 install=$pkgname.install
 source=("bitwarden-web::git+https://github.com/bitwarden/web.git#tag=v$_upstreamver"
-        "$pkgname-v$_patchver.patch::https://raw.githubusercontent.com/dani-garcia/bw_web_builds/v$_pkgver/patches/v$_patchver.patch")
+        "$pkgname-v$_patchver.patch::https://raw.githubusercontent.com/dani-garcia/bw_web_builds/v$pkgver/patches/v$_patchver.patch")
 b2sums=('SKIP'
-        '2721a96db72714c7db93b7d468e8a7aad27db07fe5e3ab9d6d9656ae261388f6ee304ae1b38531a10f2c4d9a4cb1e4c174eef4e0c6bd0500de950fd43aa4f425')
+        '261e82c0b65bbeb28e46acc9903ad79d03448a7a3c8033b2dfcc0aa77b9262bbd3538245e6ec27e1e90a475628ea46c54c0a4ac11dd77dbf10a8452f86d81c2b')
 
 pkgver() {
   echo $_pkgver | sed 's/[[:lower:]]$/.&/'
@@ -30,14 +31,12 @@
   git submodule update --init
   patch --forward --strip=1 --input=../$pkgname-v$_patchver.patch
 
-  # ref: https://github.com/dani-garcia/bw_web_builds/blob/v2.23.0c/Dockerfile#L29
-  sed -i 's/"gulp-google-webfonts": "^4.0.0"/"gulp-google-webfonts": "^4.1.0"/' package.json
-  npm ci --legacy-peer-deps
+  npm ci
 }
 
 build() {
   cd bitwarden-web
-  npm run dist
+  npm run dist:oss:selfhost
 }
 
 package() {