Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/xkeyboard-config/dist merge xkeyboard-config ...
details: https://anonhg.NetBSD.org/xsrc/rev/d818f3b37996
branches: trunk
changeset: 10700:d818f3b37996
user: mrg <mrg%NetBSD.org@localhost>
date: Tue Apr 27 03:38:48 2021 +0000
description:
merge xkeyboard-config 2.32, reduce local diffs
diffstat:
external/mit/xkeyboard-config/dist/configure | 50 +-
external/mit/xkeyboard-config/dist/symbols/Makefile.in | 4 +-
external/mit/xkeyboard-config/dist/symbols/at | 11 -
external/mit/xkeyboard-config/dist/symbols/in | 309 ++++++++-
external/mit/xkeyboard-config/dist/symbols/ir | 2 +-
external/mit/xkeyboard-config/dist/symbols/lk | 2 +-
external/mit/xkeyboard-config/dist/symbols/pl | 32 +-
external/mit/xkeyboard-config/dist/symbols/sharp_vndr/sl-c3x00 | 4 +-
external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh | 4 +-
external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws007sh | 4 +-
external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws011sh | 4 +-
external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws020sh | 4 +-
external/mit/xkeyboard-config/dist/symbols/sy | 2 +-
13 files changed, 341 insertions(+), 91 deletions(-)
diffs (truncated from 803 to 300 lines):
diff -r ad60c6f57024 -r d818f3b37996 external/mit/xkeyboard-config/dist/configure
--- a/external/mit/xkeyboard-config/dist/configure Tue Apr 27 03:09:36 2021 +0000
+++ b/external/mit/xkeyboard-config/dist/configure Tue Apr 27 03:38:48 2021 +0000
@@ -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.29.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.32.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
# Identity of this package.
PACKAGE_NAME='xkeyboard-config'
PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.29'
-PACKAGE_STRING='xkeyboard-config 2.29'
+PACKAGE_VERSION='2.32'
+PACKAGE_STRING='xkeyboard-config 2.32'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1309,7 +1309,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 xkeyboard-config 2.29 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.32 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1380,7 +1380,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 2.29:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 2.32:";;
esac
cat <<\_ACEOF
@@ -1497,7 +1497,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xkeyboard-config configure 2.29
+xkeyboard-config configure 2.32
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1677,7 +1677,7 @@
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.29, which was
+It was created by xkeyboard-config $as_me 2.32, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2025,7 +2025,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
+ # change version in meson.build as well
am__api_version='1.16'
@@ -2542,7 +2542,7 @@
# Define the identity of the package.
PACKAGE='xkeyboard-config'
- VERSION='2.29'
+ VERSION='2.32'
cat >>confdefs.h <<_ACEOF
@@ -7051,7 +7051,10 @@
-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"
+# needed for out-of-tree builds
+ac_config_commands="$ac_config_commands mkdir"
+
+ac_config_files="$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile keycodes/Makefile rules/Makefile symbols/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
@@ -7631,7 +7634,7 @@
# 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.29, which was
+This file was extended by xkeyboard-config $as_me 2.32, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7688,7 +7691,7 @@
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.29
+xkeyboard-config config.status 2.32
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -7815,30 +7818,14 @@
case $ac_config_target in
"po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "mkdir") CONFIG_COMMANDS="$CONFIG_COMMANDS mkdir" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"compat/Makefile") CONFIG_FILES="$CONFIG_FILES compat/Makefile" ;;
"geometry/Makefile") CONFIG_FILES="$CONFIG_FILES geometry/Makefile" ;;
- "geometry/digital_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES geometry/digital_vndr/Makefile" ;;
- "geometry/sgi_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES geometry/sgi_vndr/Makefile" ;;
"keycodes/Makefile") CONFIG_FILES="$CONFIG_FILES keycodes/Makefile" ;;
- "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/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" ;;
- "symbols/fujitsu_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/fujitsu_vndr/Makefile" ;;
- "symbols/hp_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/hp_vndr/Makefile" ;;
- "symbols/jolla_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/jolla_vndr/Makefile" ;;
- "symbols/macintosh_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/macintosh_vndr/Makefile" ;;
- "symbols/nec_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/nec_vndr/Makefile" ;;
- "symbols/nokia_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/nokia_vndr/Makefile" ;;
- "symbols/sgi_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/sgi_vndr/Makefile" ;;
- "symbols/sharp_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/sharp_vndr/Makefile" ;;
- "symbols/sony_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/sony_vndr/Makefile" ;;
- "symbols/sun_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/sun_vndr/Makefile" ;;
- "symbols/xfree68_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/xfree68_vndr/Makefile" ;;
"types/Makefile") CONFIG_FILES="$CONFIG_FILES types/Makefile" ;;
"xkeyboard-config.pc") CONFIG_FILES="$CONFIG_FILES xkeyboard-config.pc" ;;
"docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
@@ -8468,7 +8455,9 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "Something went wrong bootstrapping makefile fragments
- for automatic dependency tracking. Try re-running configure with the
+ for automatic dependency tracking. If GNU make was not used, consider
+ re-running the configure script with MAKE=\"gmake\" (or whatever is
+ necessary). You can also try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).
See \`config.log' for more details" "$LINENO" 5; }
@@ -8480,6 +8469,7 @@
rm -f conftest-deps.mk
}
;;
+ "mkdir":C) $MKDIR_P rules/compat/ ;;
esac
done # for ac_tag
diff -r ad60c6f57024 -r d818f3b37996 external/mit/xkeyboard-config/dist/symbols/Makefile.in
--- a/external/mit/xkeyboard-config/dist/symbols/Makefile.in Tue Apr 27 03:09:36 2021 +0000
+++ b/external/mit/xkeyboard-config/dist/symbols/Makefile.in Tue Apr 27 03:38:48 2021 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -r ad60c6f57024 -r d818f3b37996 external/mit/xkeyboard-config/dist/symbols/at
--- a/external/mit/xkeyboard-config/dist/symbols/at Tue Apr 27 03:09:36 2021 +0000
+++ b/external/mit/xkeyboard-config/dist/symbols/at Tue Apr 27 03:38:48 2021 +0000
@@ -1,5 +1,3 @@
-// based on a keyboard map from an 'xkb/symbols/de' file
-
default
xkb_symbols "basic" {
@@ -23,12 +21,3 @@
name[Group1]= "German (Austria, Macintosh)";
};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-
- include "de(Sundeadkeys)"
-
- name[Group1]="German (Austria, with Sun dead keys)";
-};
-
diff -r ad60c6f57024 -r d818f3b37996 external/mit/xkeyboard-config/dist/symbols/in
--- a/external/mit/xkeyboard-config/dist/symbols/in Tue Apr 27 03:09:36 2021 +0000
+++ b/external/mit/xkeyboard-config/dist/symbols/in Tue Apr 27 03:38:48 2021 +0000
@@ -1,5 +1,7 @@
// This layout includes all Indian layouts, including:
-// - Devanagari (Hindi, Marathi, Sanskrit)
+// - Hindi
+// - Marathi
+// - Sanskrit
// - Bangla
// - Gujarati
// - Kannada
@@ -25,10 +27,8 @@
// - Ol Chiki:
// http://www.unicode.org/L2/L2005/05243r-n2984-ol-chiki.pdf (fig. 9)
-// based on a keyboard map from an 'xkb/symbols/dev' file
-
// Devangari is the default. Kill me if I am wrong:)
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "deva" {
// March 2004 -- David Holl <smyrph+dev_xkb%ece.wpi.edu@localhost>
name[Group1]="Indian";
@@ -42,7 +42,7 @@
// INSCRIPT in place of the symbols that are here for now. But this
// requires XKB to map 1 key into two to three other key presses.
key <AE03> { [ U0969, numbersign, 3, numbersign ] };
- key <AE04> { [ U096a, dollar, 4 ] };
+ key <AE04> { [ U096a, dollar, 4, U20b9 ] }; // Rupee
key <AE05> { [ U096b, percent, 5, percent ] };
key <AE06> { [ U096c, asciicircum, 6, asciicircum ] };
key <AE07> { [ U096d, ampersand, 7, ampersand ] };
@@ -93,7 +93,6 @@
// space, space, Zero-Width-Non-Joiner (ZWNJ), Zero-Width-Joiner (ZWJ):
include "nbsp(zwnj3zwj4)"
- include "rupeesign(4)"
include "level3(ralt_switch)"
};
@@ -112,11 +111,11 @@
key.type="FOUR_LEVEL";
// Roman digits
- key <TLDE> { [ U0902, U0901, apostrophe, asciitilde ] }; // apostrophe: anusvara, candrabindu
+ key <TLDE> { [ U0902, U0901, grave, asciitilde ] }; // grave: anusvara, candrabindu
key <AE01> { [ 1, exclam, U0967, exclam ] };
key <AE02> { [ 2, at, U0968, at ] };
key <AE03> { [ 3, numbersign, U0969, numbersign ] };
- key <AE04> { [ 4, dollar, U096A ] }; // Rupee symbol on AltGr+4
+ key <AE04> { [ 4, dollar, U096A, U20B9 ] }; // Rupee
key <AE05> { [ 5, percent, U096B, percent ] };
key <AE06> { [ 6, asciicircum, U096C, asciicircum ] };
key <AE07> { [ 7, ampersand, U096D, ampersand ] };
@@ -172,11 +171,8 @@
// modifier_map Mod3 { Mode_switch };
include "level3(ralt_switch)"
- include "rupeesign(4)"
};
-// based on a keyboard map from an 'xkb/symbols/ben' file
-
partial alphanumeric_keys
xkb_symbols "ben" {
name[Group1]= "Bangla (India)";
@@ -467,7 +463,7 @@
};
xkb_symbols "ben_gitanjali" {
- name[Group1]= "Bangla (India, Uni Gitanjali)";
+ name[Group1]= "Bangla (India, Gitanjali)";
key <ESC> { [ Escape ] };
// numbers
@@ -855,11 +851,11 @@
key.type="FOUR_LEVEL";
// Roman digits
- key <TLDE> { [ U0D4D, U0D02, apostrophe, asciitilde ] }; // apostrophe: virama(chandrakala),anusvara
+ key <TLDE> { [ U0D4D, U0D02, grave, asciitilde ] }; // grave: virama(chandrakala),anusvara
key <AE01> { [ 1, exclam, U0D67, exclam ] };
key <AE02> { [ 2, at, U0D68, at ] };
key <AE03> { [ 3, numbersign, U0D69, numbersign ] };
- key <AE04> { [ 4, dollar, U0D6A ] };
+ key <AE04> { [ 4, dollar, U0D6A, U20B9 ] }; // Rupee
key <AE05> { [ 5, percent, U0D6B, percent ] };
key <AE06> { [ 6, asciicircum, U0D6C, asciicircum ] };
key <AE07> { [ 7, ampersand, U0D6D, ampersand ] };
@@ -914,7 +910,6 @@
// modifier_map Control{ Control_L };
// modifier_map Mod3 { Mode_switch };
include "level3(ralt_switch)"
- include "rupeesign(4)"
};
@@ -1051,8 +1046,7 @@
include "level3(ralt_switch)"
};
-// based on a keyboard map from an 'xkb/symbols/tml' file
-// INSCRIPT
+
partial alphanumeric_keys
xkb_symbols "tam" {
name[Group1]= "Tamil (Inscript)";
Home |
Main Index |
Thread Index |
Old Index