diff options
| author | Morten Linderud | 2016-05-15 21:11:03 +0200 |
|---|---|---|
| committer | Morten Linderud | 2016-05-15 21:12:13 +0200 |
| commit | ca03d96111e4be00a0af48aeb7502314d6c4ad0d (patch) | |
| tree | d0dfe5652fa7d2f27c58b2b2df92fa9d45f38b0b | |
| parent | 9e6474186d67e55638c1c740663e06c755fae728 (diff) | |
| download | aur-ca03d96111e4be00a0af48aeb7502314d6c4ad0d.tar.gz | |
Fixed PKGBUILD and added colors.patch
Signed-off-by: Morten Linderud <morten@linderud.pw>
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | colors.patch | 14 |
3 files changed, 28 insertions, 5 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Sun May 15 13:32:08 UTC 2016 +# Sun May 15 19:10:22 UTC 2016 pkgbase = i3blocks-git pkgdesc = Define blocks for your i3bar status line pkgver = 1.4.r21.g017395f @@ -18,7 +18,9 @@ pkgbase = i3blocks-git provides = i3blocks conflicts = i3blocks source = git+https://github.com/vivien/i3blocks + source = colors.patch sha256sums = SKIP + sha256sums = 11aed157515cfa77e1cec693effd7300107d3b7aa8a1b0beacf7b395bf9d46fa pkgname = i3blocks-git @@ -1,4 +1,5 @@ -# Maintainer: Patrice Peterson <runiq at archlinux dot us> +# Maintainer: Morten Linderud <morten@linderud.pw> +# Contributor: Patrice Peterson <runiq at archlinux dot us> # Contributor: Vivien Didelot <vivien+aur@didelot.org> pkgname=i3blocks-git _pkgname=i3blocks @@ -16,8 +17,14 @@ optdepends=('acpi: For example battery script' 'openvpn: For openvpn contrib script') provides=("$_pkgname") conflicts=("$_pkgname") -source=("git+https://github.com/vivien/$_pkgname") -sha256sums=('SKIP') +source=("git+https://github.com/vivien/$_pkgname" "colors.patch") +sha256sums=('SKIP' + '11aed157515cfa77e1cec693effd7300107d3b7aa8a1b0beacf7b395bf9d46fa') + +prepare() { + cd "$srcdir/$_pkgname" + patch -Np1 <../colors.patch +} pkgver () { cd "$srcdir/$_pkgname" @@ -29,7 +36,7 @@ build () { } package () { - make -C "$srcdir/$_pkgname" DESTDIR="$pkgdir" PREFIX=/usr install + make -C "$srcdir/$_pkgname" DESTDIR="$pkgdir" PREFIX=/usr LIBEXECDIR=/usr/lib install } # vim: et ts=2 sw=2 diff --git a/colors.patch b/colors.patch new file mode 100644 index 000000000000..b0cc9fb227e8 --- /dev/null +++ b/colors.patch @@ -0,0 +1,14 @@ +diff --git a/src/block.c b/src/block.c +index 7a72c0c..792a06e 100644 +--- a/src/block.c ++++ b/src/block.c +@@ -163,7 +163,8 @@ block_update_plain_text(struct block *block, char *buf) + return; + + linecpy(&lines, props->short_text, sizeof(props->short_text) - 1); +- linecpy(&lines, props->color, sizeof(props->color) - 1); ++ if (*lines) ++ linecpy(&lines, props->color, sizeof(props->color) - 1); + } + + static void |