Attachment 216985 Details for Bug 248447 – fzf 0.22.0 update patch

[patch] fzf 0.22.0 update patch

fzf_0.22.0_update.diff (text/plain), 3.80 KB, created by Sascha Holzleiter on 2020-08-03 10:01:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sascha Holzleiter

Created: 2020-08-03 10:01:16 UTC

Size: 3.80 KB

patch

obsolete

>diff -Nur fzf.orig/Makefile fzf/Makefile
>--- fzf.orig/Makefile	2020-05-29 03:32:05.123651000 +0200
>+++ fzf/Makefile	2020-08-03 11:51:59.432360000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	fzf
>-PORTVERSION=	0.21.1
>+PORTVERSION=	0.22.0
> CATEGORIES=	textproc
> 
> MAINTAINER=	sascha@root-login.org
>diff -Nur fzf.orig/distinfo fzf/distinfo
>--- fzf.orig/distinfo	2020-05-29 03:32:05.123717000 +0200
>+++ fzf/distinfo	2020-08-03 11:51:59.432318000 +0200
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1590431990
>-SHA256 (junegunn-fzf-0.21.1_GH0.tar.gz) = 47adf138f17c45d390af81958bdff6f92157d41e2c4cb13773df078b905cdaf4
>-SIZE (junegunn-fzf-0.21.1_GH0.tar.gz) = 163978
>+TIMESTAMP = 1596448053
>+SHA256 (junegunn-fzf-0.22.0_GH0.tar.gz) = 3090748bb656333ed98490fe62133760e5da40ba4cd429a8142b4a0b69d05586
>+SIZE (junegunn-fzf-0.22.0_GH0.tar.gz) = 168483
> SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013
> SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886
> SHA256 (gdamore-tcell-v1.3.0_GH0.tar.gz) = 5e4d2206a459109fdd98fb1d29f2da2340b69a021b115db9049917444a0c1097
>diff -Nur fzf.orig/files/patch-shell_completion.bash fzf/files/patch-shell_completion.bash
>--- fzf.orig/files/patch-shell_completion.bash	2020-05-29 03:32:05.123797000 +0200
>+++ fzf/files/patch-shell_completion.bash	2020-08-03 11:51:59.432185000 +0200
>@@ -1,11 +1,11 @@
>---- shell/completion.bash.orig	2020-05-25 18:52:57 UTC
>+--- shell/completion.bash.orig	2020-08-03 09:46:24 UTC
> +++ shell/completion.bash
>-@@ -252,7 +252,7 @@ _fzf_complete_kill() {
>-   [ -n "${COMP_WORDS[COMP_CWORD]}" ] && return 1
>+@@ -262,7 +262,7 @@ _fzf_complete_kill() {
>  
>-   local selected
>--  selected=$(command ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS --preview 'echo {}' --preview-window down:3:wrap" __fzf_comprun "kill" -m | awk '{print $2}' | tr '\n' ' ')
>-+  selected=$(ps -uef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS --preview 'echo {}' --preview-window down:3:wrap" __fzf_comprun "kill" -m | awk '{print $2}' | tr '\n' ' ')
>-   selected=${selected% }
>-   printf '\e[5n'
>+ _fzf_proc_completion() {
>+   _fzf_complete -m --preview 'echo {}' --preview-window down:3:wrap --min-height 15 -- "$@" < <(
>+-    command ps -ef | sed 1d
>++    command ps -uef | sed 1d
>+   )
>+ }
>  
>diff -Nur fzf.orig/files/patch-shell_completion.zsh fzf/files/patch-shell_completion.zsh
>--- fzf.orig/files/patch-shell_completion.zsh	2020-05-29 03:32:05.123867000 +0200
>+++ fzf/files/patch-shell_completion.zsh	2020-08-03 11:51:59.432275000 +0200
>@@ -1,11 +1,11 @@
>---- shell/completion.zsh.orig	2020-05-25 18:53:01 UTC
>+--- shell/completion.zsh.orig	2020-08-03 09:46:30 UTC
> +++ shell/completion.zsh
>-@@ -276,7 +276,7 @@ fzf-completion() {
>-   tail=${LBUFFER:$(( ${#LBUFFER} - ${#trigger} ))}
>-   # Kill completion (do not require trigger sequence)
>-   if [ $cmd = kill -a ${LBUFFER[-1]} = ' ' ]; then
>--    matches=$(command ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS --preview 'echo {}' --preview-window down:3:wrap" __fzf_comprun "$cmd" -m | awk '{print $2}' | tr '\n' ' ')
>-+    matches=$(ps -uef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS --preview 'echo {}' --preview-window down:3:wrap" __fzf_comprun "$cmd" -m | awk '{print $2}' | tr '\n' ' ')
>-     if [ -n "$matches" ]; then
>-       LBUFFER="$LBUFFER$matches"
>-     fi
>+@@ -252,7 +252,7 @@ _fzf_complete_unalias() {
>+ 
>+ _fzf_complete_kill() {
>+   _fzf_complete -m --preview 'echo {}' --preview-window down:3:wrap --min-height 15 -- "$@" < <(
>+-    command ps -ef | sed 1d
>++    command ps -uef | sed 1d
>+   )
>+ }
>+

Flags:

sascha: maintainer-approval+

Actions: View | Diff

Attachments on bug 248447: 216985