diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2024-05-03 16:24:09 +0300 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2024-05-03 16:24:09 +0300 |
| commit | 69166dbbb709625a848f327c9822c667db39744f (patch) | |
| tree | 843a4a342561fe20ce61e611140e1d8d10570f7a /utils | |
| parent | c0608d93befc062e33fb7dc2adbb70abe262c8cf (diff) | |
nano: update to 8.0
Update nano editor to version 8.0
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/nano/Makefile | 6 | ||||
| -rw-r--r-- | utils/nano/patches/0001-post80-fix-minibar-do-not-falsely-report.patch | 27 |
2 files changed, 30 insertions, 3 deletions
diff --git a/utils/nano/Makefile b/utils/nano/Makefile index 064a25e3d..e54a72242 100644 --- a/utils/nano/Makefile +++ b/utils/nano/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nano -PKG_VERSION:=7.2 -PKG_RELEASE:=4 +PKG_VERSION:=8.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/nano -PKG_HASH:=86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526 +PKG_HASH:=c17f43fc0e37336b33ee50a209c701d5beb808adc2d9f089ca831b40539c9ac4 PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING diff --git a/utils/nano/patches/0001-post80-fix-minibar-do-not-falsely-report.patch b/utils/nano/patches/0001-post80-fix-minibar-do-not-falsely-report.patch new file mode 100644 index 000000000..d85720d3e --- /dev/null +++ b/utils/nano/patches/0001-post80-fix-minibar-do-not-falsely-report.patch @@ -0,0 +1,27 @@ +From e9c7dfa99221935ffa38b5b9dbf294933e0aa7c0 Mon Sep 17 00:00:00 2001 +From: Benno Schulenberg <bensberg@telfort.nl> +Date: Fri, 3 May 2024 12:12:09 +0200 +Subject: minibar: do not falsely report that a new, empty file is in Mac + format + +The 'openfile->fmt' element gets initialized to 'UNSPECIFIED', +so the code has to take that possibility into account. + +This fixes https://savannah.gnu.org/bugs/?65676. + +Bug existed since version 8.0, commit fe4f74f6. +--- + src/winio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/winio.c ++++ b/src/winio.c +@@ -2213,7 +2213,7 @@ void minibar(void) + size_t count = openfile->filebot->lineno - (openfile->filebot->data[0] == '\0'); + + number_of_lines = nmalloc(49); +- if (openfile->fmt == NIX_FILE) ++ if (openfile->fmt == NIX_FILE || openfile->fmt == UNSPECIFIED) + sprintf(number_of_lines, P_(" (%zu line)", " (%zu lines)", count), count); + else + sprintf(number_of_lines, P_(" (%zu line, %s)", " (%zu lines, %s)", count), |