From c834959acdcd67fe569ca9d1f880c7f113329a69205036446ce3edce055290d8 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 29 Sep 2022 08:55:28 +0000 Subject: [PATCH] Accepting request 1006858 from home:favogt:branches:devel:gcc - Add patch to fix build with readline 8.2: * gdb-add-support-for-readline-8.2.patch OBS-URL: https://build.opensuse.org/request/show/1006858 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=335 --- gdb-add-support-for-readline-8.2.patch | 36 ++++++++++++++++++++++++++ gdb.changes | 6 +++++ gdb.spec | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 gdb-add-support-for-readline-8.2.patch diff --git a/gdb-add-support-for-readline-8.2.patch b/gdb-add-support-for-readline-8.2.patch new file mode 100644 index 0000000..e87c714 --- /dev/null +++ b/gdb-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.31.1 + diff --git a/gdb.changes b/gdb.changes index 2aabaf1..1a46486 100644 --- a/gdb.changes +++ b/gdb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 29 08:25:06 UTC 2022 - Fabian Vogt + +- Add patch to fix build with readline 8.2: + * gdb-add-support-for-readline-8.2.patch + ------------------------------------------------------------------- Wed Sep 28 11:50:45 UTC 2022 - Tom de Vries diff --git a/gdb.spec b/gdb.spec index 48d9328..508ee46 100644 --- a/gdb.spec +++ b/gdb.spec @@ -346,6 +346,7 @@ Patch2031: gdb-symtab-fix-handling-of-dw_tag_unspecified_type.patch Patch2032: gdb-handle-pending-c-after-rl_callback_read_char.patch Patch2033: gdb-testsuite-fix-have_mpx-test.patch Patch2034: gdb-testsuite-fix-gdb.dwarf2-dw2-unspecified-type-foo.c-with-m32.patch +Patch2035: gdb-add-support-for-readline-8.2.patch # Backports from master, not yet available in next release. @@ -781,6 +782,7 @@ find -name "*.info*"|xargs rm -f %patch2032 -p1 %patch2033 -p1 %patch2034 -p1 +%patch2035 -p1 %patch2100 -p1 %patch2101 -p1