summaryrefslogtreecommitdiff
path: root/graphics/sane/patches
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/sane/patches')
-rw-r--r--graphics/sane/patches/patch-aa46
-rw-r--r--graphics/sane/patches/patch-ab24
-rw-r--r--graphics/sane/patches/patch-ac13
-rw-r--r--graphics/sane/patches/patch-ad134
4 files changed, 0 insertions, 217 deletions
diff --git a/graphics/sane/patches/patch-aa b/graphics/sane/patches/patch-aa
deleted file mode 100644
index 00eb94a2cde..00000000000
--- a/graphics/sane/patches/patch-aa
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2000/08/28 15:18:54 rh Exp $
-
---- backend/Makefile.in.orig Sat Aug 12 16:47:55 2000
-+++ backend/Makefile.in
-@@ -33,7 +33,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- RANLIB = @RANLIB@
--LN_S = @LN_S@
-+LN_S = @LN_S@ -f
-
- CC = @CC@
- INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
-@@ -92,7 +92,7 @@
- $(MKDIR) $(libdir) $(libsanedir) $(configdir)
- @list="$(LIBS)"; for be in $$list; do \
- echo installing $${be} in $(libsanedir)...; \
-- $(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) $${be} $(libsanedir)/$${be} \
-+ $(LIBTOOL) $(MINST) $(INSTALL_DATA) $${be} $(libsanedir)/$${be} \
- || exit 1; \
- done
- @$(LIBTOOL) $(MINST) --finish $(libsanedir)
-@@ -100,10 +100,14 @@
- @dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
- list="$(ALL_BACKENDS)"; cd $(libsanedir) && for be in $$list; do \
- file=libsane-$${be}.$$dllend.$(V_MAJOR); \
-+ lnkf=libsane-$${be}.so.$(V_MAJOR); \
- lib=`grep dlname= libsane-$${be}.la | cut -f2 -d"'"`; \
- if test ! -f $${file} -a -n "$${lib}"; then \
- $(LN_S) $${lib} $${file}; \
- fi; \
-+ if test ! -f $${lnkf} -a -n "$${lib}"; then \
-+ $(LN_S) $${lib} $${lnkf}; \
-+ fi; \
- done
- @# Assume the dll name without any versions is last
- @dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
-@@ -115,7 +119,7 @@
- nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \
- (cd ..; $(LN_S) sane/$$n $$nn); \
- done || exit 1
-- $(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
-+ $(INSTALL_DATA) libsane.la $(libdir)/libsane.la
- @list="$(CONFIGS)"; for cfg in $$list; do \
- if test ! -r $(srcdir)/$${cfg}; then continue; fi; \
- if test -f $(configdir)/$${cfg}; then \
diff --git a/graphics/sane/patches/patch-ab b/graphics/sane/patches/patch-ab
deleted file mode 100644
index de806b54730..00000000000
--- a/graphics/sane/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2000/08/28 15:18:54 rh Exp $
-
---- configure.orig Sat Aug 12 16:47:33 2000
-+++ configure
-@@ -2109,7 +2109,7 @@
- EOF
- if { (eval echo configure:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
-+ eval "ac_cv_lib_$ac_lib_var=no"
- else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
-@@ -4501,8 +4501,8 @@
- echo "disabling DC210 backend (failed to find JPEG library)"
- DC210=
- else
-- echo "enabling DC210 backend"
-- DC210=dc210
-+ echo "disabling DC210 backend (does not compile on NetBSD yet)"
-+ DC210=
- fi
-
- if test "${ac_cv_header_sys_scanio_h}" = "no"; then
diff --git a/graphics/sane/patches/patch-ac b/graphics/sane/patches/patch-ac
deleted file mode 100644
index 120e92f62b8..00000000000
--- a/graphics/sane/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2000/08/30 12:19:08 rh Exp $
-
---- tools/Makefile.in.orig Sun Mar 5 14:45:19 2000
-+++ tools/Makefile.in Mon Jul 3 17:13:09 2000
-@@ -65,7 +65,7 @@
- all: $(DESTINATIONS)
-
- install: sane-config
-- $(INSTALL_PROGRAM) sane-config $(bindir)/sane-config
-+ ${BSD_INSTALL_SCRIPT} sane-config ${bindir}/sane-config
-
- sane-config: sane-config.in $(top_builddir)/config.status
- cd $(top_builddir) \
diff --git a/graphics/sane/patches/patch-ad b/graphics/sane/patches/patch-ad
deleted file mode 100644
index 87c94e13a15..00000000000
--- a/graphics/sane/patches/patch-ad
+++ /dev/null
@@ -1,134 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2000/11/29 21:38:24 wiz Exp $
-
---- frontend/xscanimage.c.orig Sat Aug 12 16:53:36 2000
-+++ frontend/xscanimage.c
-@@ -57,6 +57,11 @@
-
- #ifdef HAVE_LIBGIMP_GIMP_H
-
-+/*
-+ * Enable old Gimp API. Eventually, we should rewrite this frontend
-+ * to use the new API. [pere 2000-10-29]
-+ */
-+#define GIMP_ENABLE_COMPAT_CRUFT
- #include <libgimp/gimp.h>
-
- static void query (void);
-@@ -119,10 +124,13 @@
- {
- {"help", no_argument, NULL, 'h'},
- {"version", no_argument, NULL, 'V'},
-- {0, }
-+ {0, 0, 0, 0 }
- };
-
-
-+static int gtk_quit_flag; /* Call gtk_main_quit() only if at least one device
-+ device is found. */
-+
- /* forward declarations: */
-
- int main (int argc, char ** argv);
-@@ -367,24 +375,24 @@
- if (sane_get_parameters (gsg_dialog_get_device (dialog), &params)
- == SANE_STATUS_GOOD)
- {
-- u_long size = 10 * params.bytes_per_line * params.lines;
-+ double size = params.bytes_per_line * params.lines;
- const char *unit = "B";
-
- if (params.format >= SANE_FRAME_RED && params.format <= SANE_FRAME_BLUE)
- size *= 3;
-
-- if (size >= 10 * 1024 * 1024)
-+ if (size >= 1024 * 1024)
- {
- size /= 1024 * 1024;
- unit = "MB";
- }
-- else if (size >= 10 * 1024)
-+ else if (size >= 1024)
- {
- size /= 1024;
- unit = "KB";
- }
-- sprintf (buf, "%dx%d: %lu.%01lu %s", params.pixels_per_line,
-- params.lines, size / 10, size % 10, unit);
-+ sprintf (buf, "%dx%d: %1.1f %s", params.pixels_per_line,
-+ params.lines, size, unit);
- }
- else
- sprintf (buf, "Invalid parameters.");
-@@ -454,11 +462,13 @@
- if (dialog && gsg_dialog_get_device (dialog))
- sane_close (gsg_dialog_get_device (dialog));
- sane_exit ();
-- gtk_main_quit ();
-+ if (gtk_quit_flag == 1)
-+ gtk_main_quit ();
- #ifdef HAVE_LIBGIMP_GIMP_H
- if (scan_win.mode == SANE_GIMP_EXTENSION)
- gimp_quit ();
- #endif
-+ fprintf(stderr, "xscanimage exiting.\n");
- exit (0);
- }
-
-@@ -555,7 +565,7 @@
-
- while (1)
- {
-- status = sane_read (dev, buf, sizeof (buf), &len);
-+ status = sane_read (dev, (unsigned char *) buf, sizeof (buf), &len);
- if (status != SANE_STATUS_GOOD)
- {
- if (status == SANE_STATUS_EOF)
-@@ -1692,10 +1702,15 @@
- }
- else
- {
-- fprintf (stderr, "%s: no devices available.\n", prog_name);
-+ fprintf(stderr, "No scanners were identified. If you were expecting something\n"
-+ " different, check that the scanner is plugged in, turned on and\n"
-+ " detected by the find-scanner tool (if appropriate). Please read\n"
-+ " the documentation which came with this software (README, FAQ,\n"
-+ " manpages).\n");
- quit_xscan ();
- }
- }
-+ gtk_quit_flag = 1;
- gtk_main ();
- sane_exit ();
- }
-@@ -1703,8 +1718,10 @@
- int
- main (int argc, char **argv)
- {
-+ fprintf(stderr, "xscanimage (version: %s, package: %s) starting\n", VERSION,
-+ PACKAGE);
- scan_win.mode = STANDALONE;
--
-+ gtk_quit_flag = 0;
- prog_name = strrchr (argv[0], '/');
- if (prog_name)
- ++prog_name;
-@@ -1714,6 +1731,7 @@
- #ifdef HAVE_LIBGIMP_GIMP_H
- {
- GPrintFunc old_print_func;
-+ GPrintFunc old_printerr_func;
- int result;
-
- /* Temporarily install a print function that discards all output.
-@@ -1721,9 +1739,11 @@
- gimp" messages when xscanimage gets invoked in stand-alone
- mode. */
- old_print_func = g_set_print_handler (null_print_func);
-+ old_printerr_func = g_set_printerr_handler(null_print_func);
- /* gimp_main () returns 1 if xscanimage wasn't invoked by GIMP */
- result = gimp_main (argc, argv);
- g_set_message_handler (old_print_func);
-+ g_set_error_handler(old_printerr_func);
- if (result)
- interface (argc, argv);
- }
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 16:21:18 +0000