diff options
| author | sum01 | 2017-12-29 17:16:23 -0500 |
|---|---|---|
| committer | sum01 | 2017-12-29 17:16:23 -0500 |
| commit | f96b0836c25db8cc3f3dc4c2f9a6ef1918065efa (patch) | |
| tree | fad2bd97b21b0cd0f4197262be11aab8088a80dc | |
| parent | ff8e4ba6cf00b7d8fadc7b187287cd3d5ef21cc1 (diff) | |
| download | aur-f96b0836c25db8cc3f3dc4c2f9a6ef1918065efa.tar.gz | |
Fix build with a lazy patch
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | fix_arch.patch | 26 |
4 files changed, 37 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = buttercup-desktop pkgdesc = Javascript Password Vault - Multi-Platform Desktop Application pkgver = 0.25.2 - pkgrel = 2 + pkgrel = 3 url = https://github.com/buttercup/buttercup-desktop arch = i686 arch = x86_64 @@ -16,8 +16,10 @@ pkgbase = buttercup-desktop depends = nss source = https://github.com/buttercup/buttercup-desktop/archive/v0.25.2.tar.gz source = buttercup-desktop.desktop + source = fix_arch.patch sha512sums = d549e74a0cfb564b29c4ced9c42e7c52446277438fe805f856d61f031d01acd7aacd48f71c00c0b4ed6ed2d7ef8d6f19d264188f9b8758f098df15b2880978bd sha512sums = 7ecea9e3e00b3b967d669ddb1777f194c5a4ae3e7e6bd941831b9a594ddb5215d264e513d25203268a1de1fa684a2a9ec4642f32233c403b5e425ecf9e7ae988 + sha512sums = dd9595ea6d6e458d5c7881d49ca5a79b73e9214ea981042f0f76f4c754a93a9df39ccf029d5e01a88b17f95f01e18533964fd7ea16e3810c228b72003d4e110a pkgname = buttercup-desktop diff --git a/.gitignore b/.gitignore index b28ab4fd62bf..7bcaceb48c6b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ !.SRCINFO !PKGBUILD !*.desktop +!*.patch @@ -2,7 +2,7 @@ # Contributor: j1simon pkgname=buttercup-desktop pkgver=0.25.2 -pkgrel=2 +pkgrel=3 pkgdesc='Javascript Password Vault - Multi-Platform Desktop Application' arch=('i686' 'x86_64') url="https://github.com/buttercup/buttercup-desktop" @@ -10,10 +10,14 @@ license=('GPL3') depends=('gtk2' 'gconf' 'libxtst' 'alsa-lib' 'libxss' 'nss') makedepends=('npm' 'sed') source=("https://github.com/buttercup/buttercup-desktop/archive/v$pkgver.tar.gz" - "buttercup-desktop.desktop") + "buttercup-desktop.desktop" + "fix_arch.patch") sha512sums=('d549e74a0cfb564b29c4ced9c42e7c52446277438fe805f856d61f031d01acd7aacd48f71c00c0b4ed6ed2d7ef8d6f19d264188f9b8758f098df15b2880978bd' - '7ecea9e3e00b3b967d669ddb1777f194c5a4ae3e7e6bd941831b9a594ddb5215d264e513d25203268a1de1fa684a2a9ec4642f32233c403b5e425ecf9e7ae988') + '7ecea9e3e00b3b967d669ddb1777f194c5a4ae3e7e6bd941831b9a594ddb5215d264e513d25203268a1de1fa684a2a9ec4642f32233c403b5e425ecf9e7ae988' + 'dd9595ea6d6e458d5c7881d49ca5a79b73e9214ea981042f0f76f4c754a93a9df39ccf029d5e01a88b17f95f01e18533964fd7ea16e3810c228b72003d4e110a') prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix_arch.patch" sed -i '/"rpm",/d' "$srcdir/$pkgname-$pkgver/package.json" sed -i '/"AppImage",/d' "$srcdir/$pkgname-$pkgver/package.json" sed -i 's/"deb"/"dir"/' "$srcdir/$pkgname-$pkgver/package.json" diff --git a/fix_arch.patch b/fix_arch.patch new file mode 100644 index 000000000000..613374a387f4 --- /dev/null +++ b/fix_arch.patch @@ -0,0 +1,26 @@ +From e2e1a0cc23afcd9ca99b087f59ff8b1fcac83d02 Mon Sep 17 00:00:00 2001 +From: sum01 <sum01@protonmail.com> +Date: Fri, 29 Dec 2017 17:05:34 -0500 +Subject: [PATCH] Fix archlinux + +--- + package.json | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/package.json b/package.json +index b04ea2a..12ed81c 100644 +--- a/package.json ++++ b/package.json +@@ -260,7 +260,8 @@ + "webdav-fs": "^1.3.0", + "webpack": "^3.8.1", + "webpack-dev-server": "^2.9.4", +- "webpack-merge": "^4.1.1" ++ "webpack-merge": "^4.1.1", ++ "7zip-bin-linux": "^1.1.0" + }, + "collective": { + "type": "opencollective", +-- +2.15.1 + |