[xsrc/trunk]: xsrc/external/mit/libX11/dist merge libX11 1.8.4.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/bb4c5eff0987
branches:  trunk
changeset: 7409:bb4c5eff0987
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Feb 05 22:58:20 2023 +0000

description:
merge libX11 1.8.4.

diffstat:

 external/mit/libX11/dist/ChangeLog                   |    113 +
 external/mit/libX11/dist/aclocal.m4                  |   2342 +-
 external/mit/libX11/dist/configure                   |  16504 +++++++---------
 external/mit/libX11/dist/configure.ac                |      4 +-
 external/mit/libX11/dist/include/X11/Xlibint.h       |      9 +-
 external/mit/libX11/dist/m4/libtool.m4               |    227 +-
 external/mit/libX11/dist/m4/ltoptions.m4             |      4 +-
 external/mit/libX11/dist/m4/ltsugar.m4               |      2 +-
 external/mit/libX11/dist/m4/ltversion.m4             |     13 +-
 external/mit/libX11/dist/m4/lt~obsolete.m4           |      4 +-
 external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre |    128 +-
 external/mit/libX11/dist/src/ChkIfEv.c               |      5 +-
 external/mit/libX11/dist/src/IfEvent.c               |      5 +-
 external/mit/libX11/dist/src/PeekIfEv.c              |      5 +-
 external/mit/libX11/dist/src/PutBEvent.c             |     15 +-
 external/mit/libX11/dist/src/locking.c               |     65 +-
 16 files changed, 9018 insertions(+), 10427 deletions(-)

diffs (truncated from 26575 to 300 lines):

diff -r 4b8492dff683 -r bb4c5eff0987 external/mit/libX11/dist/ChangeLog
--- a/external/mit/libX11/dist/ChangeLog        Sun Feb 05 22:57:26 2023 +0000
+++ b/external/mit/libX11/dist/ChangeLog        Sun Feb 05 22:58:20 2023 +0000
@@ -1,3 +1,116 @@
+commit fc5ec8edda1efdf5d66db4e76796e3c407527b3b
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date:   Sat Feb 4 12:02:29 2023 -0800
+
+    libX11 1.8.4
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit ba548ed1688d4d5a83913218155d0ddf616ff176
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date:   Sun Jan 15 11:39:20 2023 -0800
+
+    configure: options summary should say "libX11", not just "X11"
+    
+    We're not configuring the entire window system here, just one library
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit eb1c272ab5230d548077b9f59aca4b3457c3a8f8
+Author: GaryOderNichts <garyodernichts%gmail.com@localhost>
+Date:   Sat Dec 17 16:28:40 2022 +0100
+
+    Fix a9e845 and 797755 Allow X*IfEvent() to reenter libX11
+
+commit 0c7c4ce875ea65160705180ebb68a2c88afb678e
+Author: Benno Schulenberg <bensberg%telfort.nl@localhost>
+Date:   Thu Nov 3 17:25:29 2022 +0100
+
+    nls: add two compose sequences for capital B with stroke, for consistency
+    
+    Two compose sequences (with plain ASCII characters) existed for
+    the lowercase b with stroke (ƀ) but not for the capital one (Ƀ).
+    
+    This addresses part of issue #166.
+    
+    Reported-by: J. McWilliams
+    
+    Signed-off-by: Benno Schulenberg <bensberg%telfort.nl@localhost>
+
+commit a80ef097e713aba0330b9cf9f3c1e309084b926f
+Author: Benno Schulenberg <bensberg%telfort.nl@localhost>
+Date:   Thu Nov 3 16:48:03 2022 +0100
+
+    nls: delete twelve compose sequences that cannot be typed
+    
+    There is not any keyboard layout (in xkeyboard-config) that contains
+    `obelowdot` or `ubelowdot`, so having compose sequences that use these
+    symbols is pointless.
+    
+    There are some layouts that contain `otilde` (and one that contains
+    `utilde`), but those layouts then do not contain `dead_horn`, so
+    the compose sequences that combine the two symbols are pointless.
+    
+    There are a few layouts that contain U+0256, U+025C, U+025F or U+0279,
+    but those layouts do not contain `dead_hook`, so the compose sequences
+    that combine the latter with one of the former are pointless.
+    
+    Signed-off-by: Benno Schulenberg <bensberg%telfort.nl@localhost>
+
+commit 078cc39f05ddfd6166762f3166129258ddd07dd3
+Author: Benno Schulenberg <bensberg%telfort.nl@localhost>
+Date:   Thu Nov 3 16:31:04 2022 +0100
+
+    nls: delete 88 compose sequences that have the accents in the wrong order
+    
+    The various compose sequences with the accents in their proper order
+    (the highest placed accent first) continue to exist.
+    
+    Signed-off-by: Benno Schulenberg <bensberg%telfort.nl@localhost>
+
+commit aa5ef0ba80558f946871f574d38a15673e66221e
+Author: Benno Schulenberg <bensberg%telfort.nl@localhost>
+Date:   Thu Nov 3 16:27:51 2022 +0100
+
+    nls: move the compose sequences for Ș and Ț to the fitting Unicode block
+    
+    This addresses a side note of issue #166.
+    
+    Reported-by: J. McWilliams
+    
+    Signed-off-by: Benno Schulenberg <bensberg%telfort.nl@localhost>
+
+commit 82c25879b72f1ba7e9abe00e7bad55add33135cf
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date:   Wed Jan 4 11:25:48 2023 -0800
+
+    xlibi18n: Update Imake instructions to autoconf equivalent in comments
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 88399e01be679bfcc9a5e8922ffe2c47f0e56dee
+Author: Yuxuan Shui <yshuiv7%gmail.com@localhost>
+Date:   Tue Jan 3 15:09:28 2023 +0000
+
+    Revert "Update XPutBackEvent() to support clients that put back unpadded events"
+    
+    This reverts commit d6d6cba90215d323567fef13d6565756c9956f60.
+    
+    The reverted commit intended to fix the problem where an unpadded X
+    event struct is passed into XPutBackEvent, by creating a padded struct
+    with _XEventToWire and _XWireToEvent. However, _XWireToEvent updates the
+    last sequence number in Display, which may cause xlib to complain about
+    lost sequence numbers.
+    
+    IMO, the problem that commit tried to solve is a bug in the client
+    library, and workaround it inside Xlib is bad practice, especially given
+    the problem it caused. Plus, the offender cited in the original commit
+    message, freeglut, has already fixed this problem.
+    
+    Fixes: #176 #174
+    
+    Signed-off-by: Yuxuan Shui <yshuiv7%gmail.com@localhost>
+
 commit 48487c4b9028e9eec5371742f51e1d64c2e17296
 Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
 Date:   Thu Dec 15 14:52:20 2022 -0800
diff -r 4b8492dff683 -r bb4c5eff0987 external/mit/libX11/dist/aclocal.m4
--- a/external/mit/libX11/dist/aclocal.m4       Sun Feb 05 22:57:26 2023 +0000
+++ b/external/mit/libX11/dist/aclocal.m4       Sun Feb 05 22:58:20 2023 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,1140 +14,12 @@
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
-[m4_warning([this file was generated for autoconf 2.71.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.16.5], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.5])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],