Module Name: xsrc
Committed By: mrg
Date: Sat Jul 23 11:21:56 UTC 2011
Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure configure.in
xsrc/external/mit/xkeyboard-config/dist/rules: base.ml_s.part
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am
Makefile.in at in ir lk sy symbols.dir
Removed Files:
xsrc/external/mit/xkeyboard-config/dist/rules/extras: Makefile.am
Makefile.in layoutsMapping.lst variantsMapping.lst
xsrc/external/mit/xkeyboard-config/dist/symbols/extras: Makefile.am
Makefile.in apl ir rs ru us
Log Message:
merge xkeyboard-config 2.3
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xkeyboard-config/dist/configure \
xsrc/external/mit/xkeyboard-config/dist/configure.in
cvs rdiff -u -r1.3 -r1.4 \
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/extras/Makefile.am \
xsrc/external/mit/xkeyboard-config/dist/rules/extras/Makefile.in \
xsrc/external/mit/xkeyboard-config/dist/rules/extras/layoutsMapping.lst
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/extras/variantsMapping.lst
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xkeyboard-config/dist/symbols/at
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xkeyboard-config/dist/symbols/in \
xsrc/external/mit/xkeyboard-config/dist/symbols/ir
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xkeyboard-config/dist/symbols/lk \
xsrc/external/mit/xkeyboard-config/dist/symbols/sy
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/extras/Makefile.am \
xsrc/external/mit/xkeyboard-config/dist/symbols/extras/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/extras/apl \
xsrc/external/mit/xkeyboard-config/dist/symbols/extras/rs \
xsrc/external/mit/xkeyboard-config/dist/symbols/extras/us
cvs rdiff -u -r1.3 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/extras/ir
cvs rdiff -u -r1.4 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/extras/ru
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.6 xsrc/external/mit/xkeyboard-config/dist/configure:1.7
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.6 Mon Feb 21 05:03:18 2011
+++ xsrc/external/mit/xkeyboard-config/dist/configure Sat Jul 23 11:21:55 2011
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for xkeyboard-config 2.1.
+# Generated by GNU Autoconf 2.67 for xkeyboard-config 2.3.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -549,8 +549,8 @@
# Identity of this package.
PACKAGE_NAME='xkeyboard-config'
PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.1'
-PACKAGE_STRING='xkeyboard-config 2.1'
+PACKAGE_VERSION='2.3'
+PACKAGE_STRING='xkeyboard-config 2.3'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -662,6 +662,11 @@
USE_COMPAT_RULES_TRUE
CREATE_RULES_SYMLINK_FALSE
CREATE_RULES_SYMLINK_TRUE
+DEPS_LIBS
+DEPS_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
XKBCOMP
MAINT
MAINTAINER_MODE_FALSE
@@ -734,12 +739,18 @@
with_xkb_base
with_xkb_rules_symlink
enable_compat_rules
+enable_runtime_deps
enable_nls
enable_dependency_tracking
'
ac_precious_vars='build_alias
host_alias
target_alias
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+DEPS_CFLAGS
+DEPS_LIBS
CC
CFLAGS
LDFLAGS
@@ -1288,7 +1299,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.1 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1355,7 +1366,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 2.1:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 2.3:";;
esac
cat <<\_ACEOF
@@ -1366,6 +1377,7 @@
--enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer
--enable-compat-rules create compatibility rules
+ --enable-runtime-deps use run-time dependencies as build-time dependencies
--disable-nls do not use Native Language Support
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
@@ -1377,6 +1389,13 @@
--with-xkb-rules-symlink=NAME1(,NAME2)* create symlink(s) to "old style" rules files (xfree86 and/or xorg)
Some influential environment variables:
+ PKG_CONFIG path to pkg-config utility
+ PKG_CONFIG_PATH
+ directories to add to pkg-config's search path
+ PKG_CONFIG_LIBDIR
+ path overriding pkg-config's built-in search path
+ DEPS_CFLAGS C compiler flags for DEPS, overriding pkg-config
+ DEPS_LIBS linker flags for DEPS, overriding pkg-config
CC C compiler command
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -1452,7 +1471,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xkeyboard-config configure 2.1
+xkeyboard-config configure 2.3
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1817,7 +1836,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.1, which was
+It was created by xkeyboard-config $as_me 2.3, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2633,7 +2652,7 @@
# Define the identity of the package.
PACKAGE='xkeyboard-config'
- VERSION='2.1'
+ VERSION='2.3'
cat >>confdefs.h <<_ACEOF
@@ -2768,6 +2787,233 @@
fi
+# xkeyboard-config does not have build-time dependencies. However, it does
+# have run-time dependencies and keyboard layouts may not work without the
+# right libX11 or xproto installed.
+# By default, we enable these run-time dependencies as build-time
+# dependencies so that those building on their local machines are warned
+# that the resulting build may not work.
+# Check whether --enable-runtime-deps was given.
+if test "${enable_runtime_deps+set}" = set; then :
+ enableval=$enable_runtime_deps; enable_runtime_deps="$enableval"
+else
+ enable_runtime_deps="yes"
+fi
+
+
+if test "x$enable_runtime_deps" = "xyes"; then
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$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
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$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
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; }
+ PKG_CONFIG=""
+ fi
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPS" >&5
+$as_echo_n "checking for DEPS... " >&6; }
+
+if test -n "$DEPS_CFLAGS"; then
+ pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xproto >= 7.0.20 x11 >= 1.4.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xproto >= 7.0.20 x11 >= 1.4.3") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "xproto >= 7.0.20 x11 >= 1.4.3" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$DEPS_LIBS"; then
+ pkg_cv_DEPS_LIBS="$DEPS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xproto >= 7.0.20 x11 >= 1.4.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xproto >= 7.0.20 x11 >= 1.4.3") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "xproto >= 7.0.20 x11 >= 1.4.3" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xproto >= 7.0.20 x11 >= 1.4.3" 2>&1`
+ else
+ DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "xproto >= 7.0.20 x11 >= 1.4.3" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DEPS_PKG_ERRORS" >&5
+
+ have_deps=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ have_deps=no
+else
+ DEPS_CFLAGS=$pkg_cv_DEPS_CFLAGS
+ DEPS_LIBS=$pkg_cv_DEPS_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_deps=yes
+fi
+ if test "x$have_deps" = "xno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+ Required dependencies not found. These dependencies are
+ run-time dependencies only and not required for building.
+ Skip this check with --disable-runtime-deps.
+
+ Installing this version of xkeyboard-config on a host
+ without the required dependencies may result in unusable
+ keyboard layouts.
+ " >&5
+$as_echo "$as_me: WARNING:
+ Required dependencies not found. These dependencies are
+ run-time dependencies only and not required for building.
+ Skip this check with --disable-runtime-deps.
+
+ Installing this version of xkeyboard-config on a host
+ without the required dependencies may result in unusable
+ keyboard layouts.
+ " >&2;}
+
+ as_fn_error $? "$DEPS_PKG_ERRORS" "$LINENO" 5
+ fi
+fi
+
if test "x$xkb_rules_symlink" != "x"; then
CREATE_RULES_SYMLINK_TRUE=
CREATE_RULES_SYMLINK_FALSE='#'
@@ -5438,12 +5684,12 @@
< $srcdir/po/POTFILES.in > po/POTFILES
-ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr gl hu id it ka ko ky lt nb nl pl ro ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr gl hu id it ja ka ko ky lt nb nl pl ro ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW"
-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 keymap/Makefile keymap/digital_vndr/Makefile keymap/sgi_vndr/Makefile keymap/sun_vndr/Makefile semantics/Makefile rules/Makefile rules/bin/Makefile rules/compat/Makefile rules/extras/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_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 symbols/extras/Makefile types/Makefile xkeyboard-config.pc xkeyboard-config.spec docs/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 keymap/Makefile keymap/digital_vndr/Makefile keymap/sgi_vndr/Makefile keymap/sun_vndr/Makefile semantics/Makefile rules/Makefile rules/bin/Makefile rules/compat/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_vndr/Makefile symbols/macintosh_vndr/Makefile symbols/nec_vndr/Makefile symbols/nokia_vndr/Makefile symbols/sgi_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile types/Makefile xkeyboard-config.pc xkeyboard-config.spec docs/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -6019,7 +6265,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.1, which was
+This file was extended by xkeyboard-config $as_me 2.3, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6076,7 +6322,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.1
+xkeyboard-config config.status 2.3
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
@@ -6214,7 +6460,6 @@
"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" ;;
- "rules/extras/Makefile") CONFIG_FILES="$CONFIG_FILES rules/extras/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" ;;
@@ -6226,7 +6471,6 @@
"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" ;;
- "symbols/extras/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/extras/Makefile" ;;
"types/Makefile") CONFIG_FILES="$CONFIG_FILES types/Makefile" ;;
"xkeyboard-config.pc") CONFIG_FILES="$CONFIG_FILES xkeyboard-config.pc" ;;
"xkeyboard-config.spec") CONFIG_FILES="$CONFIG_FILES xkeyboard-config.spec" ;;
Index: xsrc/external/mit/xkeyboard-config/dist/configure.in
diff -u xsrc/external/mit/xkeyboard-config/dist/configure.in:1.6 xsrc/external/mit/xkeyboard-config/dist/configure.in:1.7
--- xsrc/external/mit/xkeyboard-config/dist/configure.in:1.6 Mon Feb 21 05:03:18 2011
+++ xsrc/external/mit/xkeyboard-config/dist/configure.in Sat Jul 23 11:21:55 2011
@@ -1,4 +1,4 @@
-AC_INIT(xkeyboard-config, 2.1)
+AC_INIT(xkeyboard-config, 2.3)
AC_CONFIG_SRCDIR(rules/base.xml.in)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -24,6 +24,34 @@
enable_compat_rules="$enableval",
enable_compat_rules="yes" )
+# xkeyboard-config does not have build-time dependencies. However, it does
+# have run-time dependencies and keyboard layouts may not work without the
+# right libX11 or xproto installed.
+# By default, we enable these run-time dependencies as build-time
+# dependencies so that those building on their local machines are warned
+# that the resulting build may not work.
+AC_ARG_ENABLE( runtime-deps,
+ [ --enable-runtime-deps use run-time dependencies as build-time dependencies],
+ enable_runtime_deps="$enableval",
+ enable_runtime_deps="yes")
+
+if test "x$enable_runtime_deps" = "xyes"; then
+ PKG_CHECK_MODULES(DEPS, [xproto >= 7.0.20] [x11 >= 1.4.3], [have_deps=yes], [have_deps=no])
+ if test "x$have_deps" = "xno" ; then
+ AC_MSG_WARN([
+ Required dependencies not found. These dependencies are
+ run-time dependencies only and not required for building.
+ Skip this check with --disable-runtime-deps.
+
+ Installing this version of xkeyboard-config on a host
+ without the required dependencies may result in unusable
+ keyboard layouts.
+ ])
+
+ AC_MSG_ERROR([$DEPS_PKG_ERRORS])
+ fi
+fi
+
AM_CONDITIONAL(CREATE_RULES_SYMLINK, test "x$xkb_rules_symlink" != "x")
AM_CONDITIONAL(USE_COMPAT_RULES, test "x$enable_compat_rules" = "xyes")
@@ -39,7 +67,7 @@
AM_GLIB_GNU_GETTEXT
-ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr gl hu id it ka ko ky lt nb nl pl ro ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr gl hu id it ja ka ko ky lt nb nl pl ro ru rw sk sl sq sr sv tr uk vi zh_CN zh_TW"
AC_SUBST(xkb_base)
AC_SUBST(xkb_rules_symlink)
@@ -61,7 +89,6 @@
rules/Makefile
rules/bin/Makefile
rules/compat/Makefile
-rules/extras/Makefile
symbols/Makefile
symbols/digital_vndr/Makefile
symbols/fujitsu_vndr/Makefile
@@ -74,7 +101,6 @@
symbols/sony_vndr/Makefile
symbols/sun_vndr/Makefile
symbols/xfree68_vndr/Makefile
-symbols/extras/Makefile
types/Makefile
xkeyboard-config.pc
xkeyboard-config.spec
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.3 xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part:1.4
--- xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part:1.3 Mon Feb 21 05:03:18 2011
+++ xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part Sat Jul 23 11:21:56 2011
@@ -44,4 +44,3 @@
htcdream $htcdreamlayouts = %l(htcdream)
* $nonlatin = pc+us+%l%(v):2
* * = pc+%l%(v)
- htcdream us de it = %l(htcdream)
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.7 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.8
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.7 Mon Feb 21 05:03:18 2011
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am Sat Jul 23 11:21:56 2011
@@ -1,14 +1,15 @@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr xfree68_vndr extras
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
symbolsdir = $(xkb_base)/symbols
dist_symbols_DATA = \
ad af al \
-am ara at az \
+am apl ara \
+at az \
ba bd be \
bg br brai \
bt bw by \
-ca cd \
-ch cn cz \
+ca cd ch \
+cm cn cz \
de dk \
ee es et epo \
fi fo fr \
@@ -29,7 +30,7 @@
se si sk sn \
sy th \
terminate \
-tj tm tr tz \
+tj tm tr tw tz \
ua us uz vn \
za \
altwin capslock compose ctrl empty eurosign rupeesign group inet \
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.6 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.7
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.6 Mon Feb 21 05:03:18 2011
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in Sat Jul 23 11:21:56 2011
@@ -131,6 +131,8 @@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DEPS_CFLAGS = @DEPS_CFLAGS@
+DEPS_LIBS = @DEPS_LIBS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -171,6 +173,9 @@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -226,16 +231,17 @@
top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr xfree68_vndr extras
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
symbolsdir = $(xkb_base)/symbols
dist_symbols_DATA = \
ad af al \
-am ara at az \
+am apl ara \
+at az \
ba bd be \
bg br brai \
bt bw by \
-ca cd \
-ch cn cz \
+ca cd ch \
+cm cn cz \
de dk \
ee es et epo \
fi fo fr \
@@ -256,7 +262,7 @@
se si sk sn \
sy th \
terminate \
-tj tm tr tz \
+tj tm tr tw tz \
ua us uz vn \
za \
altwin capslock compose ctrl empty eurosign rupeesign group inet \
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/at
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/at:1.3 xsrc/external/mit/xkeyboard-config/dist/symbols/at:1.4
--- xsrc/external/mit/xkeyboard-config/dist/symbols/at:1.3 Sun Nov 28 07:53:09 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/at Sat Jul 23 11:21:56 2011
@@ -1,15 +1,11 @@
-
// based on a keyboard map from an 'xkb/symbols/de' file
-//
-// $XKeyboardConfig$
-// $XFree86: xc/programs/xkbcomp/symbols/de,v 1.6 2003/09/08 13:12:51 pascal Exp $
default
xkb_symbols "basic" {
include "de(basic)"
- name[Group1]="Austria";
+ name[Group1]="German (Austria)";
};
partial alphanumeric_keys
@@ -17,7 +13,7 @@
include "de(nodeadkeys)"
- name[Group1]="Austria - Eliminate dead keys";
+ name[Group1]="German (Austria, eliminate dead keys)";
};
partial alphanumeric_keys
@@ -25,7 +21,7 @@
include "de(mac)"
- name[Group1]= "Austria - Macintosh";
+ name[Group1]= "German (Austria, Macintosh)";
};
partial alphanumeric_keys
@@ -33,6 +29,6 @@
include "de(Sundeadkeys)"
- name[Group1]="Austria - Sun dead keys";
+ name[Group1]="German (Austria, Sun dead keys)";
};
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.5 xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.6
--- xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.5 Mon Feb 21 05:03:18 2011
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/in Sat Jul 23 11:21:56 2011
@@ -1,5 +1,3 @@
-// $XKeyboardConfig$
-
// This layout includes all Indian layouts, including:
// - Bengali
// - Gujarati
@@ -24,7 +22,7 @@
default partial alphanumeric_keys
xkb_symbols "deva" {
// March 2004 -- David Holl <[email protected]>
- name[Group1]="India";
+ name[Group1]="Indian";
key.type="FOUR_LEVEL";
@@ -99,7 +97,7 @@
partial alphanumeric_keys
xkb_symbols "bolnagri" {
- name[Group1] = "India - Hindi Bolnagri";
+ name[Group1] = "Hindi (Bolnagri)";
key.type="FOUR_LEVEL";
//Top Alphanumeric row
// Roman digits
@@ -166,12 +164,10 @@
};
// based on a keyboard map from an 'xkb/symbols/ben' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/ben,v 1.2 2002/11/22 04:03:28 dawes Exp $
partial alphanumeric_keys
xkb_symbols "ben" {
- name[Group1]= "India - Bengali";
+ name[Group1]= "Bengali";
// Mainly numbers.
key <AE01> { [ U09E7 ] };
@@ -236,7 +232,7 @@
};
xkb_symbols "ben_probhat" {
- name[Group1]= "India - Bengali Probhat";
+ name[Group1]= "Bengali (Probhat)";
key <ESC> { [ Escape ] };
// numbers
@@ -310,7 +306,7 @@
partial alphanumeric_keys
xkb_symbols "guj" {
- name[Group1]= "India - Gujarati";
+ name[Group1]= "Gujarati";
// Mainly numbers.
key <AE01> { [ U0AE7, U0A8D ] };
@@ -381,7 +377,7 @@
// Date : Wed Nov 13 17:22:58 IST 2002
// Kannada digits mapped in basic only
- name[Group1]= "India - Kannada";
+ name[Group1]= "Kannada";
key <TLDE> { [ U0cca, U0c92 ] };
key <AE01> { [ U0ce7 ] };
@@ -449,7 +445,7 @@
partial alphanumeric_keys
xkb_symbols "mal" {
- name[Group1] = "India - Malayalam";
+ name[Group1] = "Malayalam";
//From grave to backslash (\)
@@ -538,7 +534,7 @@
partial alphanumeric_keys
xkb_symbols "mal_lalitha" {
- name[Group1] = "India - Malayalam Lalitha";
+ name[Group1] = "Malayalam (Lalitha)";
key.type="FOUR_LEVEL";
//Top Alphanumeric row
// Roman digits
@@ -611,7 +607,7 @@
// Author: G Karunakar <[email protected]>
// Date: Wed Nov 13 18:16:19 IST 2002
- name[Group1]= "India - Oriya";
+ name[Group1]= "Oriya";
key <AE01> { [ U0b67 ] };
key <AE02> { [ U0b68 ] };
@@ -668,12 +664,10 @@
};
// based on a keyboard map from an 'xkb/symbols/tml' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/tml,v 1.2 2002/11/22 04:03:28 dawes Exp $
// INSCRIPT
partial alphanumeric_keys
xkb_symbols "tam" {
- name[Group1]= "India - Tamil";
+ name[Group1]= "Tamil";
key <TLDE> { [ U0BCA, U0B92 ] };
@@ -745,7 +739,7 @@
// Date : Fri Sep 4 11:32:00 CST 2009
// Mapping:
- name[Group1]= "India - Tamil Unicode";
+ name[Group1]= "Tamil (Unicode)";
// granthas
key <TLDE> { [ apostrophe, asciitilde ] };
@@ -810,7 +804,7 @@
// Date : Fri Sep 4 11:33:00 CST 2009
// Mapping:
- name[Group1]= "India - Tamil Keyboard with Numerals";
+ name[Group1]= "Tamil (keyboard with numerals)";
// Mainly numbers.
key <TLDE> { [ apostrophe, asciitilde ] };
@@ -874,7 +868,7 @@
// Author : Thuraiappah Vaseeharan <[email protected]>
// Last Modified: Sat Jan 5 17:11:26 CST 2002
- name[Group1]= "India - Tamil TSCII Typewriter";
+ name[Group1]= "Tamil (TSCII typewriter)";
key <AE01> { [ 0x10000b7, 0x10000a4 ] }; // aytham
key <AE02> { [ 0x1000082, 0x10000a5 ] }; // shri
@@ -930,7 +924,7 @@
// Author: Thuraiappah Vaseeharan <[email protected]>
// Date : Sun Aug 12 02:23:00 CDT 2001
- name[Group1]= "India - Tamil TAB Typewriter";
+ name[Group1]= "Tamil (TAB typewriter)";
// numeral row
key <AE01> { [ 0x10000e7, 0x10000a7 ] } ;
@@ -986,7 +980,7 @@
// Date:
// See layout at http://www.indlinux.org/keymap/telugu.php
- name[Group1]= "India - Telugu";
+ name[Group1]= "Telugu";
key <TLDE> { [ U0c4a, U0c12 ] };
key <AE01> { [ U0c67 ] };
@@ -1048,26 +1042,26 @@
partial alphanumeric_keys
xkb_symbols "urd-phonetic" {
include "pk(urd-phonetic)"
- name[Group1]= "India - Urdu, Phonetic";
+ name[Group1]= "Urdu (phonetic)";
};
partial alphanumeric_keys
xkb_symbols "urd-phonetic3" {
include "pk(urd-crulp)"
- name[Group1]= "India - Urdu, Alternative phonetic";
+ name[Group1]= "Urdu (alternative phonetic)";
};
partial alphanumeric_keys
xkb_symbols "urd-winkeys" {
include "pk(urd-nla)"
- name[Group1]= "India - Urdu, Winkeys";
+ name[Group1]= "Urdu (WinKeys)";
};
// based on a keyboard map from an 'xkb/symbols/gur' file
partial alphanumeric_keys
xkb_symbols "guru" {
- name[Group1]= "India - Gurmukhi";
+ name[Group1]= "Punjabi (Gurmukhi)";
// Mainly numbers.
key <AE01> { [ U0A67 ] };
@@ -1138,7 +1132,7 @@
partial alphanumeric_keys
xkb_symbols "jhelum" {
- name[Group1] = "India - Gurmukhi Jhelum";
+ name[Group1] = "Punjabi (Gurmukhi Jhelum)";
key.type="FOUR_LEVEL";
//Top Alphanumeric row
// Roman digits
@@ -1271,7 +1265,7 @@
partial alphanumeric_keys
xkb_symbols "hin-wx" {
- name[Group1]= "India - Hindi Wx";
+ name[Group1]= "Hindi (Wx)";
key <TLDE> { [ grave, asciitilde, 2, 3 ] };
@@ -1336,7 +1330,7 @@
partial alphanumeric_keys
xkb_symbols "eng" {
- name[Group1]= "India - English with RupeeSign";
+ name[Group1]= "English (India, with RupeeSign)";
include "us(basic)"
@@ -1346,3 +1340,84 @@
};
+// Description : Enhanced INSCRIPT keymap for Malayalam
+// Encoding : Unicode (http://www.unicode.org)
+// Author : Mahesh T Pai <[email protected]>
+// Date : March, 2011
+// Source : http://www.nongnu.org/smc/docs/images/ml_inscript_layout.jpg
+// Comment : Based on the Inscript Keyboard created by M Baiju
+// Mapping:
+
+partial alphanumeric_keys
+xkb_symbols "mal_enhanced" {
+
+ name[Group1] = "Malayalam (enhanced Inscript with Rupee Sign)";
+
+ //From grave to backslash (\)
+
+ key <TLDE> { [ U0d4a , U0d12 ] };
+ key <AE01> { [ U0d67 , exclam ] };
+ key <AE02> { [ U0d68 , at ] };
+ key <AE03> { [ U0d69 , numbersign ] };
+ key <AE04> { [ U0d6a , dollar ] };
+ key <AE05> { [ U0d6b , percent ] };
+ key <AE06> { [ U0d6c , asciicircum ] };
+ key <AE07> { [ U0d6d , ampersand ] };
+ key <AE08> { [ U0d6e , U0d7e ] };
+ key <AE09> { [ U0d6f , parenleft ] };
+ key <AE10> { [ U0d66 , parenright ] };
+
+ key <AE11> { [ minus , U0d03 ] };
+ key <AE12> { [ U0d43 , U0d0b ] };
+ key <BKSL> { [ U0d7c , U05C ] }; //bksl: chillu RR
+
+
+ // From 'q' to right bracket (])
+
+ key <AD01> { [ U0d57 , U0d14 ] };
+ key <AD02> { [ U0d48 , U0d10 ] };
+ key <AD03> { [ U0d3e , U0d06 ] };
+ key <AD04> { [ U0d40 , U0d08 ] };
+ key <AD05> { [ U0d42 , U0d0a ] };
+ key <AD06> { [ U0d2c , U0d2d ] };
+ key <AD07> { [ U0d39 , U0d19 ] };
+ key <AD08> { [ U0d17 , U0d18 ] };
+ key <AD09> { [ U0d26 , U0d27 ] };
+ key <AD10> { [ U0d1c , U0d1d ] };
+ key <AD11> { [ U0d21 , U0d22 ] };
+ key <AD12> { [ U0200d , U0d1e ] };
+
+ // From 'a' to apostrophe (')
+
+ key <AC01> { [ U0d4b , U0d13 ] };
+ key <AC02> { [ U0d47 , U0d0f ] };
+ key <AC03> { [ U0d4d , U0d05 ] };
+ key <AC04> { [ U0d3f , U0d07 ] };
+ key <AC05> { [ U0d41 , U0d09 ] };
+ key <AC06> { [ U0d2a , U0d2b ] };
+ key <AC07> { [ U0d30 , U0d31 ] };
+ key <AC08> { [ U0d15 , U0d16 ] };
+ key <AC09> { [ U0d24 , U0d25 ] };
+ key <AC10> { [ U0d1a , U0d1b ] };
+ key <AC11> { [ U0d1f , U0d20 ] };
+
+ // From 'z' to slash (/)
+
+ key <AB01> { [ U0d46 , U0d0e ] };
+ key <AB02> { [ U0d02 , U0d7a ] };
+ key <AB03> { [ U0d2e , U0d23 ] };
+ key <AB04> { [ U0d28 , U0d7b ] };
+ key <AB05> { [ U0d35 , U0d34 ] };
+ key <AB06> { [ U0d32 , U0d33 ] };
+ key <AB07> { [ U0d38 , U0d36 ] };
+ key <AB08> { [ comma , U0d37 ] };
+ key <AB09> { [ period , U0d7d ] }; //chillu l
+ key <AB10> { [ U0d2f , question ] };
+
+ // hope this includes the rupee sign at alt + 4
+
+ include "rupeesign(4)"
+ include "level3(ralt_switch)"
+
+};
+
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/ir
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/ir:1.5 xsrc/external/mit/xkeyboard-config/dist/symbols/ir:1.6
--- xsrc/external/mit/xkeyboard-config/dist/symbols/ir:1.5 Mon Feb 21 05:03:18 2011
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/ir Sat Jul 23 11:21:56 2011
@@ -1,5 +1,3 @@
-// $XKeyboardConfig$
-
// Iranian keyboard layout
////////////////////////////////////////
@@ -16,7 +14,7 @@
partial default alphanumeric_keys
xkb_symbols "pes" {
- name[Group1]= "Iran";
+ name[Group1]= "Persian";
include "ir(pes_part_basic)"
include "ir(pes_part_ext)"
@@ -28,7 +26,7 @@
partial alphanumeric_keys
xkb_symbols "pes_keypad" {
- name[Group1]= "Iran - Persian, with Persian Keypad";
+ name[Group1]= "Persian (with Persian Keypad)";
include "ir(pes_part_basic)"
include "ir(pes_part_keypad)"
@@ -148,19 +146,19 @@
partial alphanumeric_keys
xkb_symbols "ku" {
include "tr(ku)"
- name[Group1]= "Iran - Kurdish, Latin Q";
+ name[Group1]= "Kurdish (Iran, Latin Q)";
};
partial alphanumeric_keys
xkb_symbols "ku_f" {
include "tr(ku_f)"
- name[Group1]= "Iran - Kurdish, (F)";
+ name[Group1]= "Kurdish (Iran, F)";
};
partial alphanumeric_keys
xkb_symbols "ku_alt" {
include "tr(ku_alt)"
- name[Group1]= "Iran - Kurdish, Latin Alt-Q";
+ name[Group1]= "Kurdish (Iran, Latin Alt-Q)";
};
////////////////////////////////////////
@@ -181,7 +179,7 @@
partial alphanumeric_keys
xkb_symbols "ku_ara" {
- name[Group1]= "Iran - Kurdish, Arabic-Latin";
+ name[Group1]= "Kurdish (Iran, Arabic-Latin)";
// Other 3-Level symbols
key <TLDE> { [ 0x100200d, division, asciitilde ] };
@@ -241,3 +239,68 @@
include "level3(ralt_switch)"
};
+// EXTRAS:
+
+/////////////////////////////////////////////////////////////////////////////////
+//
+// Generated keyboard layout file with the Keyboard Layout Editor.
+// For more about the software, see http://code.google.com/p/keyboardlayouteditor
+//
+// Version 0.2, fixed AD09.
+//
+// Layout by Ernst Tremel, http://ubuntuforums.org/showpost.php?p=9365469&postcount=32
+// Creation of this file by Simos Xenitellis.
+
+partial alphanumeric_keys
+xkb_symbols "ave"
+{
+ name[Group1] = "Avestan";
+
+ key <AB01> { [ U10B30, U10B32 ] }; // ๐ฌฐ ๐ฌฒ
+ key <AB02> { [ U10B11, U10B12 ] }; // ๐ฌ ๐ฌ
+ key <AB03> { [ U10B17, UE102 ] }; // ๐ฌ ๎
+ key <AB04> { [ U10B2C, U10B13 ] }; // ๐ฌฌ ๐ฌ
+ key <AB05> { [ U10B20, U10B21 ] }; // ๐ฌ ๐ฌก
+ key <AB06> { [ U10B25, U10B27 ] }; // ๐ฌฅ ๐ฌง
+ key <AB07> { [ U10B28, U10B29 ] }; // ๐ฌจ ๐ฌฉ
+ key <AB08> { [ U10B3C, U10B39 ] }; // ๐ฌผ ๐ฌน
+ key <AB09> { [ U10B3E, U10B3D ] }; // ๐ฌพ ๐ฌฝ
+ key <AB10> { [ U10B3F, periodcentered ] }; // ๐ฌฟ ยท
+
+ key <AC01> { [ U10B00, U10B01 ] }; // ๐ฌ ๐ฌ
+ key <AC02> { [ U10B2F, U10B31 ] }; // ๐ฌฏ ๐ฌฑ
+ key <AC03> { [ U10B1B, U10B1C ] }; // ๐ฌ ๐ฌ
+ key <AC04> { [ U10B1F, U10B16 ] }; // ๐ฌ ๐ฌ
+ key <AC05> { [ U10B14, U10B15 ] }; // ๐ฌ ๐ฌ
+ key <AC06> { [ U10B35, UE100 ] }; // ๐ฌต ๎
+ key <AC07> { [ U10B18, U10B24 ] }; // ๐ฌ ๐ฌค
+ key <AC08> { [ U10B10, UE101 ] }; // ๐ฌ ๎
+ key <AC09> { [ U10B2E, UE103 ] }; // ๐ฌฎ ๎
+ key <AC10> { [ U10B3B, U10B3A ] }; // ๐ฌป ๐ฌบ
+ key <AC11> { [ U10B1D ] }; // ๐ฌ
+
+ key <AD01> { [ U10B22, U10B23 ] }; // ๐ฌข ๐ฌฃ
+ key <AD02> { [ U10B33, U10B34 ] }; // ๐ฌณ ๐ฌด
+ key <AD03> { [ U10B08, U10B09 ] }; // ๐ฌ ๐ฌ
+ key <AD04> { [ U10B2D, U10B26 ] }; // ๐ฌญ ๐ฌฆ
+ key <AD05> { [ U10B19, U10B1A ] }; // ๐ฌ ๐ฌ
+ key <AD06> { [ U10B2B, U10B2A ] }; // ๐ฌซ ๐ฌช
+ key <AD07> { [ U10B0E, U10B0F ] }; // ๐ฌ ๐ฌ
+ key <AD08> { [ U10B0C, U10B0D ] }; // ๐ฌ ๐ฌ
+ key <AD09> { [ U10B0A, U10B0B ] }; // ๐ฌ ๐ฌ
+ key <AD10> { [ U10B1E ] }; // ๐ฌ
+ key <AD11> { [ U10B06, U10B07 ] }; // ๐ฌ ๐ฌ
+ key <AD12> { [ U10B02, U10B03 ] }; // ๐ฌ ๐ฌ
+
+ key <AE01> { [ U10B78 ] }; // ๐ญธ
+ key <AE02> { [ U10B79 ] }; // ๐ญน
+ key <AE03> { [ U10B7A ] }; // ๐ญบ
+ key <AE04> { [ U10B7B ] }; // ๐ญป
+ key <AE05> { [ U10B7C ] }; // ๐ญผ
+ key <AE06> { [ U10B7D ] }; // ๐ญฝ
+ key <AE07> { [ U10B7E ] }; // ๐ญพ
+ key <AE08> { [ U10B7F ] }; // ๐ญฟ
+
+ key <BKSL> { [ U10B04, U10B05 ] }; // ๐ฌ ๐ฌ
+ key <LSGT> { [ U10B04, U10B05 ] }; // ๐ฌ ๐ฌ
+};
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/lk
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/lk:1.4 xsrc/external/mit/xkeyboard-config/dist/symbols/lk:1.5
--- xsrc/external/mit/xkeyboard-config/dist/symbols/lk:1.4 Sun Nov 28 07:53:09 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/lk Sat Jul 23 11:21:56 2011
@@ -1,9 +1,7 @@
-// $XKeyboardConfig$
-
// X Keyboard Extension file for Sinhala (Sri Lanka) (2004-04-22)
// Maintainer : Harshula Jayasuriya <[email protected]>
-// Last Updated: 2007-06-29
-// This is a static phonetic mapping for a standard US-English keyboard
+// Last Updated: 2011-03-20
+// This is a phonetic static mapping for a standard US-English keyboard
// (qwerty)
// http://www.nongnu.org/sinhala/doc/keymaps/sinhala-keyboard_3.html
@@ -35,46 +33,46 @@
include "us"
// it is default - no details in the name
- name[Group1] = "Sri Lanka";
+ name[Group1] = "Sinhala";
key.type[Group1] = "FOUR_LEVEL";
// q - p
- key <AD01> { [ 0x01000d8d, 0x01000d8e, 0x01000dd8, 0x01000df2 ] };
- key <AD02> { [ 0x01000d87, 0x01000d88, 0x01000dd0, 0x01000dd1 ] };
- key <AD03> { [ 0x01000d91, 0x01000d92, 0x01000dd9, 0x01000dda ] };
- key <AD04> { [ 0x01000dbb, 0x01000dca, 0x01000dbb, NoSymbol ] };
- key <AD05> { [ 0x01000dad, 0x01000dae, 0x01000da7, 0x01000da8 ] };
- key <AD06> { [ 0x01000dba, 0x01000dca, NoSymbol, NoSymbol ] };
- key <AD07> { [ 0x01000d8b, 0x01000d8c, 0x01000dd4, 0x01000dd6 ] };
- key <AD08> { [ 0x01000d89, 0x01000d8a, 0x01000dd2, 0x01000dd3 ] };
- key <AD09> { [ 0x01000d94, 0x01000d95, 0x01000ddc, 0x01000ddd ] };
- key <AD10> { [ 0x01000db4, 0x01000db5, NoSymbol, NoSymbol ] };
+ key <AD01> { [ Sinh_ri, Sinh_rii, Sinh_ru2, Sinh_ruu2 ] };
+ key <AD02> { [ Sinh_ae, Sinh_aee, Sinh_ae2, Sinh_aee2 ] };
+ key <AD03> { [ Sinh_e, Sinh_ee, Sinh_e2, Sinh_ee2 ] };
+ key <AD04> { [ Sinh_ra, Sinh_al, Sinh_ra, NoSymbol ] };
+ key <AD05> { [ Sinh_tha, Sinh_thha, Sinh_tta, Sinh_ttha ] };
+ key <AD06> { [ Sinh_ya, Sinh_al, NoSymbol, NoSymbol ] };
+ key <AD07> { [ Sinh_u, Sinh_uu, Sinh_u2, Sinh_uu2 ] };
+ key <AD08> { [ Sinh_i, Sinh_ii, Sinh_i2, Sinh_ii2 ] };
+ key <AD09> { [ Sinh_o, Sinh_oo, Sinh_o2, Sinh_oo2 ] };
+ key <AD10> { [ Sinh_pa, Sinh_pha, NoSymbol, NoSymbol ] };
// a - l
- key <AC01> { [ 0x01000d85, 0x01000d86, 0x01000dca, 0x01000dcf ] };
- key <AC02> { [ 0x01000dc3, 0x01000dc1, 0x01000dc2, NoSymbol ] };
- key <AC03> { [ 0x01000daf, 0x01000db0, 0x01000da9, 0x01000daa ] };
- key <AC04> { [ 0x01000dc6, NoSymbol, 0x01000ddb, 0x01000d93 ] };
- key <AC05> { [ 0x01000d9c, 0x01000d9d, 0x01000d9f, NoSymbol ] };
- key <AC06> { [ 0x01000dc4, 0x01000d83, 0x01000dde, 0x01000d96 ] };
- key <AC07> { [ 0x01000da2, 0x01000da3, 0x01000da6, NoSymbol ] };
- key <AC08> { [ 0x01000d9a, 0x01000d9b, 0x01000d8f, 0x01000d90 ] };
- key <AC09> { [ 0x01000dbd, 0x01000dc5, 0x01000ddf, 0x01000df3 ] };
+ key <AC01> { [ Sinh_a, Sinh_aa, Sinh_al, Sinh_aa2 ] };
+ key <AC02> { [ Sinh_sa, Sinh_sha, Sinh_ssha, NoSymbol ] };
+ key <AC03> { [ Sinh_dha, Sinh_dhha, Sinh_dda, Sinh_ddha ] };
+ key <AC04> { [ Sinh_fa, NoSymbol, Sinh_ai2, Sinh_ai ] };
+ key <AC05> { [ Sinh_ga, Sinh_gha, Sinh_nga, NoSymbol ] };
+ key <AC06> { [ Sinh_ha, Sinh_h2, Sinh_au2, Sinh_au ] };
+ key <AC07> { [ Sinh_ja, Sinh_jha, Sinh_nja, NoSymbol ] };
+ key <AC08> { [ Sinh_ka, Sinh_kha, Sinh_lu, Sinh_luu ] };
+ key <AC09> { [ Sinh_la, Sinh_lla, Sinh_lu2, Sinh_luu2 ] };
// z - ?
- key <AB01> { [ 0x01000da4, 0x01000da5, NoSymbol, NoSymbol ] };
- key <AB02> { [ 0x01000db3, 0x01000dac, NoSymbol, NoSymbol ] };
- key <AB03> { [ 0x01000da0, 0x01000da1, NoSymbol, NoSymbol ] };
- key <AB04> { [ 0x01000dc0, NoSymbol, NoSymbol, NoSymbol ] };
- key <AB05> { [ 0x01000db6, 0x01000db7, NoSymbol, NoSymbol ] };
- key <AB06> { [ 0x01000db1, 0x01000dab, 0x01000d82, 0x01000d9e ] };
- key <AB07> { [ 0x01000db8, 0x01000db9, NoSymbol, NoSymbol ] };
- key <AB08> { [ any, any, 0x01000dca, NoSymbol ] };
- key <AB09> { [ any, any, 0x01000df4, NoSymbol ] };
- key <AB10> { [ any, any, 0x0100200d, NoSymbol ] };
+ key <AB01> { [ Sinh_nya, Sinh_jnya, NoSymbol, NoSymbol ] };
+ key <AB02> { [ Sinh_ndha, Sinh_ndda, NoSymbol, NoSymbol ] };
+ key <AB03> { [ Sinh_ca, Sinh_cha, NoSymbol, NoSymbol ] };
+ key <AB04> { [ Sinh_va, NoSymbol, NoSymbol, NoSymbol ] };
+ key <AB05> { [ Sinh_ba, Sinh_bha, NoSymbol, NoSymbol ] };
+ key <AB06> { [ Sinh_na, Sinh_nna, Sinh_ng, Sinh_ng2 ] };
+ key <AB07> { [ Sinh_ma, Sinh_mba, NoSymbol, NoSymbol ] };
+ key <AB08> { [ any, any, Sinh_al, NoSymbol ] };
+ key <AB09> { [ any, any, Sinh_kunddaliya, NoSymbol ] };
+ key <AB10> { [ any, any, 0x100200d, NoSymbol ] };
// Space
- include "nbsp(zwnj2nb3s)"
+ include "nbsp(nb2zwnj3s)"
include "level3(ralt_switch)"
};
@@ -82,12 +80,12 @@
partial alphanumeric_keys
xkb_symbols "tam_unicode" {
include "in(tam_unicode)"
- name[Group1]= "Sri Lanka - Tamil Unicode";
+ name[Group1]= "Tamil (Sri Lanka, Unicode)";
};
partial alphanumeric_keys
xkb_symbols "tam_TAB" {
include "in(tam_TAB)"
- name[Group1]= "Sri Lanka - Tamil TAB Typewriter";
+ name[Group1]= "Tamil (Sri Lanka, TAB Typewriter)";
};
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sy
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/sy:1.4 xsrc/external/mit/xkeyboard-config/dist/symbols/sy:1.5
--- xsrc/external/mit/xkeyboard-config/dist/symbols/sy:1.4 Sun Nov 28 07:53:09 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/sy Sat Jul 23 11:21:56 2011
@@ -1,18 +1,12 @@
-// $XKeyboardConfig$
-
-//
-// $XFree86: xc/programs/xkbcomp/symbols/syr,v 1.1 2002/11/22 03:06:50 dawes Exp $
-//
-
partial default alphanumeric_keys
xkb_symbols "basic" {
include "ara(basic)"
- name[Group1]= "Syria";
+ name[Group1]= "Arabic (Syria)";
};
partial alphanumeric_keys
xkb_symbols "syc" {
- name[Group1]= "Syria - Syriac";
+ name[Group1]= "Syriac";
key <TLDE> { [ 0x100070F, 0x100032E, Arabic_shadda ] };
key <AE01> { [ 1, exclam, 0x1000701 ] };
@@ -79,13 +73,10 @@
modifier_map Mod2 { Mode_switch };
};
-//
-// $XFree86: xc/programs/xkbcomp/symbols/syr_phonetic,v 1.1 2002/11/22 03:06:50 dawes Exp $
-//
partial alphanumeric_keys
xkb_symbols "syc_phonetic" {
- name[Group1]= "Syria - Syriac phonetic";
+ name[Group1]= "Syriac (phonetic)";
key <TLDE> { [ 0x100070F, 0x100032E, Arabic_shadda ] };
key <AE01> { [ 1, exclam, 0x1000701 ] };
@@ -155,18 +146,17 @@
partial alphanumeric_keys
xkb_symbols "ku" {
include "tr(ku)"
- name[Group1]= "Syria - Kurdish, Latin Q";
+ name[Group1]= "Kurdish (Syria, Latin Q)";
};
partial alphanumeric_keys
xkb_symbols "ku_f" {
include "tr(ku_f)"
- name[Group1]= "Syria - Kurdish, (F)";
+ name[Group1]= "Kurdish (Syria, F)";
};
partial alphanumeric_keys
xkb_symbols "ku_alt" {
include "tr(ku_alt)"
- name[Group1]= "Syria - Kurdish, Latin Alt-Q";
+ name[Group1]= "Kurdish (Syria, Latin Alt-Q)";
};
-
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.10 xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.11
--- xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.10 Mon Feb 21 05:03:18 2011
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir Sat Jul 23 11:21:56 2011
@@ -29,3 +29,95 @@
--p----- a------- de(qwerty)
--p----- a------- de(ru)
--p----- a------- de(htcdream)
+-dp----- a------- il(basic)
+--p----- a------- il(lyx)
+--p----- a------- il(phonetic)
+--p----- a------- il(biblical)
+-dp----- a------- ro(basic)
+--p----- a------- ro(cedilla)
+--p----- a------- ro(std)
+--p----- a------- ro(std_cedilla)
+--p----- a------- ro(winkeys)
+--p----- -------- ro(crh_dobruja)
+--p----- a------- ro(ergonomic)
+--p----- -------- eurosign(e)
+--p----- -------- eurosign(2)
+--p----- -------- eurosign(4)
+--p----- -------- eurosign(5)
+-dp----- a------- me(basic)
+--p----- a------- me(cyrillic)
+--p----- a------- me(cyrillicyz)
+--p----- a------- me(latinunicode)
+--p----- a------- me(latinyz)
+--p----- a------- me(latinunicodeyz)
+-------- -------- me(cyrillicalternatequotes)
+-------- -------- me(latinalternatequotes)
+-dp----- a------- mm(basic)
+-dp----- a------- ma(arabic)
+--p----- a------- ma(french)
+--p----- a------- ma(tifinagh)
+--p----- a------- ma(tifinagh-phonetic)
+--p----- a------- ma(tifinagh-extended)
+--p----- a------- ma(tifinagh-extended-phonetic)
+--p----- a------- ma(tifinagh-alt)
+--p----- a------- ma(tifinagh-alt-phonetic)
+-dp----- a------- fi(kotoistus)
+--p----- a------- fi(classic)
+h-p----- a------- fi(fi)
+--p----- a------- fi(nodeadkeys)
+--p----- a------- fi(smi)
+--p----- a------- fi(mac)
+-dp----- a------- tz(swa)
+-dp----- a------- bt(basic)
+-dp----- a------- ie(basic)
+--p----- a------- ie(CloGaelach)
+--p----- a------- ie(UnicodeExpert)
+--p----- a------- ie(ogam)
+--p----- a------- ie(ogam_is434)
+-dp----- a------- be(basic)
+--p----- a------- be(oss)
+--p----- a------- be(oss_frbe)
+--p----- a------- be(oss_latin9)
+--p----- a------- be(oss_Sundeadkeys)
+--p----- a------- be(oss_sundeadkeys)
+--p----- a------- be(iso-alternate)
+--p----- a------- be(sundeadkeys)
+--p----- a------- be(Sundeadkeys)
+--p----- a------- be(nodeadkeys)
+--p----- a------- be(wang)
+--p----- --kf---- srvr_ctrl(xfree86)
+--p----- --k----- srvr_ctrl(stdkeypad)
+--p----- ---f---- srvr_ctrl(fkey2vt)
+--p----- --kf---- srvr_ctrl(no_srvr_keys)
+-dp----- a------- tw(tw)
+--p----- a------- tw(indigenous)
+--p----- a------- tw(saisiyat)
+-dp----- a------- ba(basic)
+--p----- a------- ba(us)
+--p----- a------- ba(alternatequotes)
+--p----- a------- ba(unicode)
+--p----- a------- ba(unicodeus)
+-dp----- a------- ng(basic)
+--p----- a------- ng(yoruba)
+--p----- a------- ng(igbo)
+--p----- a------- ng(hausa)
+--p----- a------- ng(olpc)
+-dp----- a------- af(basic)
+--p----- a------- af(ps)
+--p----- a------- af(uz)
+--p----- a------- af(olpc-ps)
+--p----- a------- af(fa-olpc)
+--p----- a------- af(uz-olpc)
+-dp----- a------- dk(basic)
+--p----- a------- dk(nodeadkeys)
+--p----- a------- dk(mac)
+--p----- a------- dk(mac_nodeadkeys)
+--p----- a------- dk(dvorak)
+-dp----- a------- fo(basic)
+--p----- a------- fo(nodeadkeys)
+-dp----- a---g--- gr(basic)
+--p----- a---g--- gr(simple)
+h-p----- a---g--- gr(bare)
+--p----- a---g--- gr(extended)
+--p----- a---g--- gr(polytonic)
+--p----- a---g--- gr(nodeadkeys)
