rpm/sane-backends
SHA256
1
0
Fork 0
forked from pool/sane-backends
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sane-backends?expand=0&rev=31

Browse Source
This commit is contained in:
OBS User unknown 2009-06-12 16:09:03 +00:00 committed by Git OBS Bridge
parent a6ec2f607b
commit a72cecdf45
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
re-add-SANE_CAP_ALWAYS_SETTABLE.patch Normal file
View File

@ -0,0 +1,10 @@
--- include/sane/sane.h.orig 2009-06-12 10:19:19.000000000 +0200
+++ include/sane/sane.h 2009-06-12 10:20:12.000000000 +0200
@@ -115,6 +115,7 @@ SANE_Device;
#define SANE_CAP_AUTOMATIC (1 << 4)
#define SANE_CAP_INACTIVE (1 << 5)
#define SANE_CAP_ADVANCED (1 << 6)
+#define SANE_CAP_ALWAYS_SETTABLE (1 << 7)
#define SANE_OPTION_IS_ACTIVE(cap) (((cap) & SANE_CAP_INACTIVE) == 0)
#define SANE_OPTION_IS_SETTABLE(cap) (((cap) & SANE_CAP_SOFT_SELECT) != 0)

9
sane-backends.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Jun 12 10:29:45 CEST 2009 - jsmeix@suse.de
- re-add-SANE_CAP_ALWAYS_SETTABLE.patch re-adds
SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously
removed in sane-backends-1.0.20 so that sane-frontends
and xsane can no longer build,
see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527675
-------------------------------------------------------------------
Wed Jun 10 15:25:58 CEST 2009 - jsmeix@suse.de

14
sane-backends.spec
View File

@ -25,7 +25,7 @@ Group: Hardware/Scanner
AutoReqProv: on
Summary: SANE (Scanner Access Now Easy) Scanner Drivers
Version: 1.0.20
Release: 1
Release: 2
Url: http://www.sane-project.org/
# URL for Source0: http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz
Source0: sane-backends-%{version}.tar.bz2
@ -79,6 +79,10 @@ Patch2: fix-buffer-overflow.patch
# Patch7 lets sanei_scsi_find_devices continue on to look at subsequent devices
# if the attach callback returns anything other than SANE_STATUS_GOOD:
# Patch7 is obsolete since sane-backends-1.0.20 because it is fixed in the source.
# Patch8 re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously
# removed in sane-backends-1.0.20 so that sane-frontends and xsane can no longer build,
# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527675
Patch8: re-add-SANE_CAP_ALWAYS_SETTABLE.patch
# Patch100... is SUSE specific stuff:
# Patch100 lets the "canon" backend do scanner auto-recognition:
Patch100: canon-backend-autoprobing.patch
@ -282,6 +286,8 @@ Authors:
%setup -q
# Patch2 fixes too small arrays in backend/niash.c:
%patch2
# Patch8 re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously removed:
%patch8
# Patch100... is SUSE specific stuff:
# Patch100 lets the "canon" backend do scanner auto-recognition:
%patch100
@ -626,6 +632,12 @@ exit 0
%{_sysconfdir}/udev/rules.d/56-sane-backends-autoconfig.rules
%changelog
* Fri Jun 12 2009 jsmeix@suse.de
- re-add-SANE_CAP_ALWAYS_SETTABLE.patch re-adds
SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously
removed in sane-backends-1.0.20 so that sane-frontends
and xsane can no longer build,
see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527675
* Wed Jun 10 2009 jsmeix@suse.de
- Upgraded to sane-backends version 1.0.20:
New backends: