diff --git a/sane-backends-1.0.18-glibc-2.7.patch b/sane-backends-1.0.18-glibc-2.7.patch new file mode 100644 index 0000000..23436e3 --- /dev/null +++ b/sane-backends-1.0.18-glibc-2.7.patch @@ -0,0 +1,44 @@ +--- sane-backends-1.0.18/sanei/sanei_scsi.c.glibc-2.7 2005-11-24 23:08:49.000000000 +0100 ++++ sane-backends-1.0.18/sanei/sanei_scsi.c 2007-08-08 15:01:07.000000000 +0200 +@@ -5028,7 +5028,7 @@ sanei_scsi_find_devices (const char *fin + (*plugInInterface)->Release (plugInInterface); + IOObjectRelease (scsiDevice); + +- ioReturnValue = (*scsiDeviceInterface)->open (scsiDeviceInterface); ++ ioReturnValue = ((*scsiDeviceInterface)->open) (scsiDeviceInterface); + if (ioReturnValue != kIOReturnSuccess) + { + DBG (5, "Error opening SCSI interface (0x%08x)\n", ioReturnValue); +--- sane-backends-1.0.18/backend/pixma_common.c.glibc-2.7 2006-06-11 22:53:05.000000000 +0200 ++++ sane-backends-1.0.18/backend/pixma_common.c 2007-08-08 15:01:18.000000000 +0200 +@@ -449,7 +449,7 @@ pixma_open (unsigned devnr, pixma_t ** h + strncpy (s->id, pixma_get_device_id (devnr), sizeof (s->id)); + s->ops = s->cfg->ops; + s->scanning = 0; +- error = s->ops->open (s); ++ error = (s->ops->open) (s); + if (error < 0) + goto rollback; + *handle = s; +--- sane-backends-1.0.18/backend/plustek_pp.c.glibc-2.7 2006-02-19 12:32:24.000000000 +0100 ++++ sane-backends-1.0.18/backend/plustek_pp.c 2007-08-08 14:56:45.000000000 +0200 +@@ -258,7 +258,7 @@ static int drvopen( Plustek_Device *dev + + DBG( _DBG_INFO, "drvopen()\n" ); + +- handle = dev->open((const char*)dev->name, (void *)dev ); ++ handle = (dev->open)((const char*)dev->name, (void *)dev ); + + tsecs = 0; + +--- sane-backends-1.0.18/backend/mustek_pp.c.glibc-2.7 2005-04-16 15:06:37.000000000 +0200 ++++ sane-backends-1.0.18/backend/mustek_pp.c 2007-08-08 15:01:30.000000000 +0200 +@@ -1152,7 +1152,7 @@ sane_open (SANE_String_Const devicename, + + } + +- if ((status = dev->func->open (dev->port, dev->caps, &fd)) != SANE_STATUS_GOOD) { ++ if ((status = (dev->func->open) (dev->port, dev->caps, &fd)) != SANE_STATUS_GOOD) { + + DBG (1, "sane_open: could not open device (%s)\n", + sane_strstatus (status)); diff --git a/sane-backends.spec b/sane-backends.spec index 9069147..06630cb 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -37,6 +37,7 @@ Patch5: sane-backends-1.0.18-logical_vs_binary.patch Patch6: sane-backends-1.0.18-usb_reset.patch Patch7: sane-backends-1.0.18-udev-symlink.patch Patch8: sane-backends-1.0.18-udev-098.patch +Patch9: sane-backends-1.0.18-glibc-2.7.patch URL: http://www.sane-project.org BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n) BuildRequires: tetex-latex libusb-devel libieee1284-devel libjpeg-devel @@ -128,6 +129,8 @@ want to access digital cameras. %patch8 -p1 -b .udev-098 %endif +%patch9 -p1 -b .glibc-2.7 + for i in agfafocus avision coolscan2 umax_pp; do iconv -f iso-8859-1 -t utf-8 < "doc/sane-$i.man" > "doc/sane-$i.man_" mv "doc/sane-$i.man_" "doc/sane-$i.man" @@ -248,6 +251,7 @@ rm -rf %{buildroot} %changelog * Wed Aug 08 2007 Nils Philippsen - 1.0.18-14 - make udev rules more robust (#243953) +- bring code in shape for glibc-2.7 * Wed Jul 25 2007 Jeremy Katz - 1.0.18-13 - rebuild for toolchain bug