From a3438efc4aaf9c5f42f254ea25f54d622fd8f7d4 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Fri, 15 Sep 2017 20:19:02 +0300 Subject: [PATCH] nano: update to 2.8.7 Update nano editor to 2.8.7 Apply post-release fix from upstream to enable compilation with --enable-tiny Signed-off-by: Hannu Nyman --- utils/nano/Makefile | 4 +- ...ort-post287-fix-for-tiny-compilation.patch | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 utils/nano/patches/001-backport-post287-fix-for-tiny-compilation.patch diff --git a/utils/nano/Makefile b/utils/nano/Makefile index 29a9ab5480..a08a540361 100644 --- a/utils/nano/Makefile +++ b/utils/nano/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nano -PKG_VERSION:=2.8.6 +PKG_VERSION:=2.8.7 PKG_RELEASE:=1 PKG_LICENSE:=GPL-3.0+ PKG_LICENSE_FILES:=COPYING PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/nano -PKG_HASH:=9a46962a3ae59db922467a095217ed23280b42d80640f932f3a59ba2a6a85776 +PKG_HASH:=fbe31746958698d73c6726ee48ad8b0612697157961a2e9aaa83b4aa53d1165a PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 diff --git a/utils/nano/patches/001-backport-post287-fix-for-tiny-compilation.patch b/utils/nano/patches/001-backport-post287-fix-for-tiny-compilation.patch new file mode 100644 index 0000000000..ef8d749101 --- /dev/null +++ b/utils/nano/patches/001-backport-post287-fix-for-tiny-compilation.patch @@ -0,0 +1,38 @@ +From 28cfab7580c42a6d6c9c5d787ce736094fd51a0c Mon Sep 17 00:00:00 2001 +From: Benno Schulenberg +Date: Tue, 29 Aug 2017 19:28:44 +0200 +Subject: tweaks: fix compilation when configured with --enable-tiny + +When moving the cursor to the top-left corner, it is not necessary +to compute leftedge because firstcolumn IS the relevant leftedge. + +Reported-by: Jordi Mallach +--- + src/move.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/move.c b/src/move.c +index d138356..ce276e4 100644 +--- a/src/move.c ++++ b/src/move.c +@@ -121,7 +121,7 @@ void do_page_up(void) + openfile->current = openfile->edittop; + openfile->current_y = 0; + +- leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop); ++ leftedge = openfile->firstcolumn; + target_column = 0; + } else + get_edge_and_target(&leftedge, &target_column); +@@ -152,7 +152,7 @@ void do_page_down(void) + openfile->current = openfile->edittop; + openfile->current_y = 0; + +- leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop); ++ leftedge = openfile->firstcolumn; + target_column = 0; + } else + get_edge_and_target(&leftedge, &target_column); +-- +cgit v1.0-41-gc330 + -- 2.30.2