summaryrefslogtreecommitdiff
path: root/package/sane-backends/patches
diff options
context:
space:
mode:
authorwbx <wbx@hydrogenium.(none)>2009-05-17 14:41:34 +0200
committerwbx <wbx@hydrogenium.(none)>2009-05-17 14:41:34 +0200
commit219a6dab8995aad9ac4860cc1a84d6f3509a03a4 (patch)
treeb9c0f3c43aebba2fcfef777592d0add39f2072f4 /package/sane-backends/patches
Initial import
Diffstat (limited to 'package/sane-backends/patches')
-rw-r--r--package/sane-backends/patches/patch-Makefile_in12
-rw-r--r--package/sane-backends/patches/patch-backend_microtek_c11
-rw-r--r--package/sane-backends/patches/patch-backend_pixma_bjnp_c22
-rw-r--r--package/sane-backends/patches/patch-backend_pixma_common_h13
-rw-r--r--package/sane-backends/patches/patch-backend_pixma_imageclass_c12
-rw-r--r--package/sane-backends/patches/patch-backend_sm3600-scanutil_c11
-rw-r--r--package/sane-backends/patches/patch-backend_umax1220u-common_c12
7 files changed, 93 insertions, 0 deletions
diff --git a/package/sane-backends/patches/patch-Makefile_in b/package/sane-backends/patches/patch-Makefile_in
new file mode 100644
index 000000000..6a143eb05
--- /dev/null
+++ b/package/sane-backends/patches/patch-Makefile_in
@@ -0,0 +1,12 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- sane-backends-1.0.20.orig/Makefile.in 2009-04-30 15:41:20.000000000 +0200
++++ sane-backends-1.0.20/Makefile.in 2009-05-11 00:17:44.000000000 +0200
+@@ -244,7 +244,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = include lib sanei backend frontend tools doc po
++SUBDIRS = include lib sanei backend frontend
+ DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite
+ dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \
+ README README.aix README.beos README.darwin README.djpeg README.freebsd \
diff --git a/package/sane-backends/patches/patch-backend_microtek_c b/package/sane-backends/patches/patch-backend_microtek_c
new file mode 100644
index 000000000..6d99f5808
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_microtek_c
@@ -0,0 +1,11 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- sane-backends-1.0.20.orig/backend/microtek.c 2009-02-26 17:11:17.000000000 +0100
++++ sane-backends-1.0.20/backend/microtek.c 2009-05-11 00:10:23.000000000 +0200
+@@ -59,6 +59,7 @@
+
+ #include "sane/config.h"
+
++#include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
diff --git a/package/sane-backends/patches/patch-backend_pixma_bjnp_c b/package/sane-backends/patches/patch-backend_pixma_bjnp_c
new file mode 100644
index 000000000..4b3224eb9
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_pixma_bjnp_c
@@ -0,0 +1,22 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- sane-backends-1.0.20.orig/backend/pixma_bjnp.c 2009-04-01 18:26:58.000000000 +0200
++++ sane-backends-1.0.20/backend/pixma_bjnp.c 2009-05-11 00:23:33.000000000 +0200
+@@ -59,9 +59,6 @@
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+-#ifdef HAVE_SYS_TIME_H
+-#include <sys/timeb.h>
+-#endif
+
+ /*
+ * networking stuff
+@@ -196,7 +193,7 @@ truncate_hostname (char *hostname, char
+ {
+ /* this is a hostname, not an ip-address, so remove domain part of the name */
+
+- if ((dot = index (short_hostname, '.')) != NULL)
++ if ((dot = strchr(short_hostname, '.')) != NULL)
+ *dot = '\0';
+ }
+ return short_hostname;
diff --git a/package/sane-backends/patches/patch-backend_pixma_common_h b/package/sane-backends/patches/patch-backend_pixma_common_h
new file mode 100644
index 000000000..822cc888e
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_pixma_common_h
@@ -0,0 +1,13 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- sane-backends-1.0.20.orig/backend/pixma_common.h 2009-02-05 15:36:36.000000000 +0100
++++ sane-backends-1.0.20/backend/pixma_common.h 2009-05-11 21:00:58.000000000 +0200
+@@ -220,8 +220,8 @@ void pixma_hexdump (int level, const voi
+ void pixma_dump (int level, const char *type, const void *data, int len,
+ int size, int max);
+ # define DEBUG_DECLARE_ONLY
+-# include "../include/sane/sanei_debug.h"
+ #endif /* NDEBUG */
+ /** @} end of group debug */
++# include "../include/sane/sanei_debug.h"
+
+ #endif
diff --git a/package/sane-backends/patches/patch-backend_pixma_imageclass_c b/package/sane-backends/patches/patch-backend_pixma_imageclass_c
new file mode 100644
index 000000000..7c2492c5f
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_pixma_imageclass_c
@@ -0,0 +1,12 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- sane-backends-1.0.20.orig/backend/pixma_imageclass.c 2009-03-12 18:36:09.000000000 +0100
++++ sane-backends-1.0.20/backend/pixma_imageclass.c 2009-05-11 00:30:36.000000000 +0200
+@@ -159,8 +159,6 @@ query_status (pixma_t * s)
+ if (error >= 0)
+ {
+ memcpy (mf->current_status, data, 12);
+- DBG (3, "Current status: paper=%u cal=%u lamp=%u\n",
+- data[1], data[8], data[7]);
+ PDBG (pixma_dbg (3, "Current status: paper=%u cal=%u lamp=%u\n",
+ data[1], data[8], data[7]));
+ }
diff --git a/package/sane-backends/patches/patch-backend_sm3600-scanutil_c b/package/sane-backends/patches/patch-backend_sm3600-scanutil_c
new file mode 100644
index 000000000..542afb9c1
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_sm3600-scanutil_c
@@ -0,0 +1,11 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- sane-backends-1.0.20.orig/backend/sm3600-scanutil.c 2005-08-16 21:50:34.000000000 +0200
++++ sane-backends-1.0.20/backend/sm3600-scanutil.c 2009-05-11 21:08:46.000000000 +0200
+@@ -47,6 +47,7 @@ $Id: sm3600-scanutil.c,v 1.12 2005-08-16
+
+ ====================================================================== */
+
++#include <stdarg.h>
+ #include <unistd.h>
+ #include "sm3600-scantool.h"
+
diff --git a/package/sane-backends/patches/patch-backend_umax1220u-common_c b/package/sane-backends/patches/patch-backend_umax1220u-common_c
new file mode 100644
index 000000000..8889f7795
--- /dev/null
+++ b/package/sane-backends/patches/patch-backend_umax1220u-common_c
@@ -0,0 +1,12 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- sane-backends-1.0.20.orig/backend/umax1220u-common.c 2006-04-17 14:46:41.000000000 +0200
++++ sane-backends-1.0.20/backend/umax1220u-common.c 2009-05-11 21:17:47.000000000 +0200
+@@ -556,7 +556,7 @@ cwritev (UMAX_Handle * scan, UMAX_Cmd cm
+ /* Read the opcode back */
+
+ CHK (cread (scan, cmd, len, buf, NULL));
+- if (bcmp (buf, data, len))
++ if (memcmp (buf, data, len))
+ {
+ DBG (1, "cwritev: verification failed\n");
+ return SANE_STATUS_IO_ERROR;