Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit merge xmodmap 1.0.10, xrdb 1.2.0, and xstdcma...
details: https://anonhg.NetBSD.org/xsrc/rev/fbd588f3fccb
branches: trunk
changeset: 10123:fbd588f3fccb
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Mar 03 08:36:21 2019 +0000
description:
merge xmodmap 1.0.10, xrdb 1.2.0, and xstdcmap 1.0.4.
diffstat:
external/mit/xmodmap/dist/README | 29 ---
external/mit/xrdb/dist/README | 25 --
external/mit/xrdb/dist/xrdb.c | 16 +
external/mit/xstdcmap/dist/README | 28 --
external/mit/xstdcmap/dist/compile | 347 +++++++++++++++++++++++++++++++++++++
5 files changed, 363 insertions(+), 82 deletions(-)
diffs (truncated from 520 to 300 lines):
diff -r 2cef70f37f5f -r fbd588f3fccb external/mit/xmodmap/dist/README
--- a/external/mit/xmodmap/dist/README Sun Mar 03 08:35:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-The xmodmap program is used to edit and display the keyboard modifier
-map and keymap table that are used by client applications to convert
-event keycodes into keysyms. It is usually run from the user's
-session startup script to configure the keyboard according to personal
-tastes.
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/app/xmodmap
-
- http://cgit.freedesktop.org/xorg/app/xmodmap
-
-For patch submission instructions, see:
-
- http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
-
diff -r 2cef70f37f5f -r fbd588f3fccb external/mit/xrdb/dist/README
--- a/external/mit/xrdb/dist/README Sun Mar 03 08:35:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-xrdb - X server resource database utility
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/app/xrdb
-
- http://cgit.freedesktop.org/xorg/app/xrdb
-
-For patch submission instructions, see:
-
- http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
-
diff -r 2cef70f37f5f -r fbd588f3fccb external/mit/xrdb/dist/xrdb.c
--- a/external/mit/xrdb/dist/xrdb.c Sun Mar 03 08:35:10 2019 +0000
+++ b/external/mit/xrdb/dist/xrdb.c Sun Mar 03 08:36:21 2019 +0000
@@ -127,6 +127,7 @@
static const char * const cpp_locations[] = { CPP };
static const char *backup_suffix = BACKUP_SUFFIX;
static Bool dont_execute = False;
+static Bool show_cpp = False;
static String defines;
static size_t defines_base;
#define MAX_CMD_DEFINES 512
@@ -428,6 +429,8 @@
}
#endif
AppendToBuffer(b, buf, bytes);
+ if (show_cpp)
+ fwrite(buf, 1, bytes, stdout);
}
AppendToBuffer(b, "", 1);
}
@@ -779,6 +782,7 @@
" -n show but don't do changes\n"
" -cpp filename preprocessor to use [%s]\n"
" -nocpp do not use a preprocessor\n"
+ " -E show preprocessor command & processed input file\n"
" -query query resources\n"
" -load load resources from file [default]\n"
" -override add in resources from file\n"
@@ -962,6 +966,10 @@
cpp_program = argv[i];
continue;
}
+ else if (!strcmp("-E", arg)) {
+ show_cpp = True;
+ continue;
+ }
else if (!strcmp("-n", arg)) {
dont_execute = True;
continue;
@@ -1349,6 +1357,8 @@
if (asprintf(&cmd, "%s %s %s %s > %s", cpp_program, cpp_addflags,
includes.val, tmpname2, tmpname3) == -1)
fatal("%s: Out of memory\n", ProgramName);
+ if (show_cpp)
+ puts(cmd);
if (system(cmd) < 0)
fatal("%s: cannot run '%s'\n", ProgramName, cmd);
free(cmd);
@@ -1364,6 +1374,8 @@
if (asprintf(&cmd, "%s %s %s", cpp_program, cpp_addflags,
includes.val) == -1)
fatal("%s: Out of memory\n", ProgramName);
+ if (show_cpp)
+ puts(cmd);
if (!(input = popen(cmd, "r")))
fatal("%s: cannot run '%s'\n", ProgramName, cmd);
free(cmd);
@@ -1382,6 +1394,8 @@
cpp_addflags, includes.val, defines.val,
filename ? filename : "", tmpname3) == -1)
fatal("%s: Out of memory\n", ProgramName);
+ if (show_cpp)
+ puts(cmd);
if (system(cmd) < 0)
fatal("%s: cannot run '%s'\n", ProgramName, cmd);
free(cmd);
@@ -1392,6 +1406,8 @@
cpp_addflags, includes.val, defines.val,
filename ? filename : "") == -1)
fatal("%s: Out of memory\n", ProgramName);
+ if (show_cpp)
+ puts(cmd);
if (!(input = popen(cmd, "r")))
fatal("%s: cannot run '%s'\n", ProgramName, cmd);
free(cmd);
diff -r 2cef70f37f5f -r fbd588f3fccb external/mit/xstdcmap/dist/README
--- a/external/mit/xstdcmap/dist/README Sun Mar 03 08:35:10 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-The xstdcmap utility can be used to selectively define standard colormap
-properties. It is intended to be run from a user's X startup script to
-create standard colormap definitions in order to facilitate sharing of
-scarce colormap resources among clients using PseudoColor visuals.
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/app/xstdcmap
-
- http://cgit.freedesktop.org/xorg/app/xstdcmap
-
-For patch submission instructions, see:
-
- http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
-
diff -r 2cef70f37f5f -r fbd588f3fccb external/mit/xstdcmap/dist/compile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xstdcmap/dist/compile Sun Mar 03 08:36:21 2019 +0000
@@ -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 <tromey%cygnus.com@localhost>.
+#
+# 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 <bug-automake%gnu.org@localhost> or send patches to
+# <automake-patches%gnu.org@localhost>.
+
+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
+}
+
Home |
Main Index |
Thread Index |
Old Index