Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/xorg]: xsrc/external/mit/xkbcomp/dist initial import of xkbcomp-1.4.2
details: https://anonhg.NetBSD.org/xsrc/rev/1814a0b81971
branches: xorg
changeset: 10001:1814a0b81971
user: mrg <mrg%NetBSD.org@localhost>
date: Fri Dec 28 08:56:29 2018 +0000
description:
initial import of xkbcomp-1.4.2
diffstat:
external/mit/xkbcomp/dist/ChangeLog | 28 ++++++++++++++++++++++++++++
external/mit/xkbcomp/dist/compile | 2 +-
external/mit/xkbcomp/dist/config.guess | 2 +-
external/mit/xkbcomp/dist/config.sub | 2 +-
external/mit/xkbcomp/dist/configure | 20 ++++++++++----------
external/mit/xkbcomp/dist/configure.ac | 2 +-
external/mit/xkbcomp/dist/depcomp | 2 +-
external/mit/xkbcomp/dist/keycodes.c | 10 +++++++++-
external/mit/xkbcomp/dist/missing | 2 +-
external/mit/xkbcomp/dist/ylwrap | 2 +-
10 files changed, 54 insertions(+), 18 deletions(-)
diffs (213 lines):
diff -r 0c92394a42fc -r 1814a0b81971 external/mit/xkbcomp/dist/ChangeLog
--- a/external/mit/xkbcomp/dist/ChangeLog Fri Dec 28 08:56:25 2018 +0000
+++ b/external/mit/xkbcomp/dist/ChangeLog Fri Dec 28 08:56:29 2018 +0000
@@ -1,3 +1,31 @@
+commit 2abe23d23d3755335c10ff573e4e1f93b682e9d9
+Author: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+Date: Fri Jun 8 09:10:03 2018 +1000
+
+ xkbcomp 1.4.2
+
+ Signed-off-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+
+commit 5bc2849273a224a2df593b7e8df31f0bde666482
+Author: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+Date: Thu Jun 7 11:25:01 2018 +1000
+
+ Ignore xkb_keycodes.maximum of > 255
+
+ Continuation from 7fdfabd75 "keycodes: Ignore high keycodes"
+
+ A keymap with a key > 255 will have a xkb_keycodes.maximum of that keycode.
+ Let's not throw a fatal error on that, just crop it back to the maximum of
+ 255. This doesn't set the "high_keycode_warned" on purpose so we get this for
+ the first key that actually matters.
+
+ Reproducible with xkeyboard-config 2.24 which has a maximum of 374.
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=1587998
+
+ Signed-off-by: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+ Reviewed-by: Daniel Stone <daniel%fooishbar.org@localhost>
+
commit 34842845b191082fd1cfff3b7038332cdcadb825
Author: Adam Jackson <ajax%redhat.com@localhost>
Date: Thu Mar 1 11:15:18 2018 -0500
diff -r 0c92394a42fc -r 1814a0b81971 external/mit/xkbcomp/dist/compile
--- a/external/mit/xkbcomp/dist/compile Fri Dec 28 08:56:25 2018 +0000
+++ b/external/mit/xkbcomp/dist/compile Fri Dec 28 08:56:29 2018 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2016-01-11.22; # UTC
diff -r 0c92394a42fc -r 1814a0b81971 external/mit/xkbcomp/dist/config.guess
--- a/external/mit/xkbcomp/dist/config.guess Fri Dec 28 08:56:25 2018 +0000
+++ b/external/mit/xkbcomp/dist/config.guess Fri Dec 28 08:56:29 2018 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2017 Free Software Foundation, Inc.
diff -r 0c92394a42fc -r 1814a0b81971 external/mit/xkbcomp/dist/config.sub
--- a/external/mit/xkbcomp/dist/config.sub Fri Dec 28 08:56:25 2018 +0000
+++ b/external/mit/xkbcomp/dist/config.sub Fri Dec 28 08:56:29 2018 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2017 Free Software Foundation, Inc.
diff -r 0c92394a42fc -r 1814a0b81971 external/mit/xkbcomp/dist/configure
--- a/external/mit/xkbcomp/dist/configure Fri Dec 28 08:56:25 2018 +0000
+++ b/external/mit/xkbcomp/dist/configure Fri Dec 28 08:56:29 2018 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkbcomp 1.4.1.
+# Generated by GNU Autoconf 2.69 for xkbcomp 1.4.2.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -581,8 +581,8 @@
# Identity of this package.
PACKAGE_NAME='xkbcomp'
PACKAGE_TARNAME='xkbcomp'
-PACKAGE_VERSION='1.4.1'
-PACKAGE_STRING='xkbcomp 1.4.1'
+PACKAGE_VERSION='1.4.2'
+PACKAGE_STRING='xkbcomp 1.4.2'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -1315,7 +1315,7 @@
# 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 xkbcomp 1.4.1 to adapt to many kinds of systems.
+\`configure' configures xkbcomp 1.4.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1385,7 +1385,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xkbcomp 1.4.1:";;
+ short | recursive ) echo "Configuration of xkbcomp 1.4.2:";;
esac
cat <<\_ACEOF
@@ -1504,7 +1504,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xkbcomp configure 1.4.1
+xkbcomp configure 1.4.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1828,7 +1828,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xkbcomp $as_me 1.4.1, which was
+It was created by xkbcomp $as_me 1.4.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2696,7 +2696,7 @@
# Define the identity of the package.
PACKAGE='xkbcomp'
- VERSION='1.4.1'
+ VERSION='1.4.2'
cat >>confdefs.h <<_ACEOF
@@ -11428,7 +11428,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xkbcomp $as_me 1.4.1, which was
+This file was extended by xkbcomp $as_me 1.4.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -11494,7 +11494,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xkbcomp config.status 1.4.1
+xkbcomp config.status 1.4.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -r 0c92394a42fc -r 1814a0b81971 external/mit/xkbcomp/dist/configure.ac
--- a/external/mit/xkbcomp/dist/configure.ac Fri Dec 28 08:56:25 2018 +0000
+++ b/external/mit/xkbcomp/dist/configure.ac Fri Dec 28 08:56:29 2018 +0000
@@ -22,7 +22,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xkbcomp], [1.4.1],
+AC_INIT([xkbcomp], [1.4.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xkbcomp])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
diff -r 0c92394a42fc -r 1814a0b81971 external/mit/xkbcomp/dist/depcomp
--- a/external/mit/xkbcomp/dist/depcomp Fri Dec 28 08:56:25 2018 +0000
+++ b/external/mit/xkbcomp/dist/depcomp Fri Dec 28 08:56:29 2018 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2016-01-11.22; # UTC
diff -r 0c92394a42fc -r 1814a0b81971 external/mit/xkbcomp/dist/keycodes.c
--- a/external/mit/xkbcomp/dist/keycodes.c Fri Dec 28 08:56:25 2018 +0000
+++ b/external/mit/xkbcomp/dist/keycodes.c Fri Dec 28 08:56:29 2018 +0000
@@ -663,7 +663,7 @@
ACTION1("Assignment to field %s ignored\n", field.str);
return 0;
}
- if ((tmp.ival < XkbMinLegalKeyCode) || (tmp.ival > XkbMaxLegalKeyCode))
+ if ((tmp.ival < XkbMinLegalKeyCode))
{
ERROR3
("Illegal keycode %d (must be in the range %d-%d inclusive)\n",
@@ -671,6 +671,14 @@
ACTION1("Value of \"%s\" not changed\n", field.str);
return 0;
}
+ if ((tmp.ival > XkbMaxLegalKeyCode))
+ {
+ WARN2("Unsupported maximum keycode %d, clipping.\n", tmp.ival);
+ ACTION2("X11 cannot support keycodes above 255.\n");
+ info->explicitMax = XkbMaxLegalKeyCode;
+ info->effectiveMax = XkbMaxLegalKeyCode;
+ return 1;
+ }
if (which == MIN_KEYCODE_DEF)
{
if ((info->explicitMax > 0) && (info->explicitMax < tmp.ival))
diff -r 0c92394a42fc -r 1814a0b81971 external/mit/xkbcomp/dist/missing
--- a/external/mit/xkbcomp/dist/missing Fri Dec 28 08:56:25 2018 +0000
+++ b/external/mit/xkbcomp/dist/missing Fri Dec 28 08:56:29 2018 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
scriptversion=2016-01-11.22; # UTC
diff -r 0c92394a42fc -r 1814a0b81971 external/mit/xkbcomp/dist/ylwrap
--- a/external/mit/xkbcomp/dist/ylwrap Fri Dec 28 08:56:25 2018 +0000
+++ b/external/mit/xkbcomp/dist/ylwrap Fri Dec 28 08:56:29 2018 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
scriptversion=2016-01-11.22; # UTC
Home |
Main Index |
Thread Index |
Old Index