use -nogit patchfile

3 files changed, 10 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d777f364d671..4bde89db0e6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bitwarden_rs-vault-git
 	pkgdesc = Integrates the Vault Web-Interface into bitwarden_rs.
-	pkgver = v2.2.0.r42.g3a136e1
+	pkgver = v2.3.0.r3.g6399973
 	pkgrel = 1
 	url = https://github.com/bitwarden/web
 	install = bitwarden_rs-vault.install
@@ -11,10 +11,10 @@ pkgbase = bitwarden_rs-vault-git
 	provides = bitwarden_rs-vault
 	conflicts = bitwarden_rs-vault
 	source = git+https://github.com/bitwarden/web.git
-	source = 0001-Set-Vault-BaseURL-git.patch
+	source = 0001-Set-Vault-BaseURL.patch
 	source = bitwarden_rs-vault.install
 	sha512sums = SKIP
-	sha512sums = be85a1a6c032c6b881667fdf7ff864e91cdccaa44a8a081732acb2b1e284d12f7dbfd2c0d0536abc2a52181b57dbf6d76a2be80a8fbc69d731a3878d9cc88422
+	sha512sums = 9a9885298fceb8de737aae0e616158ed5c41a15acbfc723048ed8d509cb40d0e32048e12b9aeb4a6a4c67485ba08f0b8e52ba7cb4d8d2036ae4dc19e39431961
 	sha512sums = 5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1
 
 pkgname = bitwarden_rs-vault-git
diff --git a/0001-Set-Vault-BaseURL-git.patch b/0001-Set-Vault-BaseURL.patch
index c51e4dd3f986..073b7d80ed90 100644
--- a/0001-Set-Vault-BaseURL-git.patch
+++ b/0001-Set-Vault-BaseURL.patch
@@ -1,6 +1,7 @@
 --- a/src/app/services/services.module.ts
 +++ b/src/app/services/services.module.ts
-@@ -120,18 +120,15 @@ const environmentService = new EnvironmentService(apiService, storageService, notificationsService);
+@@ -120,20 +120,17 @@ const exportService = new ExportService(folderService, cipherService, apiService
+ const importService = new ImportService(cipherService, folderService, apiService, i18nService, collectionService);
  const auditService = new AuditService(cryptoFunctionService, apiService);
  
 -const analytics = new Analytics(window, () => platformUtilsService.isDev() || platformUtilsService.isSelfHost(),
@@ -24,3 +25,4 @@
 +
          await apiService.setUrls({
              base: isDev ? null : window.location.origin,
+             api: isDev ? 'http://localhost:4000' : null,
diff --git a/PKGBUILD b/PKGBUILD
index 5d102cda725b..4940ef4d71f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Markus Richter <mqus at disroot dot org>
 
 pkgname=bitwarden_rs-vault-git
-pkgver=v2.2.0.r42.g3a136e1
+pkgver=v2.3.0.r3.g6399973
 pkgrel=1
 pkgdesc="Integrates the Vault Web-Interface into bitwarden_rs."
 arch=('any')
@@ -13,10 +13,10 @@ conflicts=("bitwarden_rs-vault")
 provides=('bitwarden_rs-vault') 
 install=bitwarden_rs-vault.install
 source=("git+https://github.com/bitwarden/web.git"
-	"0001-Set-Vault-BaseURL-git.patch"
+	"0001-Set-Vault-BaseURL.patch"
 	"${pkgname%-git}.install")
 sha512sums=('SKIP'
-            'be85a1a6c032c6b881667fdf7ff864e91cdccaa44a8a081732acb2b1e284d12f7dbfd2c0d0536abc2a52181b57dbf6d76a2be80a8fbc69d731a3878d9cc88422'
+            '9a9885298fceb8de737aae0e616158ed5c41a15acbfc723048ed8d509cb40d0e32048e12b9aeb4a6a4c67485ba08f0b8e52ba7cb4d8d2036ae4dc19e39431961'
             '5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1')
 
 pkgver() {
@@ -30,7 +30,7 @@ pkgver() {
 prepare() {
 	#patch paths
 	cd "$srcdir/web"
-	patch -N -i "$srcdir/0001-Set-Vault-BaseURL-git.patch" "src/app/services/services.module.ts"
+	patch -N -i "$srcdir/0001-Set-Vault-BaseURL.patch" "src/app/services/services.module.ts"
 }
 
 build() {