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..d8b6777 --- /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: Tue, 13 Dec 2022 10:34:42 +0100 +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 * diff --git a/gdb.spec b/gdb.spec index 80610de..984fbd9 100644 --- a/gdb.spec +++ b/gdb.spec @@ -37,7 +37,7 @@ Version: 12.1 # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 2%{?dist} +Release: 3%{?dist} 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 # Do not provide URL for snapshots as the file lasts there only for 2 days. @@ -1146,6 +1146,9 @@ fi %endif %changelog +* Tue Dec 13 2022 Alexandra Hájková - 12.1-3 +- Backport upstream patch "Add support for readline 8.2". (Andreas Schwab) + * Wed Oct 5 2022 Alexandra Hájková - 12.1-2 - Update gdb-6.6-buildid-locate.patch to fix RHBZ 2122947.