summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois Perrad <fperrad@gmail.com>2013-02-19 22:29:00 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-02-22 22:27:10 (GMT)
commit4992307bd1d76ef7fd88978896675d57fa62e663 (patch)
treedadb2fd10efa4d3b39a55131610ff56846098bba
parent4bf3c452a507d4997f869875e4fd412a3af1a5cd (diff)
downloadbuildroot-4992307bd1d76ef7fd88978896675d57fa62e663.tar.gz
buildroot-4992307bd1d76ef7fd88978896675d57fa62e663.tar.bz2
linenoise: patch was merged on upstream
Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/linenoise/linenoise-get-columns.patch20
-rw-r--r--package/linenoise/linenoise.mk2
2 files changed, 1 insertions, 21 deletions
diff --git a/package/linenoise/linenoise-get-columns.patch b/package/linenoise/linenoise-get-columns.patch
deleted file mode 100644
index 4fb9e40..0000000
--- a/package/linenoise/linenoise-get-columns.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-returns the default value (80) when a real value is not available
-(0 is not an acceptable value for COLUMNS, the width of the screen).
-
-see pull request on upstream : http://github.com/antirez/linenoise/pull/31
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/linenoise.c
-===================================================================
---- a/linenoise.c
-+++ b/linenoise.c
-@@ -182,7 +182,7 @@
- static int getColumns(void) {
- struct winsize ws;
-
-- if (ioctl(1, TIOCGWINSZ, &ws) == -1) return 80;
-+ if (ioctl(1, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) return 80;
- return ws.ws_col;
- }
-
diff --git a/package/linenoise/linenoise.mk b/package/linenoise/linenoise.mk
index 343a107..fb73960 100644
--- a/package/linenoise/linenoise.mk
+++ b/package/linenoise/linenoise.mk
@@ -3,7 +3,7 @@
# linenoise
#
#############################################################
-LINENOISE_VERSION = g8c9b481
+LINENOISE_VERSION = g27a3b4d
LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/master
LINENOISE_LICENSE = BSD-2c
LINENOISE_INSTALL_STAGING = YES