Nano: Update to 2.6.3, backport patch from trunk to fix compile 3075/head
authorJonathan Bennett <jbennett@incomsystems.biz>
Wed, 17 Aug 2016 04:11:30 +0000 (23:11 -0500)
committerJonathan Bennett <jbennett@incomsystems.biz>
Wed, 17 Aug 2016 15:18:35 +0000 (10:18 -0500)
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
utils/nano/Makefile
utils/nano/patches/010-fix-enable-tiny [new file with mode: 0644]

index 0c4cfacdf08e3e9c4add0e0644323ef3b9a9dde3..d3492a931c168ed7bffa8e57ebc90efd94923903 100644 (file)
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nano
-PKG_VERSION:=2.6.0
+PKG_VERSION:=2.6.3
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0+
 PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.nano-editor.org/dist/v2.6/
-PKG_MD5SUM:=89051965a1de963190696348bc291b86
+PKG_MD5SUM:=1213c7f17916e65afefc95054c1f90f9
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
diff --git a/utils/nano/patches/010-fix-enable-tiny b/utils/nano/patches/010-fix-enable-tiny
new file mode 100644 (file)
index 0000000..ec3211d
--- /dev/null
@@ -0,0 +1,18 @@
+--- nano-2.6.3/src/winio.c     2016-08-10 04:22:23.000000000 -0500
++++ nano-2.6.3.new/src/winio.c 2016-08-17 00:58:35.663135848 -0500
+@@ -502,7 +502,6 @@
+       return sc_seq_or(do_prev_block, 0);
+     else if (retval == controldown)
+       return sc_seq_or(do_next_block, 0);
+-#endif
+     /* When not running under X, check for the bare arrow keys whether
+      * the Ctrl key is being held together with them. */
+@@ -521,6 +520,7 @@
+               return sc_seq_or(do_next_word_void, 0);
+       }
+     }
++#endif
+     switch (retval) {
+ #ifdef KEY_SLEFT