From 6f7a9d84980d1d8c3cf8e7cbdc51a6d06d01172d Mon Sep 17 00:00:00 2001 From: WizardHowl Date: Mon, 6 Feb 2023 08:18:30 +0000 Subject: [PATCH] Add support for readline 8.2 In readline 8.2 the type of rl_completer_word_break_characters changed to include const. Signed-off-by: WizardHowl --- 0003-Add-support-for-readline-8.2.patch | 36 +++++++++++++++++++++++++ gdb.spec | 6 ++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0003-Add-support-for-readline-8.2.patch diff --git a/0003-Add-support-for-readline-8.2.patch b/0003-Add-support-for-readline-8.2.patch new file mode 100644 index 0000000..e3e80d9 --- /dev/null +++ b/0003-Add-support-for-readline-8.2.patch @@ -0,0 +1,36 @@ +From 1add37b567a7dee39d99f37b37802034c3fce9c4 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Sun, 20 Mar 2022 14:01:54 +0100 +Subject: [PATCH] Add support for readline 8.2 + +In readline 8.2 the type of rl_completer_word_break_characters changed to +include const. +--- + gdb/completer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdb/completer.c b/gdb/completer.c +index d3900ae2014..a51c16ac7f8 100644 +--- a/gdb/completer.c ++++ b/gdb/completer.c +@@ -36,7 +36,7 @@ + calling a hook instead so we eliminate the CLI dependency. */ + #include "gdbcmd.h" + +-/* Needed for rl_completer_word_break_characters() and for ++/* Needed for rl_completer_word_break_characters and for + rl_filename_completion_function. */ + #include "readline/readline.h" + +@@ -2011,7 +2011,7 @@ gdb_completion_word_break_characters_throw () + rl_basic_quote_characters = NULL; + } + +- return rl_completer_word_break_characters; ++ return (char *) rl_completer_word_break_characters; + } + + char * +-- +2.33.0 + diff --git a/gdb.spec b/gdb.spec index 154912e..d49d858 100644 --- a/gdb.spec +++ b/gdb.spec @@ -1,6 +1,6 @@ Name: gdb Version: 12.1 -Release: 1 +Release: 2 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL-1.3 Source: https://ftp.gnu.org/gnu/gdb/gdb-%{version}.tar.xz @@ -87,6 +87,7 @@ Patch76: gdb-sw22395-constify-target_desc.patch # Fedra patch end Patch83: 0002-set-entry-point-when-text-segment-is-missing.patch +Patch84: 0003-Add-support-for-readline-8.2.patch %global gdb_src gdb-%{version} %global gdb_build build-%{_target_platform} @@ -362,6 +363,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/gdb/python/gdb/command/backtrace.py %{_infodir}/ctf-spec.info.gz %changelog +* Mon Feb 6 2023 Wenyu Liu - 12.1-2 +- Add support for readline 8.2 + * Fri Nov 18 2022 yaowenbin - 12.1-1 - upgrade GDB version to 12.1 -- Gitee