import 22.87.04 from sourceforge

git-svn-id: svn://tug.org/texlive/trunk/Build/source@53986 c570f23f-e606-0410-a88d-b1316a301751

texk/xdvik/CHANGES

@@ -9,6 +9,14 @@ Versions containing major changes are marked as `beta'; these
 may contain undetected bugs. Such versions shouldn't be used
 by distributors.
 
+   * 22.87.04 (2020-02-29):
+	+ Added xdvi.desktop and a mechanism to install it (TeX Live r46347)
+	+ Some changes in the man page (TeX Live r46371 and r50583)
+	+ Adjust psgs.c to make it work with Ghostscript 9.27
+	+ Fixed bug #400 (eps picture overlays) and removed
+	  GS_PIXMAP_CLEARING_HACK
+	+ Updated support libraries from texlive 2020 (r53905)
+
    * 22.87.03 (2016-04-02):
 	+ incorporated changes in xdvik itself from the TeX Live version:
 	  m4/xdvi-check-iconv.m4: Somewhat improved logic.

texk/xdvik/ChangeLog

@@ -1,3 +1,9 @@
+2020-03-01  Karl Berry  <karl@freefriends.org>
+
+	* Import xdvi-22.87.04 from
+	https://sourceforge.net/projects/xdvi/files/xdvik, includes
+	changes made here.
+
 2019-07-22  Karl Berry  <karl@freefriends.org>
 
 	* psgs.c (initGS): don't use now-gone-from-ghostscript execute

texk/xdvik/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xdvik 22.87.03.
+# Generated by GNU Autoconf 2.69 for xdvik 22.87.04.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xdvik'
 PACKAGE_TARNAME='xdvik'
-PACKAGE_VERSION='22.87.03'
-PACKAGE_STRING='xdvik 22.87.03'
+PACKAGE_VERSION='22.87.04'
+PACKAGE_STRING='xdvik 22.87.04'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1377,7 +1377,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xdvik 22.87.03 to adapt to many kinds of systems.
+\`configure' configures xdvik 22.87.04 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1451,7 +1451,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xdvik 22.87.03:";;
+     short | recursive ) echo "Configuration of xdvik 22.87.04:";;
    esac
   cat <<\_ACEOF
 
@@ -1606,7 +1606,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xdvik configure 22.87.03
+xdvik configure 22.87.04
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2445,7 +2445,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xdvik $as_me 22.87.03, which was
+It was created by xdvik $as_me 22.87.04, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8132,7 +8132,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xdvik'
- VERSION='22.87.03'
+ VERSION='22.87.04'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17738,7 +17738,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-xdvik config.lt 22.87.03
+xdvik config.lt 22.87.04
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -19199,7 +19199,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-XDVIK_VERSION=22.87.03
+XDVIK_VERSION=22.87.04
 
 
 ac_config_files="$ac_config_files Makefile tests/Makefile"
@@ -19750,7 +19750,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xdvik $as_me 22.87.03, which was
+This file was extended by xdvik $as_me 22.87.04, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19816,7 +19816,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xdvik config.status 22.87.03
+xdvik config.status 22.87.04
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

texk/xdvik/configure.ac

@@ -6,7 +6,7 @@ dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-m4_define([xdvik_version], [22.87.03])
+m4_define([xdvik_version], [22.87.04])
 AC_INIT([xdvik], xdvik_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([xdvi.c])

texk/xdvik/dvi-draw.c

@@ -1,6 +1,6 @@
 /* The rest of the code has the following copyright:
 
-Copyright (c) 1990-2013  Paul Vojta and others
+Copyright (c) 1990-2019  Paul Vojta and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -2282,10 +2282,6 @@ draw_page(void)
 
 #ifdef PS
 	psp.interrupt();
-	/* reset this flag too, just to make sure ... */
-# if defined(PS_GS) && GS_PIXMAP_CLEARING_HACK
-	had_ps_specials = False;
-# endif
 #endif
 	globals.ev.flags &= ~EV_MAG_GONE;
 #if 0

texk/xdvik/events.c

@@ -1,6 +1,6 @@
 /*======================================================================*\
 
-Copyright (c) 1990-2016  Paul Vojta and others
+Copyright (c) 1990-2019  Paul Vojta and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -1702,6 +1702,9 @@ goto_page(int new_page, home_proc proc, Boolean force)
        (i.e. when accidentally changing page instead of unpausing)
     */
     if (globals.pausing.flag) {
+#if PS_GS
+	gs_erase_page();
+#endif
 	XClearWindow(DISP, mane.win);
     }
 
@@ -2608,6 +2611,9 @@ Act_set_shrink_factor(Widget w, XEvent *event,
        will survive changing shrink
     */
     if (globals.pausing.flag) {
+#if PS_GS
+	gs_erase_page();
+#endif
 	XClearWindow(DISP, mane.win);
     }
 
@@ -2656,6 +2662,9 @@ Act_shrink_to_dpi(Widget w, XEvent *event,
 
     /* like elsewhere */
     if (globals.pausing.flag) {
+#if PS_GS
+	gs_erase_page();
+#endif
 	XClearWindow(DISP, mane.win);
     }
 #if 0
@@ -3142,11 +3151,11 @@ Act_set_gs_alpha(Widget w, XEvent *event,
 
     set_menu(&resource.gs_alpha, Act_set_gs_alpha, check_toggle);
 
-#if GS_PIXMAP_CLEARING_HACK
-    had_ps_specials = False; /* else infinite loop and/or crash in redraw! */
-#endif
     /* like elsewhere */
     if (globals.pausing.flag) {
+#if PS_GS
+	gs_erase_page();
+#endif
 	XClearWindow(DISP, mane.win);
     }
 
@@ -6156,6 +6165,9 @@ redraw_page(void)
 #endif /* COLOR */
 
     if (!globals.pausing.flag) {
+#if PS_GS
+	gs_erase_page();
+#endif
 	XClearWindow(DISP, mane.win);
     }
 
@@ -6222,13 +6234,6 @@ do_pages(void)
 				      True,
 #endif
 				      &errflag)) {
-#if PS_GS
-			if (resource.gs_alpha) {
-			    /* restart gs so that user has a method for fixing GS artifacts with gs_alpha
-			       by using `reload' (see also GS_PIXMAP_CLEARING_HACK) */
-			    ps_destroy();
-			}
-#endif
 			statusline_info(STATUS_SHORT, "File reloaded.");
 		    }
 		    /* 		    else { */
@@ -6264,13 +6269,6 @@ do_pages(void)
 		can_exposures(&mane);
 		can_exposures(&magnifier);
 
-#if PS && PS_GS && GS_PIXMAP_CLEARING_HACK
-		if (had_ps_specials && !MAGNIFIER_ACTIVE) {
-		    erasepage_gs();
-		    had_ps_specials = False;
-		}
-#endif /* PS && PS_GS && GS_PIXMAP_CLEARING_HACK */
-
 		if (globals.dvi_file.bak_fp != NULL) {
 		    TRACE_EVENTS((stderr, "redraw_page()"));
 		    redraw_page();

texk/xdvik/gui/sfPath.c

@@ -199,13 +199,17 @@ SFreplaceText(SFDir *dir, char *str)
 {
     int len;
 
-    *(dir->path) = 0;
+    *(dir->path) = '\0';
     len = strlen(str);
+
     if (str[len - 1] == '/') {
 	(void)strcat(SFcurrentPath, str);
     }
     else {
-	(void)strncat(SFcurrentPath, str, len - 1);
+	char *p = SFcurrentPath + strlen(SFcurrentPath);
+
+	(void)memcpy(p, str, len - 1);
+	p[len - 1] = '\0';
     }
     /*     if (strncmp(SFcurrentPath, SFstartDir, strlen(SFstartDir))) { */
     /* 	SFsetText(SFcurrentPath); */

texk/xdvik/hypertex.c

@@ -902,7 +902,7 @@ add_anchor(struct htex_page_info *info, htexAnchorT type,
 	    if (str[0] != '#') {
 		info->anchors[info->curr_cnt].a_href = xmalloc(len + 2);
 		strcpy(info->anchors[info->curr_cnt].a_href, "#");
-		strncat(info->anchors[info->curr_cnt].a_href, str, len);
+		memcpy(info->anchors[info->curr_cnt].a_href + 1, str, len);
 		info->anchors[info->curr_cnt].a_href[len + 1] = '\0';
 	    }
 	    else {
@@ -924,7 +924,8 @@ add_anchor(struct htex_page_info *info, htexAnchorT type,
 	    else {
 		info->anchors[info->curr_cnt].a_href = xmalloc(len + strlen("file:") + 1);
 		strcpy(info->anchors[info->curr_cnt].a_href, "file:");
-		strncat(info->anchors[info->curr_cnt].a_href, str, len);
+		memcpy(info->anchors[info->curr_cnt].a_href + strlen("file:"),
+		    str, len);
 		info->anchors[info->curr_cnt].a_href[len + strlen("file:")] = '\0';
 	    }
 	}

texk/xdvik/main.c

@@ -455,8 +455,10 @@ is_good_dvi_file(const char *filename, Boolean from_history)
 
     if ((ret = REALPATH(real_filename, canonical_path)) == NULL) {
 	/* REALPATH failed, use real_filename */
-	strncpy(canonical_path, real_filename, MAXPATHLEN);
-	canonical_path[MAXPATHLEN] = '\0';
+	size_t n = strnlen(real_filename, MAXPATHLEN);
+
+	memcpy(canonical_path, real_filename, n);
+	canonical_path[n] = '\0';
 	ret = canonical_path;
     }
     free(real_filename);