diff options
| author | Markus Richter | 2019-03-05 20:11:23 +0100 |
|---|---|---|
| committer | Markus Richter | 2019-03-05 20:11:23 +0100 |
| commit | 1a84aeabea0bfcf08612586c9fbf849344ded577 (patch) | |
| tree | 2f174747bb4a06b5057ee297fe780f28e972d293 | |
| parent | c4e9215b4dbd0a16f5f18bf09833a62c0cc4611d (diff) | |
| download | aur-1a84aeabea0bfcf08612586c9fbf849344ded577.tar.gz | |
fix builds for aur snapshot tarballs
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0002-Disable-Git-Submodule-Commands.patch | 10 | ||||
| -rw-r--r-- | PKGBUILD | 8 |
3 files changed, 19 insertions, 3 deletions
@@ -1,7 +1,7 @@ pkgbase = bitwarden_rs-vault pkgdesc = Integrates the Vault Web-Interface into bitwarden_rs. pkgver = 2.8.0 - pkgrel = 2 + pkgrel = 3 url = https://github.com/bitwarden/web install = bitwarden_rs-vault.install arch = any @@ -12,10 +12,12 @@ pkgbase = bitwarden_rs-vault source = https://github.com/bitwarden/web/archive/v2.8.0.tar.gz source = https://github.com/bitwarden/jslib/archive/fc5fcb905fe465e99e85540f6b645c0f11b6704d.tar.gz source = 0001-Set-Vault-BaseURL.patch + source = 0002-Disable-Git-Submodule-Commands.patch source = bitwarden_rs-vault.install sha512sums = bb7dba7775c2822a11b22159d6e4c2493638fff1287d34797cbc618d237f4b9e37e78943efe9c1f4bc4215cf51acd3d530b227b4e4b66072c0e77d03bdd7c434 sha512sums = 6a5c020a0758f3f63862a1813df817b7672f8d7760f1fb76fb34e32221a1ba0ecca141b4df2e8c9ed1d0c91a0ae25ff467e8788baa926a7d592ddb086a513fa7 sha512sums = 08dabddcba9dc917c40e2a8e1058b2b7b7246e747a1178c7f5774366cef35c689e3058c60c3bd659f6aab3bca737c26d4b63bab19c914f35f8e91dabc388923f + sha512sums = adaa6037e59f08a6a44f681c8eab915c0738069989f9d6acbf46e4d3135f69696fa7735a65158979fbc924b27f43bdf255648e615b33495ac7da418e89f27c90 sha512sums = 5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1 pkgname = bitwarden_rs-vault diff --git a/0002-Disable-Git-Submodule-Commands.patch b/0002-Disable-Git-Submodule-Commands.patch new file mode 100644 index 000000000000..91bf7701c09f --- /dev/null +++ b/0002-Disable-Git-Submodule-Commands.patch @@ -0,0 +1,10 @@ +index b27ff963..6e79008b 100644 +--- a/package.json ++++ b/package.json +@@ -4,4 +4,4 @@ + "scripts": { +- "sub:init": "git submodule update --init --recursive", +- "sub:update": "git submodule update --remote", ++ "sub:init": "true", ++ "sub:update": "true", + "sub:pull": "git submodule foreach git pull", @@ -3,7 +3,7 @@ _jslib_commit="fc5fcb905fe465e99e85540f6b645c0f11b6704d" pkgname=bitwarden_rs-vault pkgver=2.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="Integrates the Vault Web-Interface into bitwarden_rs." arch=('any') url="https://github.com/bitwarden/web" @@ -15,17 +15,21 @@ install=bitwarden_rs-vault.install source=("https://github.com/bitwarden/web/archive/v$pkgver.tar.gz" "https://github.com/bitwarden/jslib/archive/${_jslib_commit}.tar.gz" "0001-Set-Vault-BaseURL.patch" + "0002-Disable-Git-Submodule-Commands.patch" "$pkgname.install") sha512sums=('bb7dba7775c2822a11b22159d6e4c2493638fff1287d34797cbc618d237f4b9e37e78943efe9c1f4bc4215cf51acd3d530b227b4e4b66072c0e77d03bdd7c434' '6a5c020a0758f3f63862a1813df817b7672f8d7760f1fb76fb34e32221a1ba0ecca141b4df2e8c9ed1d0c91a0ae25ff467e8788baa926a7d592ddb086a513fa7' '08dabddcba9dc917c40e2a8e1058b2b7b7246e747a1178c7f5774366cef35c689e3058c60c3bd659f6aab3bca737c26d4b63bab19c914f35f8e91dabc388923f' + 'adaa6037e59f08a6a44f681c8eab915c0738069989f9d6acbf46e4d3135f69696fa7735a65158979fbc924b27f43bdf255648e615b33495ac7da418e89f27c90' '5265612afd40cb757e7d6550ca902f9c02c558e7d03607a181df923374efdf9eff85296c216db7c96d9987eb1fe0834a7eb90de7dcd988c9f7443dc69b9469b1') prepare() { #patch paths cd "$srcdir/web-$pkgver" - patch -N -p1 -i "$srcdir/0001-Set-Vault-BaseURL.patch" + patch -N -p1 -i "$srcdir/0001-Set-Vault-BaseURL.patch" + # fix for AUR-snapshot tarballs + patch -N -p1 -i "$srcdir/0002-Disable-Git-Submodule-Commands.patch" #simulate git-submodules rmdir jslib ln -s "../jslib-${_jslib_commit}" jslib |