summaryrefslogtreecommitdiff
path: root/graphics/xsane/patches
diff options
context:
space:
mode:
authorrh <rh>1999-11-27 12:09:06 +0000
committerrh <rh>1999-11-27 12:09:06 +0000
commitf918ed3ce4ceec002005d1f893d7fc65598e5a3a (patch)
tree3e99b995c233ba628dec0644ddaf79546c4f5d03 /graphics/xsane/patches
parent742c4bf235571fe2e6007cc2541f388cd98fb34c (diff)
downloadpkgsrc-f918ed3ce4ceec002005d1f893d7fc65598e5a3a.tar.gz
Update xsane to 0.46.
Changes include: * Problem with Segmentation fault when loading device settings with "lineart" mode enabled is solved. * Changed xsane- and device-preferences read and write routines, problem with segmentation faults while loading device preferences (*.drc) should be solved now. Old "*.drc" files have to be converted with xsane-convert-to-0.46. * Added "Problems?" to "Help" menu. * Filetype/extension can be selected by the menu "by ext." now.
Diffstat (limited to 'graphics/xsane/patches')
-rw-r--r--graphics/xsane/patches/patch-ac28
-rw-r--r--graphics/xsane/patches/patch-ad16
2 files changed, 32 insertions, 12 deletions
diff --git a/graphics/xsane/patches/patch-ac b/graphics/xsane/patches/patch-ac
index 9c08cff5504..3a5e08080ee 100644
--- a/graphics/xsane/patches/patch-ac
+++ b/graphics/xsane/patches/patch-ac
@@ -1,13 +1,17 @@
-$NetBSD: patch-ac,v 1.3 1999/05/03 16:29:23 rh Exp $
+$NetBSD: patch-ac,v 1.4 1999/11/27 12:09:10 rh Exp $
---- sanei/Makefile.in.orig Wed Apr 14 00:34:23 1999
-+++ sanei/Makefile.in Sun May 2 14:18:04 1999
-@@ -27,7 +27,7 @@
- INSTALL_DATA = @INSTALL_DATA@
-
- CC = @CC@
--INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
-+INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I${PREFIX}/include
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
+--- frontend/xsane-rc-io.c.orig Wed Nov 17 20:52:45 1999
++++ frontend/xsane-rc-io.c Sat Nov 27 11:33:19 1999
+@@ -89,8 +89,11 @@
+ {
+ if (nread == 0)
+ {
+-/* errno = EINVAL; */
++#ifdef ENODATA
+ errno = ENODATA; /* EOF */
++#else
++ errno = EINVAL;
++#endif
+ }
+ w->status = errno;
+ return;
diff --git a/graphics/xsane/patches/patch-ad b/graphics/xsane/patches/patch-ad
new file mode 100644
index 00000000000..c41bed13ee3
--- /dev/null
+++ b/graphics/xsane/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.3 1999/11/27 12:09:10 rh Exp $
+
+--- frontend/xsane-device-preferences.c.orig Fri Nov 19 21:44:10 1999
++++ frontend/xsane-device-preferences.c Sat Nov 27 12:29:58 1999
+@@ -116,7 +116,11 @@
+ xsane_rc_io_w_string(w, &name);
+ }
+
++#ifdef ENODATA
+ if (w->status == ENODATA) /* eof */
++#else
++ if (w->status == EAGAIN) /* eof */
++#endif
+ {
+ if (keep_going) /* we had a reload otpions? */
+ {