Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New packages: vaultwarden-web-2022.8.1, vaultwarden-1.25.1 #37258

Merged
merged 2 commits into from Sep 6, 2022

Conversation

TinfoilSubmarine
Copy link
Contributor

Testing the changes

  • I tested the changes in this PR: YES

New package

srcpkgs/vaultwarden-web/template Outdated Show resolved Hide resolved
srcpkgs/vaultwarden-web/template Outdated Show resolved Hide resolved
@TinfoilSubmarine TinfoilSubmarine force-pushed the maint/vaultwarden branch 3 times, most recently from aecac14 to 3f1e7fd Compare May 24, 2022 11:58
@paper42 paper42 added the new-package This PR adds a new package label May 26, 2022
@TinfoilSubmarine TinfoilSubmarine changed the title New packages: vaultwarden-web-2.28.1, vaultwarden-1.25.0 New packages: vaultwarden-web-2022.05.0, vaultwarden-1.25.0 Jun 6, 2022
@TinfoilSubmarine
Copy link
Contributor Author

Removed all the patches as they are no longer needed with Rust 1.61 in repo.

@TinfoilSubmarine TinfoilSubmarine force-pushed the maint/vaultwarden branch 2 times, most recently from ca7d8b7 to 0bdc475 Compare June 28, 2022 13:49
@TinfoilSubmarine TinfoilSubmarine changed the title New packages: vaultwarden-web-2022.05.0, vaultwarden-1.25.0 New packages: vaultwarden-web-2022.5.2, vaultwarden-1.25.0 Jun 28, 2022
@TinfoilSubmarine TinfoilSubmarine changed the title New packages: vaultwarden-web-2022.5.2, vaultwarden-1.25.0 New packages: vaultwarden-web-2022.6.0, vaultwarden-1.25.0 Jul 11, 2022
@TinfoilSubmarine TinfoilSubmarine changed the title New packages: vaultwarden-web-2022.6.0, vaultwarden-1.25.0 New packages: vaultwarden-web-2022.6.2, vaultwarden-1.25.1 Jul 19, 2022
@TinfoilSubmarine TinfoilSubmarine changed the title New packages: vaultwarden-web-2022.6.2, vaultwarden-1.25.1 New packages: vaultwarden-web-2022.8.1, vaultwarden-1.25.1 Sep 4, 2022
@classabbyamp
Copy link
Member

classabbyamp commented Sep 6, 2022

I know I said the opposite before, but thinking about it again, i think pulling the patch from upstream is best

this worked for me:

diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template
index 47f3f41d62..557c3e1952 100644
--- a/srcpkgs/vaultwarden-web/template
+++ b/srcpkgs/vaultwarden-web/template
@@ -2,17 +2,26 @@
 pkgname=vaultwarden-web
 version=2022.8.1
 revision=1
-wrksrc="clients-web-v${version}"
+_patch_ver=2022.8.0
+create_wrksrc=yes
+build_wrksrc="clients-web-v${version}"
 hostmakedepends="git nodejs"
 short_desc="Web vault builds for vaultwarden"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="GPL-3.0-or-later"
-# patches need to be pulled from
-# https://github.com/dani-garcia/bw_web_builds/tree/master/patches into the
-# patches directory
 homepage="https://github.com/dani-garcia/bw_web_builds"
-distfiles="https://github.com/bitwarden/clients/archive/web-v${version}.tar.gz"
-checksum=9dff38f13d8be047fe0fd6426bda3c409bb222b787bd6b21a3559f5d29255a92
+distfiles="https://github.com/bitwarden/clients/archive/web-v${version}.tar.gz
+ https://raw.githubusercontent.com/dani-garcia/bw_web_builds/master/patches/v${_patch_ver}.patch"
+checksum="9dff38f13d8be047fe0fd6426bda3c409bb222b787bd6b21a3559f5d29255a92
+ 1199bcf5edb0cad2e0fc1e839b5bdc690565d6af5b32cc1c38348f0b13c69ee9"
+
+post_extract() {
+       mv v$_patch_ver.patch ${build_wrksrc}
+}
+
+post_patch() {
+       patch -Np1 -i v$_patch_ver.patch
+}
 
 do_configure() {
        npm ci --ignore-scripts

I'm going to do some testing with it and we can get this merged :)

@classabbyamp classabbyamp merged commit 4c2c9b7 into void-linux:master Sep 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
new-package This PR adds a new package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants