From 07d9b07c65d579a394a2c8ada287575f5dfa7384 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 17 Feb 2016 23:12:49 -0500 Subject: [PATCH] pick: Update from 1.2.1 to 1.3.0 --- packages/pick/build.sh | 2 +- packages/pick/src-compat.h.patch | 13 +++++++++++++ packages/pick/src-pick.c.patch | 13 +++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 packages/pick/src-compat.h.patch create mode 100644 packages/pick/src-pick.c.patch diff --git a/packages/pick/build.sh b/packages/pick/build.sh index 00a0bc52d..e1d5018cd 100644 --- a/packages/pick/build.sh +++ b/packages/pick/build.sh @@ -1,5 +1,5 @@ TERMUX_PKG_HOMEPAGE=https://github.com/thoughtbot/pick TERMUX_PKG_DESCRIPTION="Utility to choose one option from a set of choices with fuzzy search functionality" -TERMUX_PKG_VERSION=1.2.1 +TERMUX_PKG_VERSION=1.3.0 TERMUX_PKG_SRCURL=https://github.com/thoughtbot/pick/releases/download/v${TERMUX_PKG_VERSION}/pick-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="ncurses" diff --git a/packages/pick/src-compat.h.patch b/packages/pick/src-compat.h.patch new file mode 100644 index 000000000..e91d40e5e --- /dev/null +++ b/packages/pick/src-compat.h.patch @@ -0,0 +1,13 @@ +diff -u -r ../pick-1.3.0/src/compat.h ./src/compat.h +--- ../pick-1.3.0/src/compat.h 2016-02-12 03:48:41.000000000 -0500 ++++ ./src/compat.h 2016-02-17 22:47:09.825782253 -0500 +@@ -10,7 +10,8 @@ + #endif /* __FreeBSD__ */ + + #if defined(__linux__) || defined(__CYGWIN__) +-#ifdef __GNUC__ ++#if defined(__GNUC__) || defined(__ANDROID__) ++#undef __dead + #define __dead __attribute__((__noreturn__)) + #else + #define __dead diff --git a/packages/pick/src-pick.c.patch b/packages/pick/src-pick.c.patch new file mode 100644 index 000000000..ded332dd5 --- /dev/null +++ b/packages/pick/src-pick.c.patch @@ -0,0 +1,13 @@ +diff -u -r ../pick-1.3.0/src/pick.c ./src/pick.c +--- ../pick-1.3.0/src/pick.c 2016-02-12 03:48:41.000000000 -0500 ++++ ./src/pick.c 2016-02-17 22:50:26.050698229 -0500 +@@ -14,6 +14,9 @@ + #include + #include + ++/* For CTRL macro: */ ++#include ++ + #ifdef HAVE_NCURSESW_H + #include + #include