head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.54 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.52 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.50 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.48 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.46 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.44 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.42 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.40 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.38 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.36 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.34 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.32 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.30 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.28 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.26 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.24 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.22 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.20 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.18 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.16 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.14 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.12 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.10 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.8 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.6 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.4 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 buildlink2-base:1.5 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2000.01.06.13.48.11; author rh; state dead; branches; next 1.4; 1.4 date 99.11.27.12.09.10; author rh; state Exp; branches; next 1.3; 1.3 date 99.05.03.16.29.23; author rh; state Exp; branches; next 1.2; 1.2 date 99.04.17.01.27.28; author hubertf; state Exp; branches; next 1.1; 1.1 date 99.04.06.05.57.31; author rh; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.04.06.05.57.31; author rh; state Exp; branches; next ; desc @@ 1.5 log @Update xsane to 0.48. Changes are as follows: - No longer requires patches ac and ad thanks to author's quick reaction to feedback. xsane-0.46 -> 0.47: ------------------- - if helpfile viewer is netscape-remote and netscape is not running it is started - replaced ENODATA (used for EOF detection in xsane-rc-io and xsane-device-preferences) by XSANE_EOF (=-1) (ENODATA is not defined on all systems) - If faxproject does not exist, project data entries are made insensitive and buttons "send project" and "delete project" are replaced by "create project" - Added missing "&" in xsane_device_preferences_save_values: xsane_rc_io_w_array(w, &len, (void **) &word_array, (WireCodecFunc) xsane_rc_io_w_word, sizeof(SANE_Word)); that cause segmentation fault when writing bool, int or fixpoint arrays. xsane-0.47 -> 0.48: ------------------- - "START" button is made insensitive in fax mode if project does not exist. - Preview window is created at the same time as the main dialog and it is destroyed at program end. Disabling "show preview" hides the preview window. This way the preview window placement does work correct. - set default values in xsane_device_preferences_load_file(char *filename) before reading the saved values, show_preview default = true - Mouse pointers display relevant mode icons in preview window now. - In copy mode the maximum selectable size that fits to the selected printer is drawn by a rect now. Selection is limited to the printer size. - if no local xsane.rc, xsane-style.rc or DEVICE.drc file exists it is loaded from SANE_DATA_DIR/xsane - all xsane rc files are placed in a subdirectory xsane now (~/.sane/xsane, SANE_DATA/DIR/xsane) - temporary files (previews, conversions) are saved in /tmp (defined in SANE_PATH_TMP in xsane.h) now - added window decoration icon (top left) to each xsane window (does work with kwm, does not work with fvwm2) - added warning icon and error icon - removed xsane_files_exit_callback, now xsane_scan_win_delete is used for all exit program calls - conversion-* and preview-* files are created with permission "-rw-------", images- and project-files are created with "preferences.image_umask" xsane.rc and *.drc are created with XSANE_DEFAULT_UMASK defined in xsane.h @ text @$NetBSD: patch-ac,v 1.4 1999/11/27 12:09:10 rh Exp $ --- 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; @ 1.4 log @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. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Update to xsane-0.22 @ text @d3 15 a17 11 --- 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@@ @ 1.2 log @Actually link in libsane. @ text @d3 4 a6 3 --- frontend/Makefile.in.orig Thu Mar 25 16:42:21 1999 +++ frontend/Makefile.in Sat Apr 17 03:11:52 1999 @@@@ -29,16 +29,16 @@@@ d9 2 a10 4 INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include \ - @@GTK_CFLAGS@@ @@INCLUDES@@ + @@GTK_CFLAGS@@ @@INCLUDES@@ -I${LOCALBASE}/include DEFS = @@DEFS@@ a13 18 -LIBS = @@LIBS@@ +LIBS = @@LIBS@@ -L${X11BASE}/lib -lsane GTK_LIBS = @@GTK_LIBS@@ GIMP_LIBS = @@GIMP_LIBS@@ -LIBTOOL = ../libtool +LIBTOOL = @@LIBTOOL@@ MINST = --mode=install MLINK = --mode=link XSCAN = @@XSCAN@@ @@@@ -66,7 +66,6 @@@@ $(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) $${program} \ $(bindir)/$${program}; \ done - $(INSTALL_DATA) $(srcdir)/sane-style.rc $(datadir)/sane-style.rc $(INSTALL_DATA) $(srcdir)/xsane-logo.xpm $(datasanedir)/xsane-logo.xpm xsane: $(XSANE_OBJS) $(LIBSANEI) $(LIBLIB) @ 1.1 log @Initial revision @ text @d4 2 a5 2 +++ frontend/Makefile.in Mon Apr 5 19:46:35 1999 @@@@ -29,7 +29,7 @@@@ d14 3 a16 1 @@@@ -38,7 +38,7 @@@@ @ 1.1.1.1 log @Initial import of xsane-0.19, an improved scanner frontend for SANE that also includes photocopier functionality. @ text @@