packages: gdb/gdb-readline.patch, gdb/gdb.spec - readline_echoing_p/_rl_ech...

[glen]

Author: glen                         Date: Mon Dec 14 21:36:46 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- readline_echoing_p/_rl_echoing_p handled by gdb-readline-6.0.patch

---- Files affected:
packages/gdb:
   gdb-readline.patch (1.16 -> 1.17) , gdb.spec (1.124 -> 1.125) 

---- Diffs:

================================================================
Index: packages/gdb/gdb-readline.patch
diff -u packages/gdb/gdb-readline.patch:1.16 packages/gdb/gdb-readline.patch:1.17
--- packages/gdb/gdb-readline.patch:1.16	Tue Feb 24 09:23:58 2009
+++ packages/gdb/gdb-readline.patch	Mon Dec 14 22:36:40 2009
@@ -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 @@
  	$(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 @@
  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.  */

================================================================
Index: packages/gdb/gdb.spec
diff -u packages/gdb/gdb.spec:1.124 packages/gdb/gdb.spec:1.125
--- packages/gdb/gdb.spec:1.124	Wed Dec  9 08:37:56 2009
+++ packages/gdb/gdb.spec	Mon Dec 14 22:36:40 2009
@@ -164,7 +164,7 @@
 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
@@ -552,6 +552,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.125  2009/12/14 21:36:40  glen
+- readline_echoing_p/_rl_echoing_p handled by gdb-readline-6.0.patch
+
 Revision 1.124  2009/12/09 07:37:56  glen
 - integer release
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdb/gdb-readline.patch?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdb/gdb.spec?r1=1.124&r2=1.125&f=u