- updated to 6.1.1, updated info patch

[packages/gdb.git] / gdb-ncurses.patch

diff --git a/gdb-ncurses.patch b/gdb-ncurses.patch
index f38218fb83acdd0facb778c9b73733c7b4796a64..13a099978fb5a80deb9c4c8741a3014a8b0aeece 100644 (file)
--- a/gdb-ncurses.patch
+++ b/gdb-ncurses.patch
@@ -1,7 +1,6 @@
-diff -ur gdb-5.1.orig/gdb/config.in gdb-5.1/gdb/config.in
---- gdb-5.1.orig/gdb/config.in Mon Jul 23 21:21:51 2001
-+++ gdb-5.1/gdb/config.in      Wed Jan 23 00:13:15 2002
-@@ -292,6 +292,9 @@
+--- gdb-6.1/gdb/config.in.orig 2004-01-20 10:29:13.000000000 +0100
++++ gdb-6.1/gdb/config.in      2004-04-17 21:21:46.919318064 +0200
+@@ -293,6 +293,9 @@
  /* Define if you have the <ncurses.h> header file.  */
  #undef HAVE_NCURSES_H
  
@@ -11,21 +10,19 @@ diff -ur gdb-5.1.orig/gdb/config.in gdb-5.1/gdb/config.in
  /* Define if you have the <ndir.h> header file.  */
  #undef HAVE_NDIR_H
  
-diff -ur gdb-5.1.orig/gdb/configure.in gdb-5.1/gdb/configure.in
---- gdb-5.1.orig/gdb/configure.in      Thu Aug  2 23:30:22 2001
-+++ gdb-5.1/gdb/configure.in   Wed Jan 23 00:12:08 2002
-@@ -125,7 +125,7 @@
-       wchar.h wctype.h asm/debugreg.h sys/debugreg.h sys/select.h \
-       time.h sys/file.h sys/ioctl.h sys/user.h sys/fault.h sys/syscall.h \
-       dirent.h sys/ndir.h sys/dir.h ndir.h \
--      curses.h ncurses.h \
-+      curses.h ncurses.h ncurses/ncurses.h \
-       poll.h sys/poll.h)
- AC_HEADER_STAT
+--- gdb-6.1/gdb/configure.in.orig      2004-02-26 01:41:46.000000000 +0100
++++ gdb-6.1/gdb/configure.in   2004-04-17 21:21:46.922317608 +0200
+@@ -374,7 +374,7 @@
+    Solaris 2.[78] when using GCC. ]])
+     fi ;;
+ esac
+-AC_CHECK_HEADERS(curses.h ncurses.h term.h)
++AC_CHECK_HEADERS(curses.h ncurses.h ncurses/ncurses.h term.h)
  
-diff -ur gdb-5.1.orig/gdb/tui/tuiData.h gdb-5.1/gdb/tui/tuiData.h
---- gdb-5.1.orig/gdb/tui/tuiData.h     Mon Jul 23 23:16:20 2001
-+++ gdb-5.1/gdb/tui/tuiData.h  Wed Jan 23 00:11:53 2002
+ # FIXME: kettenis/20030102: In most cases we include these
+ # unconditionally, so what's the point in checking these?
+--- gdb-6.1/gdb/gdb_curses.h.orig      2004-02-10 21:03:44.000000000 +0100
++++ gdb-6.1/gdb/gdb_curses.h   2004-04-17 21:35:43.552130544 +0200
 @@ -24,6 +24,8 @@
  
  #if defined (HAVE_NCURSES_H)
@@ -35,22 +32,16 @@ diff -ur gdb-5.1.orig/gdb/tui/tuiData.h gdb-5.1/gdb/tui/tuiData.h
  #elif defined (HAVE_CURSES_H)
  #include <curses.h>
  #endif
-diff -ur gdb-5.1.orig/gdb/utils.c gdb-5.1/gdb/utils.c
---- gdb-5.1.orig/gdb/utils.c   Wed Jan 23 00:01:31 2002
-+++ gdb-5.1/gdb/utils.c        Wed Jan 23 00:15:07 2002
-@@ -26,9 +26,14 @@
- #include "gdb_string.h"
- #include "event-top.h"
+--- gdb-6.1/gdb/utils.c.orig   2004-02-28 19:04:37.000000000 +0100
++++ gdb-6.1/gdb/utils.c        2004-04-17 21:36:26.623582688 +0200
+@@ -56,9 +56,7 @@
+ 
+ #include <sys/param.h>                /* For MAXPATHLEN */
  
 -#ifdef HAVE_CURSES_H
-+#if defined (HAVE_NCURSES_H)
-+#include <ncurses.h>
-+#elif defined (HAVE_NCURSES_NCURSES_H)
-+#include <ncurses/ncurses.h>
-+#elif defined (HAVE_CURSES_H)
- #include <curses.h>
- #endif
-+
+-#include <curses.h>
+-#endif
++#include "gdb_curses.h"
  #ifdef HAVE_TERM_H
  #include <term.h>
  #endif