gpsd-ncurses.patch

   1 diff -ur gpsd-2.39/cgps.c gpsd-2.39.new/cgps.c
   2 --- gpsd-2.39/cgps.c    2009-03-18 17:44:54.000000000 +0100
   3 +++ gpsd-2.39.new/cgps.c        2009-06-08 13:39:54.140175509 +0200
   4 @@ -98,11 +98,7 @@
   5  #include <signal.h>
   6
   7  #include "gpsd_config.h"
   8 -#ifdef HAVE_NCURSES_H
   9 -#include <ncurses.h>
  10 -#else
  11 -#include <curses.h>
  12 -#endif /* HAVE_NCURSES_H */
  13 +#include <ncurses/ncurses.h>
  14
  15  #include "gps.h"
  16  #include "gpsdclient.h"
  17 Tylko w gpsd-2.39.new/: cgps.c~
  18 diff -ur gpsd-2.39/configure.ac gpsd-2.39.new/configure.ac
  19 --- gpsd-2.39/configure.ac      2009-03-18 22:09:27.000000000 +0100
  20 +++ gpsd-2.39.new/configure.ac  2009-06-08 13:40:34.023615525 +0200
  21 @@ -327,7 +327,7 @@
  22  dnl TODO: give an example of what system uses curses.h with
  23  dnl libncurses.  We define our own variables to reduce the risk of
  24  dnl breaking if autoconf changes (private) variable names.
  25 -AC_CHECK_HEADERS(ncurses.h)
  26 +AC_CHECK_HEADERS(ncurses/ncurses.h)
  27  AC_CHECK_LIB(ncurses, initscr, NCURSES_LIBS="-lncurses")
  28  AC_SUBST(NCURSES_LIBS)
  29  if test x"$NCURSES_LIBS" = x"" ; then
  30 Tylko w gpsd-2.39.new/: configure.ac~
  31 diff -ur gpsd-2.39/gpsmon.c gpsd-2.39.new/gpsmon.c
  32 --- gpsd-2.39/gpsmon.c  2009-03-18 18:37:56.000000000 +0100
  33 +++ gpsd-2.39.new/gpsmon.c      2009-06-08 13:42:31.817981645 +0200
  34 @@ -27,11 +27,7 @@
  35  #include <sys/ioctl.h> /* for O_RDWR */
  36
  37  #include "gpsd_config.h"
  38 -#ifdef HAVE_NCURSES_H
  39 -#include <ncurses.h>
  40 -#else
  41 -#include <curses.h>
  42 -#endif /* HAVE_NCURSES_H */
  43 +#include <ncurses/ncurses.h>
  44  #include "gpsd.h"
  45
  46  #include "bits.h"
  47 Tylko w gpsd-2.39.new/: gpsmon.c~
  48 diff -ur gpsd-2.39/monitor_italk.c gpsd-2.39.new/monitor_italk.c
  49 --- gpsd-2.39/monitor_italk.c   2009-03-06 21:15:24.000000000 +0100
  50 +++ gpsd-2.39.new/monitor_italk.c       2009-06-08 13:42:26.533324558 +0200
  51 @@ -12,11 +12,7 @@
  52  #include <assert.h>
  53
  54  #include "gpsd_config.h"
  55 -#ifdef HAVE_NCURSES_H
  56 -#include <ncurses.h>
  57 -#else
  58 -#include <curses.h>
  59 -#endif /* HAVE_NCURSES_H */
  60 +#include <ncurses/ncurses.h>
  61  #include "gpsd.h"
  62
  63  #include "bits.h"
  64 Tylko w gpsd-2.39.new/: monitor_italk.c~
  65 diff -ur gpsd-2.39/monitor_nmea.c gpsd-2.39.new/monitor_nmea.c
  66 --- gpsd-2.39/monitor_nmea.c    2009-03-06 15:53:41.000000000 +0100
  67 +++ gpsd-2.39.new/monitor_nmea.c        2009-06-08 13:42:46.875150797 +0200
  68 @@ -18,11 +18,7 @@
  69  #include <assert.h>
  70
  71  #include "gpsd_config.h"
  72 -#ifdef HAVE_NCURSES_H
  73 -#include <ncurses.h>
  74 -#else
  75 -#include <curses.h>
  76 -#endif /* HAVE_NCURSES_H */
  77 +#include <ncurses/ncurses.h>
  78  #include "gpsd.h"
  79
  80  #include "bits.h"
  81 Tylko w gpsd-2.39.new/: monitor_nmea.c~
  82 diff -ur gpsd-2.39/monitor_proto.c gpsd-2.39.new/monitor_proto.c
  83 --- gpsd-2.39/monitor_proto.c   2009-03-03 14:17:16.000000000 +0100
  84 +++ gpsd-2.39.new/monitor_proto.c       2009-06-08 13:43:01.449954577 +0200
  85 @@ -15,11 +15,7 @@
  86  #include <assert.h>
  87
  88  #include "gpsd_config.h"
  89 -#ifdef HAVE_NCURSES_H
  90 -#include <ncurses.h>
  91 -#else
  92 -#include <curses.h>
  93 -#endif /* HAVE_NCURSES_H */
  94 +#include <ncurses/ncurses.h>
  95  #include "gpsd.h"
  96
  97  #include "bits.h"
  98 Tylko w gpsd-2.39.new/: monitor_proto.c~
  99 diff -ur gpsd-2.39/monitor_sirf.c gpsd-2.39.new/monitor_sirf.c
 100 --- gpsd-2.39/monitor_sirf.c    2009-03-06 15:53:41.000000000 +0100
 101 +++ gpsd-2.39.new/monitor_sirf.c        2009-06-08 13:43:14.793316927 +0200
 102 @@ -16,11 +16,7 @@
 103  #include <assert.h>
 104
 105  #include "gpsd_config.h"
 106 -#ifdef HAVE_NCURSES_H
 107 -#include <ncurses.h>
 108 -#else
 109 -#include <curses.h>
 110 -#endif /* HAVE_NCURSES_H */
 111 +#include <ncurses/ncurses.h>
 112  #include "gpsd.h"
 113
 114  #include "bits.h"
 115 Tylko w gpsd-2.39.new/: monitor_sirf.c~
 116 diff -ur gpsd-2.39/monitor_superstar2.c gpsd-2.39.new/monitor_superstar2.c
 117 --- gpsd-2.39/monitor_superstar2.c      2009-03-06 21:15:24.000000000 +0100
 118 +++ gpsd-2.39.new/monitor_superstar2.c  2009-06-08 13:43:29.506723380 +0200
 119 @@ -12,11 +12,7 @@
 120  #include <assert.h>
 121
 122  #include "gpsd_config.h"
 123 -#ifdef HAVE_NCURSES_H
 124 -#include <ncurses.h>
 125 -#else
 126 -#include <curses.h>
 127 -#endif /* HAVE_NCURSES_H */
 128 +#include <ncurses/ncurses.h>
 129  #include "gpsd.h"
 130
 131  #include "bits.h"
 132 Tylko w gpsd-2.39.new/: monitor_superstar2.c~
 133 diff -ur gpsd-2.39/monitor_ubx.c gpsd-2.39.new/monitor_ubx.c
 134 --- gpsd-2.39/monitor_ubx.c     2009-03-12 13:52:21.000000000 +0100
 135 +++ gpsd-2.39.new/monitor_ubx.c 2009-06-08 13:43:41.975022652 +0200
 136 @@ -12,11 +12,7 @@
 137  #include <assert.h>
 138
 139  #include "gpsd_config.h"
 140 -#ifdef HAVE_NCURSES_H
 141 -#include <ncurses.h>
 142 -#else
 143 -#include <curses.h>
 144 -#endif /* HAVE_NCURSES_H */
 145 +#include <ncurses/ncurses.h>
 146  #include "gpsd.h"
 147
 148  #include "bits.h"
 149 Tylko w gpsd-2.39.new/: monitor_ubx.c~