Update to latest version.

This commit is contained in:
Elliott Sales de Andrade
2021-01-02 23:37:59 -05:00
parent 1ef4f25322
commit 39b12b8dc1
4 changed files with 50 additions and 2 deletions

1
.gitignore vendored
View File

@@ -17,3 +17,4 @@
/fzf-0.24.2.tar.gz
/fzf-0.24.3.tar.gz
/fzf-0.24.4.tar.gz
/fzf-0.25.0.tar.gz

View File

@@ -0,0 +1,41 @@
From cab32ead2291fdbe5f5c284c71a693705533c700 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sat, 2 Jan 2021 23:25:43 -0500
Subject: [PATCH] Use more explicit int-to-string conversion.
This fixes the following errors with Go 1.15:
```
src/options.go:452:69: conversion from untyped int to string yields a string of one rune, not a string of digits (did you mean fmt.Sprint(x)?)
src/options.go:463:33: conversion from untyped int to string yields a string of one rune, not a string of digits (did you mean fmt.Sprint(x)?)
```
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
src/options.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/options.go b/src/options.go
index 12c0955..cee11ff 100644
--- a/src/options.go
+++ b/src/options.go
@@ -449,7 +449,7 @@ func parseKeyChords(str string, message string) map[tui.Event]string {
errorExit(message)
}
- str = regexp.MustCompile("(?i)(alt-),").ReplaceAllString(str, "$1"+string(escapedComma))
+ str = regexp.MustCompile("(?i)(alt-),").ReplaceAllString(str, "$1"+string([]rune{escapedComma}))
tokens := strings.Split(str, ",")
if str == "," || strings.HasPrefix(str, ",,") || strings.HasSuffix(str, ",,") || strings.Contains(str, ",,,") {
tokens = append(tokens, ",")
@@ -460,7 +460,7 @@ func parseKeyChords(str string, message string) map[tui.Event]string {
if len(key) == 0 {
continue // ignore
}
- key = strings.ReplaceAll(key, string(escapedComma), ",")
+ key = strings.ReplaceAll(key, string([]rune{escapedComma}), ",")
lkey := strings.ToLower(key)
add := func(e tui.EventType) {
chords[e.AsEvent()] = key
--
2.29.2

View File

@@ -2,7 +2,7 @@
# https://github.com/junegunn/fzf
%global goipath github.com/junegunn/fzf
Version: 0.24.4
Version: 0.25.0
%global tag %{version}
%gometa
@@ -15,6 +15,8 @@ License: MIT
URL: %{gourl}
Source0: %{gosource}
Source1: README.Fedora
# https://github.com/junegunn/fzf/pull/2305
Patch0001: 0001-Use-more-explicit-int-to-string-conversion.patch
BuildRequires: golang(github.com/gdamore/tcell) >= 1.4
BuildRequires: golang(github.com/gdamore/tcell/encoding)
@@ -35,6 +37,7 @@ etc.
%prep
%goprep
cp %{SOURCE1} .
%patch0001 -p1
%build
@@ -97,6 +100,9 @@ install -Dpm0644 shell/key-bindings.* %{buildroot}%{_datadir}/fzf/shell/
%changelog
* Sat Jan 02 2021 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.25.0-1
- Update to latest version (#1912051)
* Sat Dec 12 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.24.4-1
- Update to latest version (#1904701)

View File

@@ -1 +1 @@
SHA512 (fzf-0.24.4.tar.gz) = 348cc000b4e28054bff56a37171ef4dd7ac22c7c292c19c3c0b95f3d30856b443887447604e1e38cfd71b421a22c1135a13cb40c78e5b34d477acaa3dcadb821
SHA512 (fzf-0.25.0.tar.gz) = 73b65374334531ac81a64bb973cb976f4dab7c6458eb2705f323349223880294fa6238b0eeea3412ff121c5c1b70905b261ceb7994c2b00425b02c88286b36e3