[xsrc/trunk]: xsrc/external/mit/setxkbmap/dist initial import of setxkbmap-1.3.4

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

details:   https://anonhg.NetBSD.org/xsrc/rev/df707d6c6a13
branches:  trunk
changeset: 7535:df707d6c6a13
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jun 19 07:31:00 2023 +0000

description:
initial import of setxkbmap-1.3.4

diffstat:

 external/mit/setxkbmap/dist/ChangeLog    |    61 +-
 external/mit/setxkbmap/dist/aclocal.m4   |  2330 +++++++++++++++--------------
 external/mit/setxkbmap/dist/config.guess |    50 +-
 external/mit/setxkbmap/dist/config.sub   |    22 +-
 external/mit/setxkbmap/dist/configure    |    20 +-
 external/mit/setxkbmap/dist/configure.ac |     2 +-
 external/mit/setxkbmap/dist/setxkbmap.c  |    21 +-
 7 files changed, 1334 insertions(+), 1172 deletions(-)

diffs (truncated from 2770 to 300 lines):

diff -r 3b42cb9bd2e9 -r df707d6c6a13 external/mit/setxkbmap/dist/ChangeLog
--- a/external/mit/setxkbmap/dist/ChangeLog     Mon Jun 19 07:23:39 2023 +0000
+++ b/external/mit/setxkbmap/dist/ChangeLog     Mon Jun 19 07:31:00 2023 +0000
@@ -1,3 +1,60 @@
+commit 094d979324efca8bbb2ad3756ee947c2d2b41a79
+Author: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+Date:   Mon May 15 11:55:03 2023 +1000
+
+    setxkbmap 1.3.4
+
+commit 2d3ed3d74cdd4ef6dcf503162a72243ce7a96fb0
+Author: Olivier Fourdan <ofourdan%redhat.com@localhost>
+Date:   Tue May 9 09:33:36 2023 +0200
+
+    Check for the XWAYLAND extension
+    
+    With Xwayland 23.1 and above, the definitive way of checking for an
+    Xwayland server is to check for the "XWAYLAND" extension.
+    
+    Keep the old XRandR method for compatibility with older versions of
+    Xwayland.
+    
+    Signed-off-by: Olivier Fourdan <ofourdan%redhat.com@localhost>
+
+commit 9fa24c7ca57665f15dcd1cbe02208bd727e507f7
+Author: Olivier Fourdan <ofourdan%redhat.com@localhost>
+Date:   Tue May 9 09:23:26 2023 +0200
+
+    Fix "Xwayland" spelling
+    
+    It's Xwayland, not XWayland.
+    
+    Signed-off-by: Olivier Fourdan <ofourdan%redhat.com@localhost>
+
+commit 32fa355d4d3b9945d02acc776a57feb17c2bcc50
+Author: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+Date:   Wed Nov 16 11:47:40 2022 +1000
+
+    Route the Xwayland warning through stderr
+    
+    Otherwise we cannot pipe setxkmap -print into anything
+
+commit dbde2b209b70d9cdc8a66e3cc73e2d28a8e13797
+Author: Julien Cristau <jcristau%debian.org@localhost>
+Date:   Mon Apr 25 15:41:26 2022 +0200
+
+    Be more careful about querying randr
+    
+    Check for extension version and number of outputs:
+    XRRGetScreenResourcesCurrent was added in v1.3.  Also, there's no
+    guarantee it returns any outputs, and we don't want to die with a
+    BadRROutput error.
+
+commit 818582b435bc1807b87e547e53c488986286ff1f
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date:   Mon Apr 25 09:12:16 2022 -0700
+
+    gitlab CI: stop requiring Signed-off-by in commits
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
 commit ac1a150bb7c6af8377074e946f1ca6233a345ac9
 Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
 Date:   Sun Apr 3 13:42:22 2022 -0700
@@ -204,7 +261,7 @@ Date:   Thu Aug 29 12:18:20 2013 +0200
     Signed-off-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
 
 commit f5ffd59830ff5f4a4f337d56e7e8b4a1930a46e8
-Author: Stéphane Aulery  <lkppo%free.fr@localhost>
+Author: Stéphane Aulery <lkppo%free.fr@localhost>
 Date:   Tue Jul 2 00:06:55 2013 +0200
 
     Ensure consistency between the manpage and the output of the -h option
@@ -1005,7 +1062,7 @@ Date:   Wed Jul 20 19:31:50 2005 +0000
         configure cache, you cache it, and the cached value is probably wrong.
 
 commit e04d3454c2e7b0390ccf61d9f6e0ca3d2a04dfb6
-Author: Søren Sandmann Pedersen  <sandmann%daimi.au.dk@localhost>
+Author: Søren Sandmann Pedersen <sandmann%daimi.au.dk@localhost>
 Date:   Wed Jul 6 20:33:26 2005 +0000
 
     Build system for setxkbmap
diff -r 3b42cb9bd2e9 -r df707d6c6a13 external/mit/setxkbmap/dist/aclocal.m4
--- a/external/mit/setxkbmap/dist/aclocal.m4    Mon Jun 19 07:23:39 2023 +0000
+++ b/external/mit/setxkbmap/dist/aclocal.m4    Mon Jun 19 07:31:00 2023 +0000
@@ -20,1137 +20,9 @@ You have another version of autoconf.  I
 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'],
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf