Module Name: xsrc
Committed By: mrg
Date: Sun Feb 23 11:14:18 UTC 2020
Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure
xsrc/external/mit/xkeyboard-config/dist/rules: base.lo_s.part
base.ml_s.part base.o_k.part
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am
Makefile.in
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.in
Removed Files:
xsrc/external/mit/xkeyboard-config/dist/rules: HDR evdev.lists.part
merge.sh
xsrc/external/mit/xkeyboard-config/dist/rules/bin: Makefile.am
Makefile.in ml1_s.sh ml1v1_s.sh ml1v_s.sh ml_s.sh mln_s.sh
mlnvn_s.sh mlv_s.sh
Log Message:
merge xkeyboard-config 2.29.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/xkeyboard-config/dist/rules/HDR
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.lo_s.part \
xsrc/external/mit/xkeyboard-config/dist/rules/base.o_k.part
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/evdev.lists.part
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/merge.sh
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/Makefile.am \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/ml1_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/ml1v1_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/ml1v_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/ml_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/mln_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/mlnvn_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/mlv_s.sh
cvs rdiff -u -r1.1.1.10 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/bin/Makefile.in
cvs rdiff -u -r1.13 -r1.14 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.18 xsrc/external/mit/xkeyboard-config/dist/configure:1.19
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.18 Sat Jun 1 07:11:53 2019
+++ xsrc/external/mit/xkeyboard-config/dist/configure Sun Feb 23 11:14:17 2020
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.27.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.29.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xkeyboard-config'
PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.27'
-PACKAGE_STRING='xkeyboard-config 2.27'
+PACKAGE_VERSION='2.29'
+PACKAGE_STRING='xkeyboard-config 2.29'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -636,6 +636,15 @@ DEPS_CFLAGS
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
+pkgpyexecdir
+pyexecdir
+pkgpythondir
+pythondir
+PYTHON_PLATFORM
+PYTHON_EXEC_PREFIX
+PYTHON_PREFIX
+PYTHON_VERSION
+PYTHON
HAVE_XSLTPROC_FALSE
HAVE_XSLTPROC_TRUE
XSLTPROC
@@ -748,6 +757,7 @@ with_libintl_prefix
host_alias
target_alias
XSLTPROC
+PYTHON
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
@@ -1299,7 +1309,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 xkeyboard-config 2.27 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.29 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1370,7 +1380,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 2.27:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 2.29:";;
esac
cat <<\_ACEOF
@@ -1404,6 +1414,7 @@ Optional Packages:
Some influential environment variables:
XSLTPROC Path to xsltproc command
+ PYTHON the Python interpreter
PKG_CONFIG path to pkg-config utility
PKG_CONFIG_PATH
directories to add to pkg-config's search path
@@ -1486,7 +1497,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xkeyboard-config configure 2.27
+xkeyboard-config configure 2.29
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1666,7 +1677,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 xkeyboard-config $as_me 2.27, which was
+It was created by xkeyboard-config $as_me 2.29, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2531,7 +2542,7 @@ fi
# Define the identity of the package.
PACKAGE='xkeyboard-config'
- VERSION='2.27'
+ VERSION='2.29'
cat >>confdefs.h <<_ACEOF
@@ -3097,6 +3108,267 @@ $as_echo "$ac_cv_path_SED" >&6; }
+
+
+ if test -n "$PYTHON"; then
+ # If the user set $PYTHON, use it and don't search something else.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.0" >&5
+$as_echo_n "checking whether $PYTHON version is >= 3.0... " >&6; }
+ prog="import sys
+# split strings by '.' and convert to numeric. Append some zeros
+# because we need at least 4 digits for the hex conversion.
+# map returns an iterator in Python 3.0 and a list in 2.x
+minver = list(map(int, '3.0'.split('.'))) + [0, 0, 0]
+minverhex = 0
+# xrange is not present in Python 3.0 and range returns an iterator
+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
+sys.exit(sys.hexversion < minverhex)"
+ if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
+ ($PYTHON -c "$prog") >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ as_fn_error $? "Python interpreter is too old" "$LINENO" 5
+fi
+ am_display_PYTHON=$PYTHON
+ else
+ # Otherwise, try each interpreter until we find one that satisfies
+ # VERSION.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.0" >&5
+$as_echo_n "checking for a Python interpreter with version >= 3.0... " >&6; }
+if ${am_cv_pathless_PYTHON+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ test "$am_cv_pathless_PYTHON" = none && break
+ prog="import sys
+# split strings by '.' and convert to numeric. Append some zeros
+# because we need at least 4 digits for the hex conversion.
+# map returns an iterator in Python 3.0 and a list in 2.x
+minver = list(map(int, '3.0'.split('.'))) + [0, 0, 0]
+minverhex = 0
+# xrange is not present in Python 3.0 and range returns an iterator
+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
+sys.exit(sys.hexversion < minverhex)"
+ if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
+ ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then :
+ break
+fi
+ done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
+$as_echo "$am_cv_pathless_PYTHON" >&6; }
+ # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
+ if test "$am_cv_pathless_PYTHON" = none; then
+ PYTHON=:
+ else
+ # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
+set dummy $am_cv_pathless_PYTHON; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PYTHON+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PYTHON in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PYTHON=$ac_cv_path_PYTHON
+if test -n "$PYTHON"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+$as_echo "$PYTHON" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+ am_display_PYTHON=$am_cv_pathless_PYTHON
+ fi
+
+
+ if test "$PYTHON" = :; then
+ as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5
+ else
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
+$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
+if ${am_cv_python_version+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+$as_echo "$am_cv_python_version" >&6; }
+ PYTHON_VERSION=$am_cv_python_version
+
+
+
+ PYTHON_PREFIX='${prefix}'
+
+ PYTHON_EXEC_PREFIX='${exec_prefix}'
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
+$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
+if ${am_cv_python_platform+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
+$as_echo "$am_cv_python_platform" >&6; }
+ PYTHON_PLATFORM=$am_cv_python_platform
+
+
+ # Just factor out some code duplication.
+ am_python_setup_sysconfig="\
+import sys
+# Prefer sysconfig over distutils.sysconfig, for better compatibility
+# with python 3.x. See automake bug#10227.
+try:
+ import sysconfig
+except ImportError:
+ can_use_sysconfig = 0
+else:
+ can_use_sysconfig = 1
+# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
+# <https://github.com/pypa/virtualenv/issues/118>
+try:
+ from platform import python_implementation
+ if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
+ can_use_sysconfig = 0
+except ImportError:
+ pass"
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
+$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
+if ${am_cv_python_pythondir+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "x$prefix" = xNONE
+ then
+ am_py_prefix=$ac_default_prefix
+ else
+ am_py_prefix=$prefix
+ fi
+ am_cv_python_pythondir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+ sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+else:
+ from distutils import sysconfig
+ sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
+ case $am_cv_python_pythondir in
+ $am_py_prefix*)
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ ;;
+ *)
+ case $am_py_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
+$as_echo "$am_cv_python_pythondir" >&6; }
+ pythondir=$am_cv_python_pythondir
+
+
+
+ pkgpythondir=\${pythondir}/$PACKAGE
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
+$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
+if ${am_cv_python_pyexecdir+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "x$exec_prefix" = xNONE
+ then
+ am_py_exec_prefix=$am_py_prefix
+ else
+ am_py_exec_prefix=$exec_prefix
+ fi
+ am_cv_python_pyexecdir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+ sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+else:
+ from distutils import sysconfig
+ sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
+ case $am_cv_python_pyexecdir in
+ $am_py_exec_prefix*)
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+ ;;
+ *)
+ case $am_py_exec_prefix in
+ /usr|/System*) ;;
+ *)
+ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+ ;;
+ esac
+ ;;
+ esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
+$as_echo "$am_cv_python_pyexecdir" >&6; }
+ pyexecdir=$am_cv_python_pyexecdir
+
+
+
+ pkgpyexecdir=\${pyexecdir}/$PACKAGE
+
+
+
+ fi
+
+
+
+
+
+
# Check whether --with-xkb_base was given.
if test "${with_xkb_base+set}" = set; then :
withval=$with_xkb_base; xkb_base="$withval"
@@ -6779,7 +7051,7 @@ _ACEOF
-ac_config_files="$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile geometry/digital_vndr/Makefile geometry/sgi_vndr/Makefile keycodes/Makefile keycodes/digital_vndr/Makefile keycodes/sgi_vndr/Makefile rules/Makefile rules/bin/Makefile rules/compat/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_vndr/Makefile symbols/jolla_vndr/Makefile symbols/macintosh_vndr/Makefile symbols/nec_vndr/Makefile symbols/nokia_vndr/Makefile symbols/sgi_vndr/Makefile symbols/sharp_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile types/Makefile xkeyboard-config.pc docs/Makefile man/Makefile"
+ac_config_files="$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile geometry/digital_vndr/Makefile geometry/sgi_vndr/Makefile keycodes/Makefile keycodes/digital_vndr/Makefile keycodes/sgi_vndr/Makefile rules/Makefile rules/compat/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_vndr/Makefile symbols/jolla_vndr/Makefile symbols/macintosh_vndr/Makefile symbols/nec_vndr/Makefile symbols/nokia_vndr/Makefile symbols/sgi_vndr/Makefile symbols/sharp_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile types/Makefile xkeyboard-config.pc docs/Makefile man/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -7359,7 +7631,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xkeyboard-config $as_me 2.27, which was
+This file was extended by xkeyboard-config $as_me 2.29, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7416,7 +7688,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xkeyboard-config config.status 2.27
+xkeyboard-config config.status 2.29
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -7553,7 +7825,6 @@ do
"keycodes/digital_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES keycodes/digital_vndr/Makefile" ;;
"keycodes/sgi_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES keycodes/sgi_vndr/Makefile" ;;
"rules/Makefile") CONFIG_FILES="$CONFIG_FILES rules/Makefile" ;;
- "rules/bin/Makefile") CONFIG_FILES="$CONFIG_FILES rules/bin/Makefile" ;;
"rules/compat/Makefile") CONFIG_FILES="$CONFIG_FILES rules/compat/Makefile" ;;
"symbols/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/Makefile" ;;
"symbols/digital_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/digital_vndr/Makefile" ;;
Index: xsrc/external/mit/xkeyboard-config/dist/rules/base.lo_s.part
diff -u xsrc/external/mit/xkeyboard-config/dist/rules/base.lo_s.part:1.3 xsrc/external/mit/xkeyboard-config/dist/rules/base.lo_s.part:1.4
--- xsrc/external/mit/xkeyboard-config/dist/rules/base.lo_s.part:1.3 Fri May 28 10:01:07 2010
+++ xsrc/external/mit/xkeyboard-config/dist/rules/base.lo_s.part Sun Feb 23 11:14:17 2020
@@ -1,2 +1,3 @@
+! layout option = symbols
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
* misc:typo = +typo(base)
Index: xsrc/external/mit/xkeyboard-config/dist/rules/base.o_k.part
diff -u xsrc/external/mit/xkeyboard-config/dist/rules/base.o_k.part:1.3 xsrc/external/mit/xkeyboard-config/dist/rules/base.o_k.part:1.4
--- xsrc/external/mit/xkeyboard-config/dist/rules/base.o_k.part:1.3 Fri May 28 10:01:07 2010
+++ xsrc/external/mit/xkeyboard-config/dist/rules/base.o_k.part Sun Feb 23 11:14:17 2020
@@ -0,0 +1 @@
+! option = keycodes
Index: xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part
diff -u xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part:1.6 xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part:1.7
--- xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part:1.6 Tue Nov 22 19:45:29 2016
+++ xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part Sun Feb 23 11:14:17 2020
@@ -1,3 +1,4 @@
+! model layout = symbols
ataritt $nonlatin = xfree68_vndr/ataritt(us)+%l%(v):2
ataritt * = xfree68_vndr/ataritt(us)+%l%(v)
amiga $nonlatin = xfree68_vndr/amiga(usa1)+%l%(v):2
@@ -34,6 +35,5 @@
ws007sh * = pc+sharp_vndr/ws007sh(basic)
ws011sh * = pc+sharp_vndr/ws011sh(basic)
ws020sh * = pc+sharp_vndr/ws020sh(basic)
- htcdream $htcdreamlayouts = %l(htcdream)
* $nonlatin = pc+us+%l%(v):2
* * = pc+%l%(v)
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.13 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.14
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.13 Sun Dec 30 09:17:53 2018
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am Sun Feb 23 11:14:17 2020
@@ -17,7 +17,7 @@ gr hr hu \
id ie il \
in iq \
ir is it \
-jp \
+jp jv \
ke kg kh \
kr kz \
la latam latin \
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.18 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.19
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.18 Sat Jun 1 07:11:54 2019
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in Sun Feb 23 11:14:17 2020
@@ -286,6 +286,11 @@ PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -336,9 +341,13 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -367,7 +376,7 @@ gr hr hu \
id ie il \
in iq \
ir is it \
-jp \
+jp jv \
ke kg kh \
kr kz \
la latam latin \
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in:1.10 xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in:1.11
--- xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in:1.10 Sat Jun 1 07:11:54 2019
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in Sun Feb 23 11:14:17 2020
@@ -227,6 +227,11 @@ PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -277,9 +282,13 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
