- readline_echoing_p/_rl_echoing_p handled by gdb-readline-6.0.patch

Changed files:
    gdb-readline.patch -> 1.17
    gdb.spec -> 1.125

diff --git a/gdb-readline.patch b/gdb-readline.patch
index 4022b63e343a37575c534bcc6418ab3eb46d5326..952e4472f8f115e66a88f99a7b7d24a5794f14dc 100644 (file)
--- a/gdb-readline.patch
+++ b/gdb-readline.patch
@@ -1,4 +1,3 @@
-diff -ur gdb-6.7.org/gdb/Makefile.in gdb-6.7/gdb/Makefile.in
 --- gdb-6.7.org/gdb/Makefile.in        2007-09-05 02:14:02.000000000 +0200
 +++ gdb-6.7/gdb/Makefile.in    2007-10-10 21:11:18.119976680 +0200
 @@ -126,11 +126,11 @@
@@ -27,7 +26,6 @@ diff -ur gdb-6.7.org/gdb/Makefile.in gdb-6.7/gdb/Makefile.in
        $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU)
  
  ADD_FILES = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
-diff -ur gdb-6.7.org/Makefile.in gdb-6.7/Makefile.in
 --- gdb-6.7.org/Makefile.in    2007-10-10 19:09:32.000000000 +0200
 +++ gdb-6.7/Makefile.in        2007-10-10 21:10:23.310556251 +0200
 @@ -664,7 +664,6 @@
@@ -174,38 +172,3 @@ diff -ur gdb-6.7.org/Makefile.in gdb-6.7/Makefile.in
  all-sim: maybe-configure-gdb
  all-fastjar: maybe-all-zlib
  all-fastjar: maybe-all-build-texinfo
---- gdb-6.8.50.20090224/gdb/tui/tui-io.c~      2009-02-24 09:17:18.617891690 +0100
-+++ gdb-6.8.50.20090224/gdb/tui/tui-io.c       2009-02-24 09:17:43.554606911 +0100
-@@ -512,7 +512,7 @@
- void
- tui_setup_io (int mode)
- {
--  extern int readline_echoing_p;
-+  extern int _rl_echoing_p;
-  
-   if (mode)
-     {
-@@ -522,12 +522,12 @@
-       tui_old_rl_prep_terminal = rl_prep_term_function;
-       tui_old_rl_getc_function = rl_getc_function;
-       tui_old_rl_outstream = rl_outstream;
--      tui_old_readline_echoing_p = readline_echoing_p;
-+      tui_old_readline_echoing_p = _rl_echoing_p;
-       rl_redisplay_function = tui_redisplay_readline;
-       rl_deprep_term_function = tui_deprep_terminal;
-       rl_prep_term_function = tui_prep_terminal;
-       rl_getc_function = tui_getc;
--      readline_echoing_p = 0;
-+      _rl_echoing_p = 0;
-       rl_outstream = tui_rl_outstream;
-       rl_prompt = 0;
-       rl_completion_display_matches_hook = tui_rl_display_match_list;
-@@ -564,7 +564,7 @@
-       rl_getc_function = tui_old_rl_getc_function;
-       rl_outstream = tui_old_rl_outstream;
-       rl_completion_display_matches_hook = 0;
--      readline_echoing_p = tui_old_readline_echoing_p;
-+      _rl_echoing_p = tui_old_readline_echoing_p;
-       rl_already_prompted = 0;
- 
-       /* Save tty for SIGCONT.  */

diff --git a/gdb.spec b/gdb.spec
index 727288f64e4b765c1c4a8b7f35d6e0be69a2abaf..b1cb132517a819f00e9f449ee59c3ae361a1a6aa 100644 (file)
--- a/gdb.spec
+++ b/gdb.spec
@@ -163,7 +163,7 @@ BuildRequires:      flex
 BuildRequires: libtool
 BuildRequires: ncurses-devel >= 5.2
 BuildRequires: pkgconfig
-BuildRequires: readline-devel >= 6.0
+BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.219
 BuildRequires: texinfo >= 4.4
 BuildRequires: zlib-devel