Update libxkbfile to version 1.1.1

16 files changed, 206 insertions, 93 deletions

diff --git a/lib/libxkbfile/ChangeLog b/lib/libxkbfile/ChangeLog
index a5fd33637..fda7c33cf 100644
--- a/lib/libxkbfile/ChangeLog
+++ b/lib/libxkbfile/ChangeLog
@@ -1,3 +1,114 @@
+commit f855ea9cf3aecc74c3b07da924ff2e36944e4be1
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Mon Oct 17 19:00:30 2022 -0700
+
+    libxkbfile 1.1.1
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 04336c9260b2d130f57fcf3dedc3ba73bb45889d
+Author: Ran Benita <ran234@gmail.com>
+Date:   Wed Aug 29 12:33:33 2012 +0300
+
+    Fix check for appending '|' character when applying rules
+    
+    There are two ways to separate multiple files in XKB include statements:
+    '+' will cause the later file to override the first in case of conflict,
+    while '|' will cause it augment it (this is done by xkbcomp). '!' is
+    unrelated here.
+    Currently, if someone tries to use '|' in a rule instead of '+', it
+    won't have any effect. Since '|' is practically never used, this wasn't
+    noticed.
+    
+    Signed-off-by: Ran Benita <ran234@gmail.com>
+
+commit 6fa239504743475d566f53c278dae0f651ea199c
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jul 17 15:41:39 2022 -0700
+
+    gitlab CI: add a basic build test
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 4939a3e9d584ab46f1d082f6a61b3cd307614150
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jul 17 15:40:34 2022 -0700
+
+    Fix spelling/wording issues
+    
+    Found by using:
+        codespell --builtin clear,rare,usage,informal,code,names
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 849d0b22ec46bee1f72170722bde8d493ce163ba
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jul 17 15:39:10 2022 -0700
+
+    Build xz tarballs instead of bzip2
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e51e5c704c5bd7a91233b37f0cf4beaef6f06a5d
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date:   Sun Jun 5 09:15:05 2022 +0200
+
+    fix an off-by-one error in copying the name of a virtual modifier
+    
+    This fixes issue #9.
+    
+    Bug existed since commit 816a8db326 from sixteen years ago.
+    
+    Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+
+commit 8e45c7f55dcb35ae710a223a28fb6d6443c711c6
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Sep 2 14:19:44 2020 +1000
+
+    unifdef NOTYET
+    
+    This has been ifdef'd out since at least 2003, time to accept that it won't be
+    handled. One part was unreachable code anyway, the second part affects
+    GeomDoodads which are unnecessary and barely used anyway.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 81e8b72daf3ad0a3f36e4ae0ef6b38e427e251b5
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Jun 19 14:34:51 2020 +1000
+
+    Escape non-printable characters correctly
+    
+    This is the equivalent patch to xserver commit
+    eaf1f72ed8994b708d94ec2de7b1a99f5c4a39b8:
+    
+     XkbStringText escapes non-printable characters using octal numbers. Such escape
+     sequence would be at most 5 characters long ("\0123"), so it reserves 5 bytes
+     in the buffer. Due to char->unsigned int conversion, it would print much longer
+     string for negative numbers.
+    
+    Fixes https://gitlab.freedesktop.org/xorg/lib/libxkbfile/-/issues/8
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 6c4de3386ee102040fc567708958a60a9d254b02
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Mar 29 19:07:43 2019 -0700
+
+    Convert check for strcasecmp to normal autoconf style
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 2d017a68e12acf2463edc9cfbdae0aea3ce477b1
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Mar 29 19:02:51 2019 -0700
+
+    Use strndup if available to avoid -Wstringop-overflow warning from gcc 9
+    
+    Reported in https://gitlab.freedesktop.org/xorg/lib/libxkbfile/issues/5
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
 commit 261992d42905f209cd5bf6afcf8a7ae3aa30b3ff
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Sat Mar 16 11:30:41 2019 -0700
@@ -131,7 +242,7 @@ Date:   Thu Apr 30 22:24:39 2015 -0700
     Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 
 commit 9fa04388dcbb5bf205319569f540a62c03754688
-Author: Jörg Sonnenberger <joerg@NetBSD.org>
+Author: Jörg Sonnenberger  <joerg@NetBSD.org>
 Date:   Wed Nov 26 14:33:38 2014 +0100
 
     Remove unnecessary check.
@@ -766,20 +877,20 @@ Date:   Sat Jul 2 06:35:04 2005 +0000
     Add appropriate lib*_CFLAGS to Makefile.am's -- fixes build problems
 
 commit e5ddd6b3020045b7d8426618fd2515bc02ca045d
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Mon Jun 13 22:54:28 2005 +0000
 
     Makefile.am: Add $(top_srcdir)/include to INCLUDES
 
 commit 019fc282d476d3dd8f79e0472d3868f6a0785a56
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Mon Jun 13 21:51:46 2005 +0000
 
     Add xkbfile to symlink.sh, conditionally include "config.h" in
         xc/lib/xkbfile
 
 commit 43a2d4898c64c11101b500ab12466570d747ce5f
-Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Author: Søren Sandmann Pedersen  <sandmann@daimi.au.dk>
 Date:   Mon Jun 13 21:49:05 2005 +0000
 
     - Add xkbfile build system
diff --git a/lib/libxkbfile/Makefile.in b/lib/libxkbfile/Makefile.in
index 39d0f4dcc..48cdf95c8 100644
--- a/lib/libxkbfile/Makefile.in
+++ b/lib/libxkbfile/Makefile.in
@@ -186,9 +186,9 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
 GZIP_ENV = --best
-DIST_TARGETS = dist-bzip2 dist-gzip
+DIST_TARGETS = dist-xz dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -324,6 +324,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -629,6 +630,7 @@ distdir: $(DISTFILES)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
+
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__post_remove_distdir)
@@ -636,7 +638,6 @@ dist-bzip2: distdir
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__post_remove_distdir)
-
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
diff --git a/lib/libxkbfile/README.md b/lib/libxkbfile/README.md
index dcd225114..e5dbf053c 100644
--- a/lib/libxkbfile/README.md
+++ b/lib/libxkbfile/README.md
@@ -9,7 +9,7 @@ Xorg mailing list:
 
   https://lists.x.org/mailman/listinfo/xorg
 
-The master development code repository can be found at:
+The primary development code repository can be found at:
 
   https://gitlab.freedesktop.org/xorg/lib/libxkbfile
 
diff --git a/lib/libxkbfile/aclocal.m4 b/lib/libxkbfile/aclocal.m4
index e7052124f..ff9ff5994 100644
--- a/lib/libxkbfile/aclocal.m4
+++ b/lib/libxkbfile/aclocal.m4
@@ -8606,9 +8606,9 @@ m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
 m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
 m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
 
-dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29.1)
-dnl
+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
+
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
 dnl
@@ -8649,7 +8649,7 @@ dnl
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.1])
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
 m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
     [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
 ])dnl PKG_PREREQ
@@ -8750,7 +8750,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 
 pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
 
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -8760,11 +8760,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
+        else
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -8781,7 +8781,7 @@ installed software in a non-standard prefix.
 _PKG_TEXT])[]dnl
         ])
 elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no])
 	m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
diff --git a/lib/libxkbfile/compile b/lib/libxkbfile/compile
index a85b723c7..df363c8fb 100644
--- a/lib/libxkbfile/compile
+++ b/lib/libxkbfile/compile
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # 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/>.
+# along with this program.  If not, see <https://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
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	    file_conv=cygwin
 	    ;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/lib/libxkbfile/config.h.in b/lib/libxkbfile/config.h.in
index b1dcb7b20..2ff436242 100644
--- a/lib/libxkbfile/config.h.in
+++ b/lib/libxkbfile/config.h.in
@@ -15,12 +15,18 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
+/* Define to 1 if you have the `strndup' function. */
+#undef HAVE_STRNDUP
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
@@ -37,9 +43,6 @@
    */
 #undef LT_OBJDIR
 
-/* Do not have 'strcasecmp'. */
-#undef NEED_STRCASECMP
-
 /* Name of package */
 #undef PACKAGE
 
diff --git a/lib/libxkbfile/configure b/lib/libxkbfile/configure
index 341fda182..55e7957d4 100644
--- a/lib/libxkbfile/configure
+++ b/lib/libxkbfile/configure
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libxkbfile 1.1.0.
+# Generated by GNU Autoconf 2.69 for libxkbfile 1.1.1.
 #
-# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxkbfile/issues>.
+# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxkbfile/-/issues>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -275,7 +275,7 @@ fi
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: https://gitlab.freedesktop.org/xorg/lib/libxkbfile/issues
+$0: https://gitlab.freedesktop.org/xorg/lib/libxkbfile/-/issues
 $0: about your system, including any error possibly output
 $0: before this message. Then install a modern shell, or
 $0: manually run the script under such a shell if you do
@@ -591,9 +591,9 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libxkbfile'
 PACKAGE_TARNAME='libxkbfile'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='libxkbfile 1.1.0'
-PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libxkbfile/issues'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='libxkbfile 1.1.1'
+PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libxkbfile/-/issues'
 PACKAGE_URL=''
 
 ac_unique_file="Makefile.am"
@@ -757,6 +757,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -844,6 +845,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1096,6 +1098,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1233,7 +1244,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1346,7 +1357,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 libxkbfile 1.1.0 to adapt to many kinds of systems.
+\`configure' configures libxkbfile 1.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1386,6 +1397,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1416,7 +1428,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libxkbfile 1.1.0:";;
+     short | recursive ) echo "Configuration of libxkbfile 1.1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1476,7 +1488,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxkbfile/issues>.
+Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxkbfile/-/issues>.
 _ACEOF
 ac_status=$?
 fi
@@ -1539,7 +1551,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libxkbfile configure 1.1.0
+libxkbfile configure 1.1.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1863,7 +1875,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 libxkbfile $as_me 1.1.0, which was
+It was created by libxkbfile $as_me 1.1.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2692,7 +2704,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libxkbfile'
- VERSION='1.1.0'
+ VERSION='1.1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17557,14 +17569,17 @@ AM_BACKSLASH='\'
 
 
 # Checks for library functions.
-ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
-if test "x$ac_cv_func_strcasecmp" = xyes; then :
-
-else
-
-$as_echo "#define NEED_STRCASECMP 1" >>confdefs.h
+for ac_func in strcasecmp strndup
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 ac_fn_c_check_func "$LINENO" "getc_unlocked" "ac_cv_func_getc_unlocked"
 if test "x$ac_cv_func_getc_unlocked" = xyes; then :
@@ -17574,11 +17589,11 @@ $as_echo "#define HAVE_UNLOCKED_STDIO 1" >>confdefs.h
 fi
 
 
-# Obtain compiler/linker options for depedencies
+# Obtain compiler/linker options for dependencies
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XKBFILE" >&5
-$as_echo_n "checking for XKBFILE... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x11 kbproto" >&5
+$as_echo_n "checking for x11 kbproto... " >&6; }
 
 if test -n "$XKBFILE_CFLAGS"; then
     pkg_cv_XKBFILE_CFLAGS="$XKBFILE_CFLAGS"
@@ -17618,7 +17633,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -17645,7 +17660,7 @@ Alternatively, you may set the environment variables XKBFILE_CFLAGS
 and XKBFILE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -18203,7 +18218,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 libxkbfile $as_me 1.1.0, which was
+This file was extended by libxkbfile $as_me 1.1.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18263,13 +18278,13 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxkbfile/issues>."
+Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxkbfile/-/issues>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libxkbfile config.status 1.1.0
+libxkbfile config.status 1.1.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/lib/libxkbfile/configure.ac b/lib/libxkbfile/configure.ac
index 86b78333a..51dc3bfff 100644
--- a/lib/libxkbfile/configure.ac
+++ b/lib/libxkbfile/configure.ac
@@ -22,13 +22,14 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libxkbfile], [1.1.0],
-        [https://gitlab.freedesktop.org/xorg/lib/libxkbfile/issues], [libxkbfile])
+AC_INIT([libxkbfile], [1.1.1],
+        [https://gitlab.freedesktop.org/xorg/lib/libxkbfile/-/issues],
+        [libxkbfile])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 
 # Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-xz])
 
 # Initialize libtool
 AC_PROG_LIBTOOL
@@ -40,12 +41,11 @@ XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
 # Checks for library functions.
-AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
-                                        [Do not have 'strcasecmp'.]))
+AC_CHECK_FUNCS([strcasecmp strndup])
 AC_CHECK_FUNC(getc_unlocked, AC_DEFINE([HAVE_UNLOCKED_STDIO], 1,
 				       ['Unlocked stdio']), [])
 
-# Obtain compiler/linker options for depedencies
+# Obtain compiler/linker options for dependencies
 PKG_CHECK_MODULES(XKBFILE, x11 kbproto)
 
 AC_CONFIG_FILES([Makefile
diff --git a/lib/libxkbfile/src/Makefile.in b/lib/libxkbfile/src/Makefile.in
index 7c8b602ba..fe3688890 100644
--- a/lib/libxkbfile/src/Makefile.in
+++ b/lib/libxkbfile/src/Makefile.in
@@ -280,6 +280,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/lib/libxkbfile/src/XKBfileInt.h b/lib/libxkbfile/src/XKBfileInt.h
index c5f5145f5..e0332cba3 100644
--- a/lib/libxkbfile/src/XKBfileInt.h
+++ b/lib/libxkbfile/src/XKBfileInt.h
@@ -69,7 +69,7 @@ _XkbDupString(const char *s)
 
 #define _XkbStrCaseEqual(s1,s2)	(_XkbStrCaseCmp(s1,s2)==0)
 
-#ifdef NEED_STRCASECMP
+#ifndef HAVE_STRCASECMP
 extern int _XkbStrCaseCmp(char *s1, char *s2);
 #else
 #define _XkbStrCaseCmp strcasecmp
diff --git a/lib/libxkbfile/src/cout.c b/lib/libxkbfile/src/cout.c
index 9e09fd9c7..ce3436635 100644
--- a/lib/libxkbfile/src/cout.c
+++ b/lib/libxkbfile/src/cout.c
@@ -826,10 +826,6 @@ WriteCHdrGeomSections(FILE *file, XkbDescPtr xkb, XkbGeometryPtr geom)
     for (s = 0, section = geom->sections; s < geom->num_sections;
          s++, section++) {
         WriteCHdrGeomRows(file, xkb, section, s);
-#ifdef NOTYET
-        if (section->num_doodads > 0)
-            WriteCHdrGeomDoodads(file, xkb, geom, section, s);
-#endif
         if (section->num_overlays > 0)
             WriteCHdrGeomOverlays(file, xkb, section, s);
     }
diff --git a/lib/libxkbfile/src/maprules.c b/lib/libxkbfile/src/maprules.c
index d42b1059c..20470f942 100644
--- a/lib/libxkbfile/src/maprules.c
+++ b/lib/libxkbfile/src/maprules.c
@@ -625,7 +625,7 @@ static void
 Apply(char *src, char **dst)
 {
     if (src) {
-        if (*src == '+' || *src == '!') {
+        if (*src == '+' || *src == '|') {
             *dst = _Concat(*dst, src);
         }
         else {
diff --git a/lib/libxkbfile/src/srvmisc.c b/lib/libxkbfile/src/srvmisc.c
index cbf1ec810..5511edd1e 100644
--- a/lib/libxkbfile/src/srvmisc.c
+++ b/lib/libxkbfile/src/srvmisc.c
@@ -51,10 +51,6 @@ XkbWriteToServer(XkbFileInfo *result)
         return False;
     if (!XkbSetIndicatorMap(dpy, ~0, xkb))
         return False;
-#ifdef NOTYET
-    if (!XkbSetControls(dpy, XkbAllControlsMask, xkb))
-        return False;
-#endif
     if (!XkbSetCompatMap(dpy, XkbAllCompatMask, xkb, True))
         return False;
     if (!XkbSetNames(dpy, XkbAllNamesMask, 0, xkb->map->num_types, xkb))
@@ -64,23 +60,6 @@ XkbWriteToServer(XkbFileInfo *result)
             return False;
     }
     return True;
-#ifdef NOTYET
-    switch (result->type) {
-    case XkmSemanticsFile:
-        func = WriteCHdrSemantics;
-        break;
-    case XkmLayoutFile:
-        func = WriteCHdrLayout;
-        break;
-    case XkmKeymapFile:
-        func = WriteCHdrKeymap;
-        break;
-    default:
-        _XkbLibError(_XkbErrIllegalContents, "XkbWriteToServer", result->type);
-        break;
-    }
-    return ok;
-#endif
 }
 
 unsigned
diff --git a/lib/libxkbfile/src/xkbatom.c b/lib/libxkbfile/src/xkbatom.c
index c55ee44f1..564cc8346 100644
--- a/lib/libxkbfile/src/xkbatom.c
+++ b/lib/libxkbfile/src/xkbatom.c
@@ -103,7 +103,7 @@ static unsigned long tableLength;
 static NodePtr *nodeTable;
 
 static Atom
-_XkbMakeAtom(const char *string, unsigned len, Bool makeit)
+_XkbMakeAtom(const char *string, size_t len, Bool makeit)
 {
     register NodePtr *np;
     unsigned i;
@@ -121,7 +121,7 @@ _XkbMakeAtom(const char *string, unsigned len, Bool makeit)
         else if (fp > (*np)->fingerPrint)
             np = &((*np)->right);
         else {                  /* now start testing the strings */
-            comp = strncmp(string, (*np)->string, (int) len);
+            comp = strncmp(string, (*np)->string, len);
             if ((comp < 0) || ((comp == 0) && (len < strlen((*np)->string))))
                 np = &((*np)->left);
             else if (comp > 0)
@@ -136,13 +136,19 @@ _XkbMakeAtom(const char *string, unsigned len, Bool makeit)
         nd = (NodePtr) _XkbAlloc(sizeof(NodeRec));
         if (!nd)
             return BAD_RESOURCE;
+#ifdef HAVE_STRNDUP
+        nd->string = strndup(string, len);
+#else
         nd->string = (char *) _XkbAlloc(len + 1);
+#endif
         if (!nd->string) {
             _XkbFree(nd);
             return BAD_RESOURCE;
         }
-        strncpy(nd->string, string, (int) len);
+#ifndef HAVE_STRNDUP
+        strncpy(nd->string, string, len);
         nd->string[len] = 0;
+#endif
         if ((lastAtom + 1) >= tableLength) {
             NodePtr *table;
 
diff --git a/lib/libxkbfile/src/xkbmisc.c b/lib/libxkbfile/src/xkbmisc.c
index 2f9b532e6..b0250487e 100644
--- a/lib/libxkbfile/src/xkbmisc.c
+++ b/lib/libxkbfile/src/xkbmisc.c
@@ -684,7 +684,7 @@ XkbNameMatchesPattern(char *name, char *ptrn)
     return (name[0] == '\0');
 }
 
-#ifdef NEED_STRCASECMP
+#ifndef HAVE_STRCASECMP
 _X_HIDDEN int
 _XkbStrCaseCmp(char *str1, char *str2)
 {
diff --git a/lib/libxkbfile/src/xkbtext.c b/lib/libxkbfile/src/xkbtext.c
index 6741d1a55..fe30d2bfc 100644
--- a/lib/libxkbfile/src/xkbtext.c
+++ b/lib/libxkbfile/src/xkbtext.c
@@ -126,7 +126,7 @@ XkbVModIndexText(Display *dpy, XkbDescPtr xkb, unsigned ndx, unsigned format)
 
     len = strlen(tmp) + 1;
     if (format == XkbCFile)
-        len += 4;
+        len += 5;
     if (len >= BUFFER_SIZE)
         len = BUFFER_SIZE - 1;
     rtrn = tbGetBuffer(len);
@@ -733,7 +733,7 @@ XkbStringText(char *str, unsigned format)
             }
             else {
                 *out++ = '0';
-                sprintf(out, "%o", *in);
+                sprintf(out, "%o", (unsigned char)*in);
                 while (*out != '\0')
                     out++;
             }