From 8f73afe6602e0ebdb2a0350530d6318e0fbb3812 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Thu, 17 Nov 2022 18:17:29 +0200 Subject: [PATCH] nano: update to 7.0 Update nano to version 7.0. Add a patch to fix the plus variant. Upstream discussion and patch in https://savannah.gnu.org/bugs/?63372 Signed-off-by: Hannu Nyman (cherry picked from commit 4a89a577a71adffc6cbad99971b4c064193b3566) --- utils/nano/Makefile | 4 ++-- .../patches/100-post-7.0-fix-commenting.patch | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 utils/nano/patches/100-post-7.0-fix-commenting.patch diff --git a/utils/nano/Makefile b/utils/nano/Makefile index aaec7f65a2..f9f9575d42 100644 --- a/utils/nano/Makefile +++ b/utils/nano/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nano -PKG_VERSION:=6.4 +PKG_VERSION:=7.0 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/nano -PKG_HASH:=4199ae8ca78a7796de56de1a41b821dc47912c0307e9816b56cc317df34661c0 +PKG_HASH:=8dd6eac38b2b8786d82681f0e1afd84f6b75210d17391b6443c437e451552149 PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING diff --git a/utils/nano/patches/100-post-7.0-fix-commenting.patch b/utils/nano/patches/100-post-7.0-fix-commenting.patch new file mode 100644 index 0000000000..a0fb94f62f --- /dev/null +++ b/utils/nano/patches/100-post-7.0-fix-commenting.patch @@ -0,0 +1,18 @@ +--- a/src/nano.c ++++ b/src/nano.c +@@ -1395,11 +1395,14 @@ bool changes_something(const void *f) + #ifndef NANO_TINY + f == chop_previous_word || f == chop_next_word || + f == zap_text || f == cut_till_eof || f == do_execute || +- f == do_indent || f == do_unindent || f == do_comment || ++ f == do_indent || f == do_unindent || + #endif + #ifdef ENABLE_JUSTIFY + f == do_justify || f == do_full_justify || + #endif ++#ifdef ENABLE_COMMENT ++ f == do_comment || ++#endif + #ifdef ENABLE_SPELLER + f == do_spell || + #endif -- 2.30.2