brscan-fixes.patch

   1 diff -ur brscan-src-0.2.3-o/brscan/backend_src/brother_advini.c brscan-src-0.2.3/brscan/backend_src/brother_advini.c
   2 --- brscan-src-0.2.3-o/brscan/backend_src/brother_advini.c      2006-03-03 01:51:55.000000000 -0700
   3 +++ brscan-src-0.2.3/brscan/backend_src/brother_advini.c        2007-06-08 15:10:32.000000000 -0600
   4 @@ -24,7 +24,7 @@
   5  #include <stdlib.h>
   6  #include <sys/types.h>
   7  #include <dirent.h>
   8 -#include <curses.h>
   9 +#include <ncurses/curses.h>
  10  #include <unistd.h>
  11
  12  #include "brother_advini.h"
  13 diff -ur brscan-src-0.2.3-o/brscan/configure.in brscan-src-0.2.3/brscan/configure.in
  14 --- brscan-src-0.2.3-o/brscan/configure.in      2006-06-30 00:30:24.000000000 -0600
  15 +++ brscan-src-0.2.3/brscan/configure.in        2007-06-08 15:10:32.000000000 -0600
  16 @@ -40,64 +40,6 @@
  17  AC_ISC_POSIX
  18  AM_PROG_CC_STDC
  19
  20 -INCLUDES="${INCLUDES} -I/usr/local/include"
  21 -CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
  22 -
  23 -if test "${ac_cv_prog_gcc}" = "yes"; then
  24 -  NORMAL_CFLAGS="\
  25 -      -W \
  26 -      -Wall"
  27 -  WARN_CFLAGS="\
  28 -      -W \
  29 -      -Wall \
  30 -      -Wcast-align \
  31 -      -Wcast-qual \
  32 -      -Wmissing-declarations \
  33 -      -Wmissing-prototypes \
  34 -      -Wpointer-arith \
  35 -      -Wreturn-type \
  36 -      -Wstrict-prototypes \
  37 -      -pedantic"
  38 -
  39 -  dnl OS/2 and others don't include some headers with -ansi enabled
  40 -  ANSI_FLAG=-ansi
  41 -  AC_CHECK_HEADER(os2.h,[ANSI_FLAG=],)
  42 -  case "${host_os}" in
  43 -    solaris*)
  44 -      ANSI_FLAG=
  45 -      ;;
  46 -  esac
  47 -  WARN_CFLAGS="${WARN_CFLAGS} ${ANSI_FLAG}"
  48 -
  49 -  # Warnings enabled by default (development)
  50 -  AC_ARG_ENABLE(warnings,
  51 -    [  --enable-warnings       turn on tons of compiler warnings (GCC only)
  52 -                          [default=yes]],
  53 -    [
  54 -      if eval "test x$enable_warnings = xyes"; then
  55 -        for flag in $WARN_CFLAGS; do
  56 -          JAPHAR_GREP_CFLAGS($flag, [ CFLAGS="$CFLAGS $flag" ])
  57 -        done
  58 -      else
  59 -        for flag in $NORMAL_CFLAGS; do
  60 -          JAPHAR_GREP_CFLAGS($flag, [ CFLAGS="$CFLAGS $flag" ])
  61 -        done
  62 -      fi
  63 -    ],
  64 -    [if false; then # release (false) or development (true)
  65 -       # Warnings enabled by default (development)
  66 -       for flag in $WARN_CFLAGS; do
  67 -         JAPHAR_GREP_CFLAGS($flag, [ CFLAGS="$CFLAGS $flag" ])
  68 -       done
  69 -    else
  70 -       # Warnings disabled by default (release)
  71 -       for flag in $NORMAL_CFLAGS; do
  72 -         JAPHAR_GREP_CFLAGS($flag, [ CFLAGS="$CFLAGS $flag" ])
  73 -       done
  74 -    fi])
  75 -fi # ac_cv_prog_gcc
  76 -echo using CFLAGS=${CFLAGS}
  77 -
  78  dnl Checks for header files.
  79  AC_HEADER_STDC
  80  AC_CHECK_HEADERS(fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
  81 diff -ur brscan-src-0.2.3-o/brscan/netconfig/brsaneconfig.c brscan-src-0.2.3/brscan/netconfig/brsaneconfig.c
  82 --- brscan-src-0.2.3-o/brscan/netconfig/brsaneconfig.c  2007-01-25 00:20:06.000000000 -0700
  83 +++ brscan-src-0.2.3/brscan/netconfig/brsaneconfig.c    2007-06-08 15:10:32.000000000 -0600
  84 @@ -22,7 +22,7 @@
  85  #include <stdlib.h>
  86  #include <sys/types.h>
  87  #include <dirent.h>
  88 -#include <curses.h>
  89 +#include <ncurses/curses.h>
  90  #include <unistd.h>
  91
  92  #include "brother_advini.h"
  93 diff -ur brscan-src-0.2.3-o/brscan/sanei/sanei_scsi.c brscan-src-0.2.3/brscan/sanei/sanei_scsi.c
  94 --- brscan-src-0.2.3-o/brscan/sanei/sanei_scsi.c        2006-06-30 00:30:24.000000000 -0600
  95 +++ brscan-src-0.2.3/brscan/sanei/sanei_scsi.c  2007-06-08 15:10:56.000000000 -0600
  96 @@ -1916,7 +1916,7 @@
  97              }
  98            req->sgdata.sg3.hdr.dxfer_len = src_size;
  99            memcpy(&req->sgdata.sg3.data[MAX_CDB], src, src_size);
 100 -          (const void*) req->sgdata.sg3.hdr.dxferp = &req->sgdata.sg3.data[MAX_CDB];
 101 +          req->sgdata.sg3.hdr.dxferp = &req->sgdata.sg3.data[MAX_CDB];
 102          }
 103        else
 104          {
 105 @@ -1930,7 +1930,7 @@
 106            cmd_size = MAX_CDB;
 107          }
 108        memcpy(req->sgdata.sg3.data, cmd, cmd_size);
 109 -      (const void*) req->sgdata.sg3.hdr.cmdp = req->sgdata.sg3.data;
 110 +      req->sgdata.sg3.hdr.cmdp = req->sgdata.sg3.data;
 111        req->sgdata.sg3.hdr.sbp = &(req->sgdata.sg3.sense_buffer[0]);
 112        /* 1 minute should be ok even for slow scanners */
 113        req->sgdata.sg3.hdr.timeout = 1000 * SANE_SCSICMD_TIMEOUT;
 114 Only in brscan-src-0.2.3/brscan/sanei: sanei_scsi.c~