diff --git a/package/readline/0001-Fix-build-with-non-wchar-toolchains.patch b/package/readline/0001-Fix-build-with-non-wchar-toolchains.patch new file mode 100644 index 0000000000..2ec8c9c6a1 --- /dev/null +++ b/package/readline/0001-Fix-build-with-non-wchar-toolchains.patch @@ -0,0 +1,42 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 5 Jul 2025 07:48:20 +0200 +Subject: [PATCH] Fix build with non-wchar toolchains +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit a7f5650e6549e1b5c4e2e1fa30eee19de6bcbe7a added two functions to +mbutil.c but forgot to add defines for HANDLE_MULTIBYTE causing build +errors with toolchains without wchar support: + +../mbutil.c: In function ‘_rl_mb_strcaseeqn’: +../mbutil.c:594:3: error: unknown type name ‘mbstate_t’ + +Upstream: https://lists.gnu.org/archive/html/bug-readline/2025-07/msg00002.html + +Signed-off-by: Bernd Kuhls +--- + mbutil.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/mbutil.c b/mbutil.c +index 5243fd7..c15f3aa 100644 +--- a/mbutil.c ++++ b/mbutil.c +@@ -584,6 +584,7 @@ _rl_find_prev_mbchar (const char *string, int seed, int flags) + #endif + } + ++#if defined (HANDLE_MULTIBYTE) + /* Compare the first N characters of S1 and S2 without regard to case. If + FLAGS&1, apply the mapping specified by completion-map-case and make + `-' and `_' equivalent. Returns 1 if the strings are equal. */ +@@ -658,3 +659,4 @@ _rl_mb_charcasecmp (const char *s1, mbstate_t *ps1, const char *s2, mbstate_t *p + return 1; + return (wc1 == wc2); + } ++#endif /* HANDLE_MULTIBYTE */ +-- +2.39.5 + diff --git a/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch b/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch deleted file mode 100644 index c2c2d81260..0000000000 --- a/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b8d91eab12603fa88e095248855f5f772d182d05 Mon Sep 17 00:00:00 2001 -From: Chet Ramey -Date: Wed, 5 Oct 2022 10:41:16 -0400 -Subject: [PATCH] Readline-8.2 patch 1: fix crash when readline is started with - an invalid locale specification - -Upstream: https://git.savannah.gnu.org/cgit/readline.git/patch/?id=7274faabe97ce53d6b464272d7e6ab6c1392837b -[peter: stripped unrelated ._.gitignore change] -Signed-off-by: Peter Seiderer ---- - nls.c | 4 ++++ - patchlevel | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/nls.c b/nls.c -index 5c6a13b..8c027d6 100644 ---- a/nls.c -+++ b/nls.c -@@ -141,6 +141,10 @@ _rl_init_locale (void) - if (lspec == 0) - lspec = ""; - ret = setlocale (LC_CTYPE, lspec); /* ok, since it does not change locale */ -+ if (ret == 0 || *ret == 0) -+ ret = setlocale (LC_CTYPE, (char *)NULL); -+ if (ret == 0 || *ret == 0) -+ ret = RL_DEFAULT_LOCALE; - #else - ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec; - #endif -diff --git a/patchlevel b/patchlevel -index d8c9df7..fdf4740 100644 ---- a/patchlevel -+++ b/patchlevel -@@ -1,3 +1,3 @@ - # Do not edit -- exists only for use by patch - --0 -+1 --- -2.39.2 - diff --git a/package/readline/readline.hash b/package/readline/readline.hash index 627746d821..961ef77a0d 100644 --- a/package/readline/readline.hash +++ b/package/readline/readline.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature from -# https://ftp.gnu.org/gnu/readline/readline-8.2.tar.gz.sig -sha256 3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35 readline-8.2.tar.gz +# https://ftp.gnu.org/gnu/readline/readline-8.3.tar.gz.sig +sha256 fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc readline-8.3.tar.gz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/readline/readline.mk b/package/readline/readline.mk index 66812dee77..f46d6783f1 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -4,7 +4,7 @@ # ################################################################################ -READLINE_VERSION = 8.2 +READLINE_VERSION = 8.3 READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES READLINE_DEPENDENCIES = ncurses host-autoconf