Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src update for xkeyboard-config 2.19
details: https://anonhg.NetBSD.org/src/rev/d49504eb7470
branches: trunk
changeset: 349076:d49504eb7470
user: snj <snj%NetBSD.org@localhost>
date: Tue Nov 22 19:51:37 2016 +0000
description:
update for xkeyboard-config 2.19
diffstat:
distrib/sets/lists/xbase/mi | 15 +-
etc/mtree/NetBSD.dist.Xorg | 3 +-
external/mit/xorg/lib/xkeyboard-config/Makefile | 5 +-
external/mit/xorg/lib/xkeyboard-config/geometry/Makefile | 4 +-
external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile | 4 +-
external/mit/xorg/lib/xkeyboard-config/rules/base | 45 +-
external/mit/xorg/lib/xkeyboard-config/rules/base.lst | 61 +-
external/mit/xorg/lib/xkeyboard-config/rules/evdev | 43 +-
external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst | 61 +-
external/mit/xorg/lib/xkeyboard-config/symbols/Makefile | 18 +-
external/mit/xorg/lib/xkeyboard-config/symbols/jolla_vndr/Makefile | 11 +
external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.7 | 1341 ++++++++++
12 files changed, 1516 insertions(+), 95 deletions(-)
diffs (truncated from 2258 to 300 lines):
diff -r cc2618a5105e -r d49504eb7470 distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi Tue Nov 22 19:46:26 2016 +0000
+++ b/distrib/sets/lists/xbase/mi Tue Nov 22 19:51:37 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.135 2016/10/04 23:52:02 mrg Exp $
+# $NetBSD: mi,v 1.136 2016/11/22 19:51:37 snj Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -675,6 +675,7 @@
./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/indy -unknown- xorg
./usr/X11R7/lib/X11/xkb/geometry/sony -unknown- xorg
./usr/X11R7/lib/X11/xkb/geometry/sun -unknown- xorg
+./usr/X11R7/lib/X11/xkb/geometry/teck -unknown- xorg
./usr/X11R7/lib/X11/xkb/geometry/thinkpad -unknown- xorg
./usr/X11R7/lib/X11/xkb/geometry/typematrix -unknown- xorg
./usr/X11R7/lib/X11/xkb/geometry/winbook -unknown- xorg
@@ -695,6 +696,7 @@
./usr/X11R7/lib/X11/xkb/keycodes/fujitsu -unknown- xorg
./usr/X11R7/lib/X11/xkb/keycodes/hp -unknown- xorg
./usr/X11R7/lib/X11/xkb/keycodes/ibm -unknown- xorg
+./usr/X11R7/lib/X11/xkb/keycodes/jolla -unknown- xorg
./usr/X11R7/lib/X11/xkb/keycodes/macintosh -unknown- xorg
./usr/X11R7/lib/X11/xkb/keycodes/olpc -unknown- xorg
./usr/X11R7/lib/X11/xkb/keycodes/powerpcps2 -unknown- obsolete
@@ -839,12 +841,14 @@
./usr/X11R7/lib/X11/xkb/symbols/ar -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/ara -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/at -unknown- xorg
+./usr/X11R7/lib/X11/xkb/symbols/au -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/az -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/ba -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/bd -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/be -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/ben -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/bg -unknown- xorg
+./usr/X11R7/lib/X11/xkb/symbols/bn -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/br -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/brai -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/braille -unknown- obsolete
@@ -880,6 +884,7 @@
./usr/X11R7/lib/X11/xkb/symbols/digital_vndr/vt -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/dk -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/dvorak -unknown- obsolete
+./usr/X11R7/lib/X11/xkb/symbols/dz -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/ee -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/el -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/empty -unknown- xorg
@@ -924,6 +929,7 @@
./usr/X11R7/lib/X11/xkb/symbols/hu -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/hu_US -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/hu_qwerty -unknown- obsolete
+./usr/X11R7/lib/X11/xkb/symbols/id -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/ie -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/il -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/il_phonetic -unknown- obsolete
@@ -935,6 +941,8 @@
./usr/X11R7/lib/X11/xkb/symbols/iso9995-3 -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/it -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/iu -unknown- obsolete
+./usr/X11R7/lib/X11/xkb/symbols/jolla_vndr base-x11-root xorg
+./usr/X11R7/lib/X11/xkb/symbols/jolla_vndr/sbj -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/jp -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/kan -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/ke -unknown- xorg
@@ -999,6 +1007,7 @@
./usr/X11R7/lib/X11/xkb/symbols/mt -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/mt_us -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/mv -unknown- xorg
+./usr/X11R7/lib/X11/xkb/symbols/my -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/nbsp -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/nec -obsolete- obsolete
./usr/X11R7/lib/X11/xkb/symbols/nec/jp -unknown- obsolete
@@ -1014,6 +1023,7 @@
./usr/X11R7/lib/X11/xkb/symbols/np -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/ogham -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/olpc -unknown- xorg
+./usr/X11R7/lib/X11/xkb/symbols/parens -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/ori -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/pc -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/pc/al -unknown- obsolete
@@ -1168,6 +1178,7 @@
./usr/X11R7/lib/X11/xkb/symbols/syr_phonetic -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/tel -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/terminate -unknown- xorg
+./usr/X11R7/lib/X11/xkb/symbols/tg -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/th -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/th_pat -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/th_tis -unknown- obsolete
@@ -1525,6 +1536,7 @@
./usr/X11R7/man/html7/XOrgFoundation.html -unknown- html,xorg
./usr/X11R7/man/html7/XProjectTeam.html -unknown- html,xorg
./usr/X11R7/man/html7/Xsecurity.html -unknown- html,xorg
+./usr/X11R7/man/html7/xkeyboard-config.html -unknown- html,xorg
./usr/X11R7/man/man1 base-x11-root xorg
./usr/X11R7/man/man1/appres.1 -unknown- .man,xorg
./usr/X11R7/man/man1/atobm.1 -unknown- .man,xorg
@@ -1669,6 +1681,7 @@
./usr/X11R7/man/man7/XOrgFoundation.7 -unknown- .man,xorg
./usr/X11R7/man/man7/XProjectTeam.7 -unknown- .man,xorg
./usr/X11R7/man/man7/Xsecurity.7 -unknown- .man,xorg
+./usr/X11R7/man/man7/xkeyboard-config.7 -unknown- .man,xorg
./usr/X11R7/man/whatis.db -unknown- man,xorg,!makemandb
./usr/X11R7/share base-x11-root xorg
./usr/X11R7/share/aclocal base-x11-root xorg
diff -r cc2618a5105e -r d49504eb7470 etc/mtree/NetBSD.dist.Xorg
--- a/etc/mtree/NetBSD.dist.Xorg Tue Nov 22 19:46:26 2016 +0000
+++ b/etc/mtree/NetBSD.dist.Xorg Tue Nov 22 19:51:37 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.Xorg,v 1.19 2016/10/04 23:52:02 mrg Exp $
+# $NetBSD: NetBSD.dist.Xorg,v 1.20 2016/11/22 19:51:37 snj Exp $
./usr/X11R7
./usr/X11R7/bin
./usr/X11R7/include
@@ -130,6 +130,7 @@
./usr/X11R7/lib/X11/xkb/symbols/digital_vndr
./usr/X11R7/lib/X11/xkb/symbols/fujitsu_vndr
./usr/X11R7/lib/X11/xkb/symbols/hp_vndr
+./usr/X11R7/lib/X11/xkb/symbols/jolla_vndr
./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr
./usr/X11R7/lib/X11/xkb/symbols/nec_vndr
./usr/X11R7/lib/X11/xkb/symbols/nokia_vndr
diff -r cc2618a5105e -r d49504eb7470 external/mit/xorg/lib/xkeyboard-config/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/Makefile Tue Nov 22 19:46:26 2016 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/Makefile Tue Nov 22 19:51:37 2016 +0000
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2013/05/31 23:50:51 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/11/22 19:51:37 snj Exp $
.include <bsd.own.mk>
+# XXX when updating to a new xkeyboard-config, regenerate with xsltproc
+MAN= xkeyboard-config.7
+
SUBDIR= compat geometry keycodes rules symbols types
NOOBJ= # defined
diff -r cc2618a5105e -r d49504eb7470 external/mit/xorg/lib/xkeyboard-config/geometry/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile Tue Nov 22 19:46:26 2016 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile Tue Nov 22 19:51:37 2016 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2011/02/21 05:10:27 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/11/22 19:51:37 snj Exp $
.include <bsd.own.mk>
XKBNAME= geometry
FILES= README amiga ataritt chicony dell everex fujitsu hhk hp \
keytronic kinesis macintosh microsoft nec nokia northgate \
- pc sanwa sony sun thinkpad typematrix winbook
+ pc sanwa sony sun teck thinkpad typematrix winbook
SUBDIR= digital_vndr sgi_vndr
diff -r cc2618a5105e -r d49504eb7470 external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile Tue Nov 22 19:46:26 2016 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile Tue Nov 22 19:51:37 2016 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 23:28:25 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/11/22 19:51:37 snj Exp $
.include <bsd.own.mk>
XKBNAME= keycodes
FILES= README aliases amiga ataritt empty evdev fujitsu hp ibm \
- macintosh olpc sony sun xfree86 xfree98
+ jolla macintosh olpc sony sun xfree86 xfree98
SUBDIR= digital_vndr sgi_vndr
diff -r cc2618a5105e -r d49504eb7470 external/mit/xorg/lib/xkeyboard-config/rules/base
--- a/external/mit/xorg/lib/xkeyboard-config/rules/base Tue Nov 22 19:46:26 2016 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/rules/base Tue Nov 22 19:51:37 2016 +0000
@@ -9,12 +9,15 @@
// If you want non-latin layouts implicitly include the en_US layout
// uncomment lines below
//! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \
-// in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \
-// ru scc sy syr tel th tj tam ua uz
+// in ir iku jp kan kh kr la lao lk mk mm mn mv mal olck \
+// ori pk ru scc sy syr tel th tj tam ua uz
// PC models
! $pcmodels = pc101 pc102 pc104 pc105
+// Jolla devices and keyboards
+! $jollamodels = jollasbj
+
// Microsoft models (using MS geometry)
! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
@@ -122,7 +125,8 @@
sk1300 sk2500 sk6200 sk7100 \
sven sven303 symplon \
toshiba_s3000 trust trustda \
- unitekkb1925 yahoo
+ unitekkb1925 yahoo \
+ teck227 teck229
! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \
cherrybluea herrycyboard chicony042 compaqik13 compaqik18 \
@@ -347,6 +351,8 @@
classmate us = pc+%l(classmate)
empty * = empty(basic)
* empty = empty(basic)
+ jollasbj $nonlatin = jolla_vndr/sbj(common)+us+%l%(v):2
+ jollasbj * = jolla_vndr/sbj(common)+%l%(v)
$sun $sun_custom = pc+sun_vndr/%l%(v)
pc98 nec_vndr/jp = nec_vndr/jp(pc98)
macintosh_old us = macintosh_vndr/us(oldmac)
@@ -456,6 +462,7 @@
* yu(unicodeyz) = pc+srp(latinunicodeyz)
ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1])
amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
+ jollasbj * = jolla_vndr/sbj(common)+%l[1]%(v[1])
$sun $sun_custom = pc+sun_vndr/%l[1]%(v[1])
macintosh_old us = macintosh_vndr/us(oldmac)
macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
@@ -927,6 +934,7 @@
btc5126t = +inet(nav_acpi_common)
btc9116u = +inet(btc9019u)
btc6301urf = +inet(media_nav_acpi_common)
+ chromebook = +inet(chromebook)
dellsk8125 = +inet(dell)
dellsk8135 = +inet(dell)
cherrybunlim = +inet(nav_common)
@@ -977,26 +985,51 @@
! layout variant = compat
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de koy = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone_eszett_home = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwertz = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwerty = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
jp $sun_compat = complete+japan(kana_lock)
! layout[1] variant[1] = compat
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de koy = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone_eszett_home = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwertz = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwerty = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
jp $sun_compat = complete+japan(kana_lock)
! layout[2] variant[2] = compat
de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
de adnw = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de koy = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de bone = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de bone_eszett_home = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de neo_qwertz = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de neo_qwerty = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
jp $sun_compat = +complete+japan(kana_lock):2
! layout[3] variant[3] = compat
de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
de adnw = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de koy = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de bone = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de bone_eszett_home = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de neo_qwertz = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de neo_qwerty = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
jp $sun_compat = +complete+japan(kana_lock):3
! layout[4] variant[4] = compat
de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
de adnw = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de koy = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de bone = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de bone_eszett_home = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de neo_qwertz = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de neo_qwerty = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
jp $sun_compat = +complete+japan(kana_lock):4
! model layout = compat
@@ -1046,7 +1079,9 @@
altwin:left_meta_win = +altwin(left_meta_win)
altwin:hyper_win = +altwin(hyper_win)
altwin:alt_super_win = +altwin(alt_super_win)
+ altwin:swap_lalt_lwin = +altwin(swap_lalt_lwin)
altwin:swap_alt_win = +altwin(swap_alt_win)
+ altwin:prtsc_rwin = +altwin(prtsc_rwin)
grab:debug = +srvr_ctrl(grab_debug)
grp:switch = +group(switch)
grp:lswitch = +group(lswitch)
@@ -1089,6 +1124,7 @@
grp:ralt_rshift_toggle = +group(ralt_rshift_toggle)
grp:alt_shift_toggle = +group(alt_shift_toggle)
grp:alt_shift_toggle_bidir = +group(alt_shift_toggle_bidir)
+ grp:lctrl_lwin_toggle = +group(lctrl_lwin_toggle)
lv3:switch = +level3(switch)
lv3:ralt_switch = +level3(ralt_switch)
lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
@@ -1108,6 +1144,7 @@
caps:backspace = +capslock(backspace)
caps:super = +capslock(super)
caps:hyper = +capslock(hyper)
Home |
Main Index |
Thread Index |
Old Index