diff options
| author | haawda | 2020-06-15 12:05:12 +0200 |
|---|---|---|
| committer | haawda | 2020-06-15 12:05:12 +0200 |
| commit | c7a0efcb152d02568d6f8958c2aea8547edc12a9 (patch) | |
| tree | 4b9e1ba475355892a227c5548dce311b9815fda0 | |
| parent | d4366aa811ab37727cfd0ebb3584282803b0012c (diff) | |
| download | aur-c7a0efcb152d02568d6f8958c2aea8547edc12a9.tar.gz | |
Adopted, removed patches, rewrittten pkgver
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 30 | ||||
| -rw-r--r-- | key-bindings.zsh.patch | 12 |
3 files changed, 9 insertions, 40 deletions
@@ -1,7 +1,8 @@ pkgbase = fzf-git pkgdesc = Command-line fuzzy finder - pkgver = 20190909 + pkgver = 0.21.1.r21.g06d63a8 pkgrel = 1 + epoch = 1 url = https://github.com/junegunn/fzf install = fzf.install arch = aarch64 @@ -22,12 +23,8 @@ pkgbase = fzf-git conflicts = fzf source = git+https://github.com/junegunn/fzf source = git+https://github.com/junegunn/fzf.wiki - source = key-bindings.bash.patch - source = key-bindings.zsh.patch sha256sums = SKIP sha256sums = SKIP - sha256sums = fc981d036d85d0b9a5e6ba65f84b1c0f86bcee2dabb09238e1edfa1f49a85b63 - sha256sums = 0b89bf1d6d372b9a8d5927e58151157d42848086a252979006b89b72242c52e6 pkgname = fzf-git @@ -1,11 +1,13 @@ -# Maintainer: Matthew McGinn <mamcgi@gmail.com> +# Contributor: Matthew McGinn <mamcgi@gmail.com> # Contributor: Andy Weidenbaum <archbaum@gmail.com> # Contributor: foalsrock <foalsrock at gmail dot-com> # Contributor: jebaum <jebaum at ucla dot edu> +# Maitainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=fzf-git -pkgver=20190909 +pkgver=0.21.1.r21.g06d63a8 pkgrel=1 +epoch=1 pkgdesc="Command-line fuzzy finder" arch=('aarch64' 'armv6h' 'armv7h' 'i686' 'x86_64') depends=('ncurses') @@ -17,32 +19,16 @@ optdepends=('fish: fish keybindings' url="https://github.com/junegunn/fzf" license=('MIT') source=(git+https://github.com/junegunn/fzf - git+https://github.com/junegunn/fzf.wiki - key-bindings.bash.patch - key-bindings.zsh.patch) + git+https://github.com/junegunn/fzf.wiki) sha256sums=('SKIP' - 'SKIP' - 'fc981d036d85d0b9a5e6ba65f84b1c0f86bcee2dabb09238e1edfa1f49a85b63' - '0b89bf1d6d372b9a8d5927e58151157d42848086a252979006b89b72242c52e6') + 'SKIP') provides=('fzf') conflicts=('fzf') install=fzf.install pkgver() { cd ${pkgname%-git} - git log -1 --format="%cd" --date=short --no-show-signature | sed "s|-||g" -} - -prepare() { - cd ${pkgname%-git} - - msg2 'Fixing bash and zsh key bindings...' - - msg2 'Making fzf key-bindings.bash source bash completions...' - patch -p1 < "$srcdir/key-bindings.bash.patch" - - msg2 'Making fzf key-bindings.zsh source zsh completions...' - patch -p1 < "$srcdir/key-bindings.zsh.patch" + git describe --tags | sed "s+-+.r+" | tr - . } build() { @@ -64,8 +50,6 @@ package() { cp -dpr --no-preserve=ownership "$srcdir/fzf.wiki" \ "$pkgdir/usr/share/doc/fzf/wiki" - - msg2 'Installing manual...' install -Dm 644 "man/man1/fzf.1" -t "$pkgdir/usr/share/man/man1" install -Dm 644 "man/man1/fzf-tmux.1" -t "$pkgdir/usr/share/man/man1" diff --git a/key-bindings.zsh.patch b/key-bindings.zsh.patch deleted file mode 100644 index a47744385aaa..000000000000 --- a/key-bindings.zsh.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./shell/key-bindings.zsh 2015-10-05 07:53:13.168267783 -0700 -+++ ./shell/key-bindings.zsh 2015-10-05 07:53:32.584935525 -0700 -@@ -1,3 +1,9 @@ -+# Auto-completion -+# --------------- -+if [[ -f /usr/share/zsh/site-functions/_fzf ]]; then -+ source /usr/share/zsh/site-functions/_fzf -+fi -+ - # Key bindings - # ------------ - if [[ $- == *i* ]]; then |