From 4992307bd1d76ef7fd88978896675d57fa62e663 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 19 Feb 2013 22:29:00 +0000 Subject: linenoise: patch was merged on upstream Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/linenoise/linenoise-get-columns.patch | 20 -------------------- package/linenoise/linenoise.mk | 2 +- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 package/linenoise/linenoise-get-columns.patch (limited to 'package') diff --git a/package/linenoise/linenoise-get-columns.patch b/package/linenoise/linenoise-get-columns.patch deleted file mode 100644 index 4fb9e4085..000000000 --- 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 - -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 343a10756..fb739602a 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 -- cgit v1.2.3