diff options
| author |   Patrick Kursawe <phosphan@gentoo.org> | 2005-11-04 14:58:08 +0000 |
|---|---|---|
| committer | Patrick Kursawe <phosphan@gentoo.org> | 2005-11-04 14:58:08 +0000 |
| commit | eedde1278e1f6452cae6334a2db19c1a1de1ed9b (patch) | |
| tree | 8ab1de087640d520f5d1e804c41f2714654e7caa /media-gfx/sane-backends | |
| parent | Stable on sparc wrt #109667 (diff) | |
| download | gentoo-2-eedde1278e1f6452cae6334a2db19c1a1de1ed9b.tar.gz gentoo-2-eedde1278e1f6452cae6334a2db19c1a1de1ed9b.tar.bz2 gentoo-2-eedde1278e1f6452cae6334a2db19c1a1de1ed9b.zip | |
Yesterday's patch was broken
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'media-gfx/sane-backends')
| -rw-r--r-- | media-gfx/sane-backends/ChangeLog | 5 | ||||
| -rw-r--r-- | media-gfx/sane-backends/Manifest | 2 | ||||
| -rw-r--r-- | media-gfx/sane-backends/files/sm3600usb.patch | 24 |
3 files changed, 29 insertions, 2 deletions
diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog index 8d1a6eedc2e4..a53248e26150 100644 --- a/media-gfx/sane-backends/ChangeLog +++ b/media-gfx/sane-backends/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-gfx/sane-backends # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.83 2005/11/03 19:25:16 phosphan Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.84 2005/11/04 14:58:08 phosphan Exp $ + + 04 Nov 2005; Patrick Kursawe <phosphan@gentoo.org> files/sm3600usb.patch: + Yesterday's patch was broken 03 Nov 2005; Patrick Kursawe <phosphan@gentoo.org> +files/sm3600usb.patch, sane-backends-1.0.16-r4.ebuild: diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index c5c5efa7bc86..4e0ad5c7a6bb 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -26,4 +26,4 @@ MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r3 151 MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r4 151 MD5 0bc1f6b8682b5585c8e87a325f983ade files/lide25.patch 5565 MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15 157 -MD5 3652ef56daf0fb012f665c1de7a5a3f9 files/sm3600usb.patch 7324 +MD5 d2fb15785126e0c6046a7ba3a59a88ae files/sm3600usb.patch 8234 diff --git a/media-gfx/sane-backends/files/sm3600usb.patch b/media-gfx/sane-backends/files/sm3600usb.patch index 52909c42b1f5..6871e21d4ba8 100644 --- a/media-gfx/sane-backends/files/sm3600usb.patch +++ b/media-gfx/sane-backends/files/sm3600usb.patch @@ -1,3 +1,9 @@ +Index: sm3600.c +=================================================================== +RCS file: /cvsroot/sane/sane-backends/backend/sm3600.c,v +retrieving revision 1.13 +retrieving revision 1.14 +diff -u -r1.13 -r1.14 --- backend/sm3600.c 3 Jul 2005 13:35:48 -0000 1.13 +++ backend/sm3600.c 16 Aug 2005 19:50:34 -0000 1.14 @@ -55,24 +55,25 @@ @@ -182,6 +188,12 @@ } ResetCalibration(this); /* release calibration data */ /* unlink active device entry */ +Index: sm3600.h +=================================================================== +RCS file: /cvsroot/sane/sane-backends/backend/sm3600.h,v +retrieving revision 1.10 +retrieving revision 1.11 +diff -u -r1.10 -r1.11 --- backend/sm3600.h 30 Apr 2004 21:02:04 -0000 1.10 +++ backend/sm3600.h 16 Aug 2005 19:50:34 -0000 1.11 @@ -190,7 +190,7 @@ @@ -193,6 +205,12 @@ FILE *fhLog; FILE *fhScan; int ichPageBuffer; /* write position in full page buffer */ +Index: sm3600-scanusb.c +=================================================================== +RCS file: /cvsroot/sane/sane-backends/backend/sm3600-scanusb.c,v +retrieving revision 1.11 +retrieving revision 1.12 +diff -u -r1.11 -r1.12 --- backend/sm3600-scanusb.c 15 Apr 2004 21:06:58 -0000 1.11 +++ backend/sm3600-scanusb.c 16 Aug 2005 19:50:34 -0000 1.12 @@ -43,7 +43,7 @@ @@ -274,6 +292,12 @@ } dprintf(DEBUG_COMM,"writing %d bytes\n",cchRead); +Index: sm3600-scanutil.c +=================================================================== +RCS file: /cvsroot/sane/sane-backends/backend/sm3600-scanutil.c,v +retrieving revision 1.11 +retrieving revision 1.12 +diff -u -r1.11 -r1.12 --- backend/sm3600-scanutil.c 15 Apr 2004 21:06:58 -0000 1.11 +++ backend/sm3600-scanutil.c 16 Aug 2005 19:50:34 -0000 1.12 @@ -43,10 +43,11 @@ |