Module Name: xsrc
Committed By: mrg
Date: Mon Jul 15 04:54:48 UTC 2019
Modified Files:
xsrc/external/mit/xbiff/include: config.h
xsrc/external/mit/xclock/dist: Clock.c
xsrc/external/mit/xman/dist: misc.c
xsrc/external/mit/xwininfo/dist: xwininfo.c
xsrc/external/mit/xwininfo/include: config.h
Added Files:
xsrc/external/mit/xbiff/dist: compile
Removed Files:
xsrc/external/mit/setxkbmap/dist: README
xsrc/external/mit/xbiff/dist: README
xsrc/external/mit/xman/dist: README
xsrc/external/mit/xwininfo/dist: README
Log Message:
merge setxkbmap 1.3.2, xbiff 1.0.4, xclock 1.0.9, xman 1.1.5, and
xwininfo 1.1.5.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/setxkbmap/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xbiff/dist/README
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xbiff/dist/compile
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xbiff/include/config.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xclock/dist/Clock.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xman/dist/README
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xman/dist/misc.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xwininfo/dist/README
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xwininfo/dist/xwininfo.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xwininfo/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xbiff/include/config.h
diff -u xsrc/external/mit/xbiff/include/config.h:1.1 xsrc/external/mit/xbiff/include/config.h:1.2
--- xsrc/external/mit/xbiff/include/config.h:1.1 Mon Feb 21 04:38:54 2011
+++ xsrc/external/mit/xbiff/include/config.h Mon Jul 15 04:54:47 2019
@@ -44,7 +44,7 @@
#define PACKAGE_NAME "xbiff"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xbiff 1.0.3"
+#define PACKAGE_STRING "xbiff 1.0.4"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xbiff"
@@ -53,7 +53,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.3"
+#define PACKAGE_VERSION "1.0.4"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 1
@@ -62,10 +62,10 @@
#define PACKAGE_VERSION_MINOR 0
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 3
+#define PACKAGE_VERSION_PATCHLEVEL 4
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.0.3"
+#define VERSION "1.0.4"
Index: xsrc/external/mit/xclock/dist/Clock.c
diff -u xsrc/external/mit/xclock/dist/Clock.c:1.2 xsrc/external/mit/xclock/dist/Clock.c:1.3
--- xsrc/external/mit/xclock/dist/Clock.c:1.2 Mon Mar 4 08:28:59 2019
+++ xsrc/external/mit/xclock/dist/Clock.c Mon Jul 15 04:54:47 2019
@@ -613,7 +613,7 @@ Initialize (Widget request, Widget new,
}
#endif /* NO_I18N */
- (void) gettimeofday(&tv, NULL);
+ X_GETTIMEOFDAY(&tv);
tm = *localtime(&tv.tv_sec);
str = TimeString (w, &tm);
len = strlen(str);
@@ -1611,7 +1611,7 @@ clock_tic(XtPointer client_data, XtInter
}
if (w->clock.show_second_hand &&
(tm.tm_sec != w->clock.otm.tm_sec ||
- tv.tv_usec != w->clock.otv.tv_usec))
+ tv.tv_usec != w->clock.otv.tv_usec))
{
RenderSec (w, &w->clock.otm, &w->clock.otv, False);
RenderSec (w, &tm, &tv, False);
@@ -2173,7 +2173,7 @@ SetValues(Widget gcurrent, Widget greque
if (new->clock.update && XtIsRealized( (Widget) new))
new->clock.interval_id = XtAppAddTimeOut(
XtWidgetToApplicationContext(gnew),
- fabsl(new->clock.update)*1000,
+ fabsf(new->clock.update)*1000,
clock_tic, (XtPointer)gnew);
new->clock.show_second_hand =(fabsl(new->clock.update) <= SECOND_HAND_TIME);
Index: xsrc/external/mit/xman/dist/misc.c
diff -u xsrc/external/mit/xman/dist/misc.c:1.8 xsrc/external/mit/xman/dist/misc.c:1.9
--- xsrc/external/mit/xman/dist/misc.c:1.8 Sun Apr 24 17:36:11 2016
+++ xsrc/external/mit/xman/dist/misc.c Mon Jul 15 04:54:48 2019
@@ -667,6 +667,13 @@ static Boolean
ConstructCommand(char *cmdbuf, const char *path,
const char *filename, const char *tempfile)
{
+#ifdef HAVE_MANDB
+ int used = snprintf(cmdbuf, BUFSIZ, "man -l %s > %s 2>/dev/null",
+ filename, tempfile);
+ if (used >= BUFSIZ - 1)
+ return FALSE;
+ return TRUE;
+#else
/* The original code did the following to produce a command line:
* sprintf(cmdbuf,"cd %s ; %s %s %s > %s %s", path, TBL,
* filename, FORMAT, man_globals->tempfile, "2> /dev/null");
@@ -789,6 +796,7 @@ ConstructCommand(char *cmdbuf, const cha
return (FALSE);
return (TRUE);
+#endif /* man-db */
}
#endif /* HANDLE_ROFFSEQ */
Index: xsrc/external/mit/xwininfo/dist/xwininfo.c
diff -u xsrc/external/mit/xwininfo/dist/xwininfo.c:1.6 xsrc/external/mit/xwininfo/dist/xwininfo.c:1.7
--- xsrc/external/mit/xwininfo/dist/xwininfo.c:1.6 Sun Mar 11 08:55:27 2018
+++ xsrc/external/mit/xwininfo/dist/xwininfo.c Mon Jul 15 04:54:48 2019
@@ -285,25 +285,25 @@ usage (void)
fprintf (stderr,
"usage: %s [-options ...]\n\n"
"where options include:\n"
- " -help print this message\n"
- " -version print version message\n"
- " -display host:dpy X server to contact\n"
- " -root use the root window\n"
- " -id windowid use the window with the specified id\n"
- " -name windowname use the window with the specified name\n"
- " -int print window id in decimal\n"
- " -children print parent and child identifiers\n"
- " -tree print children identifiers recursively\n"
- " -stats print window geometry [DEFAULT]\n"
- " -bits print window pixel information\n"
- " -events print events selected for on window\n"
- " -size print size hints\n"
- " -wm print window manager hints\n"
- " -shape print shape extents\n"
- " -frame don't ignore window manager frames\n"
- " -english print sizes in english units\n"
- " -metric print sizes in metric units\n"
- " -all -tree, -stats, -bits, -events, -wm, -size, -shape\n"
+ " -help print this message\n"
+ " -version print version message\n"
+ " -d[isplay] <host:dpy> X server to contact\n"
+ " -root use the root window\n"
+ " -id <wdid> use the window with the specified id\n"
+ " -name <wdname> use the window with the specified name\n"
+ " -int print window id in decimal\n"
+ " -children print parent and child identifiers\n"
+ " -tree print children identifiers recursively\n"
+ " -stats print window geometry [DEFAULT]\n"
+ " -bits print window pixel information\n"
+ " -events print events selected for on window\n"
+ " -size print size hints\n"
+ " -wm print window manager hints\n"
+ " -shape print shape extents\n"
+ " -frame don't ignore window manager frames\n"
+ " -english print sizes in english units\n"
+ " -metric print sizes in metric units\n"
+ " -all -tree, -stats, -bits, -events, -wm, -size, -shape\n"
"\n",
program_name);
exit (1);
@@ -716,7 +716,7 @@ wm_size_hints_reply (xcb_connection_t *w
wm_size_hints_t *hints_return, xcb_generic_error_t **wshr_err)
{
xcb_get_property_reply_t *prop = xcb_get_property_reply (wshr_dpy, cookie, wshr_err);
- int length;
+ size_t length;
if (!prop || (prop->type != XCB_ATOM_WM_SIZE_HINTS) ||
(prop->format != 32)) {
@@ -726,7 +726,7 @@ wm_size_hints_reply (xcb_connection_t *w
memset (hints_return, 0, sizeof(wm_size_hints_t));
- length = xcb_get_property_value_length(prop);
+ length = (size_t) xcb_get_property_value_length(prop);
if (length > sizeof(wm_size_hints_t))
length = sizeof(wm_size_hints_t);
memcpy (hints_return, xcb_get_property_value (prop), length);
@@ -1224,7 +1224,7 @@ static const binding _event_mask_names[]
static void
Display_Event_Mask (long mask)
{
- long bit, bit_mask;
+ unsigned long bit, bit_mask;
for (bit=0, bit_mask=1; bit < sizeof(long)*8; bit++, bit_mask <<= 1)
if (mask & bit_mask)
@@ -1620,7 +1620,7 @@ wm_hints_reply (xcb_connection_t *whr_dp
wm_hints_t *hints_return, xcb_generic_error_t **whr_err)
{
xcb_get_property_reply_t *prop = xcb_get_property_reply (whr_dpy, cookie, whr_err);
- int length;
+ size_t length;
if (!prop || (prop->type != XCB_ATOM_WM_HINTS) || (prop->format != 32)) {
free (prop);
@@ -1629,7 +1629,7 @@ wm_hints_reply (xcb_connection_t *whr_dp
memset (hints_return, 0, sizeof(wm_hints_t));
- length = xcb_get_property_value_length(prop);
+ length = (size_t) xcb_get_property_value_length(prop);
if (length > sizeof(wm_hints_t))
length = sizeof(wm_hints_t);
memcpy (hints_return, xcb_get_property_value (prop), length);
@@ -1836,7 +1836,8 @@ static int
is_valid_utf8 (const char *string, size_t len)
{
unsigned long codepoint;
- int rem, i;
+ int rem;
+ size_t i;
unsigned char c;
rem = 0;
Index: xsrc/external/mit/xwininfo/include/config.h
diff -u xsrc/external/mit/xwininfo/include/config.h:1.4 xsrc/external/mit/xwininfo/include/config.h:1.5
--- xsrc/external/mit/xwininfo/include/config.h:1.4 Sat Nov 20 23:25:41 2010
+++ xsrc/external/mit/xwininfo/include/config.h Mon Jul 15 04:54:48 2019
@@ -47,7 +47,7 @@
#define PACKAGE_NAME "xwininfo"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xwininfo 1.1.1"
+#define PACKAGE_STRING "xwininfo 1.1.5"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xwininfo"
@@ -56,7 +56,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.1"
+#define PACKAGE_VERSION "1.1.5"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 1
@@ -65,7 +65,7 @@
#define PACKAGE_VERSION_MINOR 1
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 1
+#define PACKAGE_VERSION_PATCHLEVEL 5
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -97,7 +97,7 @@
/* #undef USE_XCB_ICCCM */
/* Version number of package */
-#define VERSION "1.1.1"
+#define VERSION "1.1.5"
/* Define to 1 if on MINIX. */
/* #undef _MINIX */
Added files:
Index: xsrc/external/mit/xbiff/dist/compile
diff -u /dev/null xsrc/external/mit/xbiff/dist/compile:1.3
--- /dev/null Mon Jul 15 04:54:48 2019
+++ xsrc/external/mit/xbiff/dist/compile Mon Jul 15 04:54:47 2019
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <[email protected]>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <[email protected]> or send patches to
+# <[email protected]>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" "" $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv "$2"
+ set x "$@" -Fo"$file"
+ shift
+ ;;
+ *)
+ func_file_conv "$2"
+ set x "$@" -Fe"$file"
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -I*)
+ func_file_conv "${1#-I}" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -l*)
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
+ -L*)
+ func_cl_dashL "${1#-L}"
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs="$IFS"; IFS=','
+ for flag in $arg; do
+ IFS="$save_ifs"
+ linker_opts="$linker_opts $flag"
+ done
+ IFS="$save_ifs"
+ ;;
+ -Xlinker)
+ eat=1
+ linker_opts="$linker_opts $2"
+ ;;
+ -*)
+ set x "$@" "$1"
+ shift
+ ;;
+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+ func_file_conv "$1"
+ set x "$@" -Tp"$file"
+ shift
+ ;;
+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+ func_file_conv "$1" mingw
+ set x "$@" "$file"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
+case $1 in
+ '')
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <[email protected]>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ # So we strip '-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no '-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # '.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
