sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fzf: Update from 0.15.5 to 0.15.8

Browse Source
This commit is contained in:
Fredrik Fornwall 2016-11-20 07:26:51 -05:00
parent 98912d1216
commit 926b0cba59
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/fzf/build.sh
View File

@ -1,6 +1,6 @@
TERMUX_PKG_HOMEPAGE=https://github.com/junegunn/fzf TERMUX_PKG_HOMEPAGE=https://github.com/junegunn/fzf
TERMUX_PKG_DESCRIPTION="Command-line fuzzy finder" TERMUX_PKG_DESCRIPTION="Command-line fuzzy finder"
TERMUX_PKG_VERSION=0.15.5 TERMUX_PKG_VERSION=0.15.8
TERMUX_PKG_SRCURL=https://github.com/junegunn/fzf/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://github.com/junegunn/fzf/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_FOLDERNAME=fzf-${TERMUX_PKG_VERSION} TERMUX_PKG_FOLDERNAME=fzf-${TERMUX_PKG_VERSION}
TERMUX_PKG_BUILD_IN_SRC="yes" TERMUX_PKG_BUILD_IN_SRC="yes"
@ -16,7 +16,7 @@ termux_step_make_install () {
export CGO_CFLAGS="-I$TERMUX_PREFIX/include -L$TERMUX_PREFIX/lib" export CGO_CFLAGS="-I$TERMUX_PREFIX/include -L$TERMUX_PREFIX/lib"
export CGO_LDFLAGS="-L$TERMUX_PREFIX/lib" export CGO_LDFLAGS="-L$TERMUX_PREFIX/lib"
mkdir -p $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/{go-runewidth,go-shellwords} mkdir -p $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/{go-runewidth,go-shellwords,go-isatty}
for file in runewidth.go runewidth_posix.go; do for file in runewidth.go runewidth_posix.go; do
curl -o $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/go-runewidth/$file \ curl -o $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/go-runewidth/$file \
https://raw.githubusercontent.com/junegunn/go-runewidth/master/$file https://raw.githubusercontent.com/junegunn/go-runewidth/master/$file
@ -25,6 +25,8 @@ termux_step_make_install () {
curl -o $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/go-shellwords/$file \ curl -o $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/go-shellwords/$file \
https://raw.githubusercontent.com/junegunn/go-shellwords/master/$file https://raw.githubusercontent.com/junegunn/go-shellwords/master/$file
done done
curl -o $GOPATH/src/github.com/junegunn/fzf/src/vendor/github.com/junegunn/go-isatty/isatty_linux.go \
https://raw.githubusercontent.com/junegunn/go-isatty/master/isatty_linux.go
cd $GOPATH/src/github.com/junegunn/fzf/src/fzf cd $GOPATH/src/github.com/junegunn/fzf/src/fzf
CGO_ENABLED=1 go build -a -ldflags="-extldflags=-pie" -o $TERMUX_PREFIX/bin/fzf CGO_ENABLED=1 go build -a -ldflags="-extldflags=-pie" -o $TERMUX_PREFIX/bin/fzf

12
packages/fzf/curses.go.patch
View File

@ -1,12 +0,0 @@
diff -u -r ../fzf-0.11.1/src/curses/curses.go ./src/curses/curses.go
--- ../fzf-0.11.1/src/curses/curses.go 2015-11-30 10:39:45.000000000 -0500
+++ ./src/curses/curses.go 2016-01-10 19:03:28.616487822 -0500
@@ -4,8 +4,6 @@
#include <ncurses.h>
#include <locale.h>
#cgo !static LDFLAGS: -lncurses
-#cgo static LDFLAGS: -l:libncursesw.a -l:libtinfo.a -l:libgpm.a -ldl
-#cgo android static LDFLAGS: -l:libncurses.a -fPIE -march=armv7-a -mfpu=neon -mhard-float -Wl,--no-warn-mismatch
SCREEN *c_newterm () {
return newterm(NULL, stderr, stdin);

12
packages/fzf/src-tui-ncurses.go.patch Normal file
View File

@ -0,0 +1,12 @@
diff -u -r ../fzf-0.15.8/src/tui/ncurses.go ./src/tui/ncurses.go
--- ../fzf-0.15.8/src/tui/ncurses.go 2016-11-19 09:13:26.000000000 -0500
+++ ./src/tui/ncurses.go 2016-11-20 07:23:58.507085093 -0500
@@ -7,8 +7,6 @@
#include <ncurses.h>
#include <locale.h>
#cgo !static LDFLAGS: -lncurses
-#cgo static LDFLAGS: -l:libncursesw.a -l:libtinfo.a -l:libgpm.a -ldl
-#cgo android static LDFLAGS: -l:libncurses.a -fPIE -march=armv7-a -mfpu=neon -mhard-float -Wl,--no-warn-mismatch
FILE* c_tty() {
return fopen("/dev/tty", "r");