From 1c47ee16db03e8b531ce5c5a2de160d278a947c1 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Wed, 16 Nov 2022 10:52:16 -0800 Subject: [PATCH] Add readline 8.2 support --- _gdb.spec.Patch.include | 3 +++ _gdb.spec.patch.include | 1 + _patch_order | 1 + gdb-backport-readline_support.patch | 31 +++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+) create mode 100644 gdb-backport-readline_support.patch diff --git a/_gdb.spec.Patch.include b/_gdb.spec.Patch.include index e22e9de..bf0e73e 100644 --- a/_gdb.spec.Patch.include +++ b/_gdb.spec.Patch.include @@ -310,3 +310,6 @@ Patch073: gdb-rhbz1398387-tab-crash-test.patch # =fedoratest Patch074: gdb-rhbz1553104-s390x-arch12-test.patch + +Patch075: gdb-backport-readline_support.patch + diff --git a/_gdb.spec.patch.include b/_gdb.spec.patch.include index affe771..f5bd893 100644 --- a/_gdb.spec.patch.include +++ b/_gdb.spec.patch.include @@ -72,3 +72,4 @@ %patch072 -p1 %patch073 -p1 %patch074 -p1 +%patch075 -p1 diff --git a/_patch_order b/_patch_order index e972e1b..9442472 100644 --- a/_patch_order +++ b/_patch_order @@ -72,3 +72,4 @@ gdb-linux_perf-bundle.patch gdb-libexec-add-index.patch gdb-rhbz1398387-tab-crash-test.patch gdb-rhbz1553104-s390x-arch12-test.patch +gdb-backport-readline_support.patch diff --git a/gdb-backport-readline_support.patch b/gdb-backport-readline_support.patch new file mode 100644 index 0000000..89f381b --- /dev/null +++ b/gdb-backport-readline_support.patch @@ -0,0 +1,31 @@ +From FEDORA_PATCHES Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= +Date: Mon, 10 Oct 2022 15:44:52 +0200 +Subject: gdb-backport-readline_support.patch + +Add support for readline 8.2 + +In readline 8.2 the type of rl_completer_word_break_characters changed to +include const. + +diff --git a/gdb/completer.c b/gdb/completer.c +--- 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 *