Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src updates for xkeyboard-config 2.29.



details:   https://anonhg.NetBSD.org/src/rev/926c3f5b1c6f
branches:  trunk
changeset: 969578:926c3f5b1c6f
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Feb 23 11:17:03 2020 +0000

description:
updates for xkeyboard-config 2.29.

diffstat:

 distrib/sets/lists/xbase/mi                             |    4 +-
 external/mit/xorg/lib/xkeyboard-config/compat/Makefile  |    4 +-
 external/mit/xorg/lib/xkeyboard-config/rules/base       |  568 ++++++++-------
 external/mit/xorg/lib/xkeyboard-config/rules/base.lst   |   48 +-
 external/mit/xorg/lib/xkeyboard-config/rules/evdev      |  567 ++++++++-------
 external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst  |   48 +-
 external/mit/xorg/lib/xkeyboard-config/symbols/Makefile |    4 +-
 7 files changed, 664 insertions(+), 579 deletions(-)

diffs (truncated from 1839 to 300 lines):

diff -r 14d0f868b4a0 -r 926c3f5b1c6f distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi       Sun Feb 23 10:56:03 2020 +0000
+++ b/distrib/sets/lists/xbase/mi       Sun Feb 23 11:17:03 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.155 2020/01/19 00:58:13 jmcneill Exp $
+# $NetBSD: mi,v 1.156 2020/02/23 11:17:03 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -630,6 +630,7 @@
 ./usr/X11R7/lib/X11/xkb/compat/japan                   xbase-xkeyboard-config-lib      xorg
 ./usr/X11R7/lib/X11/xkb/compat/keypad                  xbase-obsolete  obsolete
 ./usr/X11R7/lib/X11/xkb/compat/ledcaps                 xbase-xkeyboard-config-lib      xorg
+./usr/X11R7/lib/X11/xkb/compat/ledcompose              xbase-xkeyboard-config-lib      xorg
 ./usr/X11R7/lib/X11/xkb/compat/lednum                  xbase-xkeyboard-config-lib      xorg
 ./usr/X11R7/lib/X11/xkb/compat/ledscroll               xbase-xkeyboard-config-lib      xorg
 ./usr/X11R7/lib/X11/xkb/compat/level5                  xbase-xkeyboard-config-lib      xorg
@@ -952,6 +953,7 @@
 ./usr/X11R7/lib/X11/xkb/symbols/jolla_vndr             base-x11-root   xorg
 ./usr/X11R7/lib/X11/xkb/symbols/jolla_vndr/sbj         xbase-xkeyboard-config-lib      xorg
 ./usr/X11R7/lib/X11/xkb/symbols/jp                     xbase-xkeyboard-config-lib      xorg
+./usr/X11R7/lib/X11/xkb/symbols/jv                     xbase-xkeyboard-config-lib      xorg
 ./usr/X11R7/lib/X11/xkb/symbols/kan                    xbase-obsolete  obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/ke                     xbase-xkeyboard-config-lib      xorg
 ./usr/X11R7/lib/X11/xkb/symbols/keypad                 xbase-xkeyboard-config-lib      xorg
diff -r 14d0f868b4a0 -r 926c3f5b1c6f external/mit/xorg/lib/xkeyboard-config/compat/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/compat/Makefile    Sun Feb 23 10:56:03 2020 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/compat/Makefile    Sun Feb 23 11:17:03 2020 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.4 2017/02/13 06:11:01 snj Exp $
+#      $NetBSD: Makefile,v 1.5 2020/02/23 11:17:03 mrg Exp $
 
 .include <bsd.own.mk>
 
 XKBNAME=       compat
 FILES=         README accessx basic caps complete iso9995 japan \
-               ledcaps lednum ledscroll level5 misc mousekeys \
+               ledcaps ledcompose lednum ledscroll level5 misc mousekeys \
                olpc pc pc98 xfree86 xtest
 
 .include "../Makefile.xkbdata"
diff -r 14d0f868b4a0 -r 926c3f5b1c6f external/mit/xorg/lib/xkeyboard-config/rules/base
--- a/external/mit/xorg/lib/xkeyboard-config/rules/base Sun Feb 23 10:56:03 2020 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/rules/base Sun Feb 23 11:17:03 2020 +0000
@@ -1,4 +1,5 @@
-// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.sh FROM rules/*.part
+// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.py FROM rules/*.part
+//
 //
 //  Rules for resolving XKB components for use with XFree86
 //  Copyright 1996 by Joseph Moss
@@ -19,7 +20,7 @@
 ! $jollamodels = jollasbj
 
 // Microsoft models (using MS geometry)
-! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
+! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose microsoftsurface
 
 // Nokia devices and keyboards
 ! $nokiamodels = nokiasu8w nokiarx44 nokiarx51
@@ -85,7 +86,6 @@
 
 ! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat
 
-! $htcdreamlayouts = us it de
 
 ! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
               airkey \
@@ -104,7 +104,7 @@
               genius geniuscomfy2 \
               gyration honeywell_euroboard \
               hp250x hp5xx hp500fa hpdv5 \
-              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
+              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
               ibm_spacesaver ipaq inspiron intel \
               logiaccess logicda logicink \
               logiex110 logiclx300 \
@@ -382,86 +382,85 @@
   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)
 
-! model                layout[1]                       =       symbols
-  *            ar                      =       pc+ara%(v[1])
-  *            ben                     =       pc+in(ben)
-  *            bs                      =       pc+ba%(v[1])
-  *            cs                      =       pc+rs%(v[1])
-  *            cz_qwerty                       =       pc+cz(qwerty)
-  *            dev                     =       pc+in(deva)
-  *            dvorak                  =       pc+us(dvorak)
-  *            dzdwi                   =       pc+bt%(v[1])
-  *            el                      =       pc+gr%(v[1])
-  *            en_US                   =       pc+latin%(v[1])
-  *            guj                     =       pc+in(guj)
-  *            gur                     =       pc+in(guru)
-  *            iu                      =       pc+ca(ike)
-  *            lo                      =       pc+la%(v[1])
-  *            kan                     =       pc+in(kan)
-  *            mi                      =       pc+mao%(v[1])
-  *            ogham                   =       pc+ie(ogam)
-  *            ori                     =       pc+ie(ori)
-  *            sapmi                   =       pc+no(smi)
-  *            sr                      =       pc+srp%(v[1])
-  *            syr                     =       pc+sy(syc)
-  *            tel                     =       pc+in(tel)
-  *            tml                     =       pc+in(tam)
-  *            yu                      =       pc+srp%(v[1])
-  *            fr-latin9                       =       pc+fr(latin9)
-  *            us_intl                 =       pc+us(alt-intl)
-  *            ben(basic)                      =       pc+in(ben)
-  *            ben(probhat)                    =       pc+in(ben_probhat)
-  *            dev(basic)                      =       pc+in(deva)
-  *            dvorak($dvoraklayouts)                  =       pc+%v(dvorak)
-  *            dvorak(basic)                   =       pc+us(dvorak)
-  *            dvorak(pl_basic)                        =       pc+pl(dvorak)
-  *            dvorak(pl)                      =       pc+pl(dvorak_quotes)
-  *            dvorak(pl_altquotes)                    =       pc+pl(dvorak_altquotes)
-  *            dzdwi(basic)                    =       pc+bt(basic)
-  *            fi(basic)                       =       pc+fi(classic)
-  *            ge(azerty_tskapo)                       =       pc+fr(geo)
-  *            guj(basic)                      =       pc+in(guj)
-  *            gur(basic)                      =       pc+in(guru)
-  *            ie(laptop)                      =       pc+ie(basic)
-  *            ie(CloGaelachLaptop)                    =       pc+ie(CloGaelach)
-  *            in(urd)                 =       pc+in(urd-phonetic)
-  *            iu(basic)                       =       pc+ca(ike)
-  *            lo(basic)                       =       pc+la(basic)
-  *            kan(basic)                      =       pc+in(kan)
-  *            mal(basic)                      =       pc+in(mal)
-  *            mal(mlplusnum)                  =       pc+in(mal)
-  *            ogham(basic)                    =       pc+ie(ogam)
-  *            ogham(laptop)                   =       pc+ie(ogam)
-  *            ogham(is434)                    =       pc+ie(ogam_is434)
-  *            ogham(is434laptop)                      =       pc+ie(ogam_is434)
-  *            ori(basic)                      =       pc+in(ori)
-  *            ro(de)                  =       pc+ro(winkeys)
-  *            ro(us)                  =       pc+ro(std)
-  *            ro(academic)                    =       pc+ro(std)
-  *            ro(std_comma)                   =       pc+ro(std)
-  *            ro(comma)                       =       pc+ro(basic)
-  *            ru(os)                  =       pc+ru(os_legacy)
-  *            pk(urd)                 =       pc+pk(urd-phonetic)
-  *            sapmi(basic)                    =       pc+no(smi)
-  *            sapmi(nodeadkeys)                       =       pc+no(smi_nodeadkeys)
-  *            sapmi(sefi)                     =       pc+fi(smi)
-  *            sin(phonetic-static)                    =       pc+in(sin_phonetic)
-  *            syr(basic)                      =       pc+sy(syc)
-  *            syr(phonetic)                   =       pc+sy(syc_phonetic)
-  *            tam(INSCRIPT)                   =       pc+in(tam)
-  *            tam(UNI)                        =       pc+in(tam_unicode)
-  *            tam(NUMERAL-KEYBOARD)                   =       pc+in(tam_keyboard_with_numerals)
-  *            tam(TAB)                        =       pc+in(tam_TAB)
-  *            tam(TSCII)                      =       pc+in(tam_TSCII)
-  *            tel(basic)                      =       pc+in(tel)
-  *            yu(basic)                       =       pc+srp(latin)
-  *            yu(unicode)                     =       pc+srp(latinunicode)
-  *            yu(yz)                  =       pc+srp(latinyz)
-  *            yu(unicodeyz)                   =       pc+srp(latinunicodeyz)
+! model                layout[1]       =       symbols
+  *            ar              =       pc+ara%(v[1])
+  *            ben             =       pc+in(ben)
+  *            bs              =       pc+ba%(v[1])
+  *            cs              =       pc+rs%(v[1])
+  *            cz_qwerty               =       pc+cz(qwerty)
+  *            dev             =       pc+in(deva)
+  *            dvorak          =       pc+us(dvorak)
+  *            dzdwi           =       pc+bt%(v[1])
+  *            el              =       pc+gr%(v[1])
+  *            en_US           =       pc+latin%(v[1])
+  *            guj             =       pc+in(guj)
+  *            gur             =       pc+in(guru)
+  *            iu              =       pc+ca(ike)
+  *            lo              =       pc+la%(v[1])
+  *            kan             =       pc+in(kan)
+  *            mi              =       pc+mao%(v[1])
+  *            ogham           =       pc+ie(ogam)
+  *            ori             =       pc+ie(ori)
+  *            sapmi           =       pc+no(smi)
+  *            sr              =       pc+srp%(v[1])
+  *            syr             =       pc+sy(syc)
+  *            tel             =       pc+in(tel)
+  *            tml             =       pc+in(tam)
+  *            yu              =       pc+srp%(v[1])
+  *            fr-latin9               =       pc+fr(latin9)
+  *            us_intl         =       pc+us(alt-intl)
+  *            ben(basic)              =       pc+in(ben)
+  *            ben(probhat)            =       pc+in(ben_probhat)
+  *            dev(basic)              =       pc+in(deva)
+  *            dvorak($dvoraklayouts)          =       pc+%v(dvorak)
+  *            dvorak(basic)           =       pc+us(dvorak)
+  *            dvorak(pl_basic)                =       pc+pl(dvorak)
+  *            dvorak(pl)              =       pc+pl(dvorak_quotes)
+  *            dvorak(pl_altquotes)            =       pc+pl(dvorak_altquotes)
+  *            dzdwi(basic)            =       pc+bt(basic)
+  *            fi(basic)               =       pc+fi(classic)
+  *            ge(azerty_tskapo)               =       pc+fr(geo)
+  *            guj(basic)              =       pc+in(guj)
+  *            gur(basic)              =       pc+in(guru)
+  *            ie(laptop)              =       pc+ie(basic)
+  *            ie(CloGaelachLaptop)            =       pc+ie(CloGaelach)
+  *            in(urd)         =       pc+in(urd-phonetic)
+  *            iu(basic)               =       pc+ca(ike)
+  *            lo(basic)               =       pc+la(basic)
+  *            kan(basic)              =       pc+in(kan)
+  *            mal(basic)              =       pc+in(mal)
+  *            mal(mlplusnum)          =       pc+in(mal)
+  *            ogham(basic)            =       pc+ie(ogam)
+  *            ogham(laptop)           =       pc+ie(ogam)
+  *            ogham(is434)            =       pc+ie(ogam_is434)
+  *            ogham(is434laptop)              =       pc+ie(ogam_is434)
+  *            ori(basic)              =       pc+in(ori)
+  *            ro(de)          =       pc+ro(winkeys)
+  *            ro(us)          =       pc+ro(std)
+  *            ro(academic)            =       pc+ro(std)
+  *            ro(std_comma)           =       pc+ro(std)
+  *            ro(comma)               =       pc+ro(basic)
+  *            ru(os)          =       pc+ru(os_legacy)
+  *            pk(urd)         =       pc+pk(urd-phonetic)
+  *            sapmi(basic)            =       pc+no(smi)
+  *            sapmi(nodeadkeys)               =       pc+no(smi_nodeadkeys)
+  *            sapmi(sefi)             =       pc+fi(smi)
+  *            sin(phonetic-static)            =       pc+in(sin_phonetic)
+  *            syr(basic)              =       pc+sy(syc)
+  *            syr(phonetic)           =       pc+sy(syc_phonetic)
+  *            tam(INSCRIPT)           =       pc+in(tam)
+  *            tam(UNI)                =       pc+in(tam_unicode)
+  *            tam(NUMERAL-KEYBOARD)           =       pc+in(tam_keyboard_with_numerals)
+  *            tam(TAB)                =       pc+in(tam_TAB)
+  *            tam(TSCII)              =       pc+in(tam_TSCII)
+  *            tel(basic)              =       pc+in(tel)
+  *            yu(basic)               =       pc+srp(latin)
+  *            yu(unicode)             =       pc+srp(latinunicode)
+  *            yu(yz)          =       pc+srp(latinyz)
+  *            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])
@@ -479,55 +478,55 @@
   *            *                       =       pc+%l[1]%(v[1])
 
 ! model                layout[1]       variant[1]      =       symbols
-  *            ben             basic           =       pc+in(ben)
-  *            ben             probhat         =       pc+in(ben_probhat)
-  *            dev             basic           =       pc+in(deva)
-  *            dvorak          $dvoraklayouts          =       pc+%v(dvorak)
-  *            dvorak          basic           =       pc+us(dvorak)
-  *            dvorak          pl_basic                =       pc+pl(dvorak)
-  *            dvorak          pl              =       pc+pl(dvorak_quotes)
-  *            dvorak          pl_altquotes            =       pc+pl(dvorak_altquotes)
-  *            dzdwi           basic           =       pc+bt(basic)
-  *            fi              basic           =       pc+fi(classic)
-  *            ge              azerty_tskapo           =       pc+fr(geo)
-  *            guj             basic           =       pc+in(guj)
-  *            gur             basic           =       pc+in(guru)
-  *            ie              laptop          =       pc+ie(basic)
-  *            ie              CloGaelachLaptop                =       pc+ie(CloGaelach)
-  *            in              urd             =       pc+in(urd-phonetic)
-  *            iu              basic           =       pc+ca(ike)
-  *            lo              basic           =       pc+la(basic)
-  *            kan             basic           =       pc+in(kan)
-  *            mal             basic           =       pc+in(mal)
-  *            mal             mlplusnum               =       pc+in(mal)
-  *            ogham           basic           =       pc+ie(ogam)
-  *            ogham           laptop          =       pc+ie(ogam)
-  *            ogham           is434           =       pc+ie(ogam_is434)
-  *            ogham           is434laptop             =       pc+ie(ogam_is434)
-  *            ori             basic           =       pc+in(ori)
-  *            ro              de              =       pc+ro(winkeys)
-  *            ro              us              =       pc+ro(std)
-  *            ro              academic                =       pc+ro(std)
-  *            ro              std_comma               =       pc+ro(std)
-  *            ro              comma           =       pc+ro(basic)
-  *            ru              os              =       pc+ru(os_legacy)
-  *            pk              urd             =       pc+pk(urd-phonetic)
-  *            sapmi           basic           =       pc+no(smi)
-  *            sapmi           nodeadkeys              =       pc+no(smi_nodeadkeys)
-  *            sapmi           sefi            =       pc+fi(smi)
-  *            sin             phonetic-static         =       pc+in(sin_phonetic)
-  *            syr             basic           =       pc+sy(syc)
-  *            syr             phonetic                =       pc+sy(syc_phonetic)
-  *            tam             INSCRIPT                =       pc+in(tam)
-  *            tam             UNI             =       pc+in(tam_unicode)
-  *            tam             NUMERAL-KEYBOARD                =       pc+in(tam_keyboard_with_numerals)
-  *            tam             TAB             =       pc+in(tam_TAB)
-  *            tam             TSCII           =       pc+in(tam_TSCII)
-  *            tel             basic           =       pc+in(tel)
-  *            yu              basic           =       pc+srp(latin)
-  *            yu              unicode         =       pc+srp(latinunicode)
-  *            yu              yz              =       pc+srp(latinyz)
-  *            yu              unicodeyz               =       pc+srp(latinunicodeyz)
+  *            ben             basic   =       pc+in(ben)
+  *            ben             probhat =       pc+in(ben_probhat)
+  *            dev             basic   =       pc+in(deva)
+  *            dvorak          $dvoraklayouts  =       pc+%v(dvorak)
+  *            dvorak          basic   =       pc+us(dvorak)
+  *            dvorak          pl_basic        =       pc+pl(dvorak)
+  *            dvorak          pl      =       pc+pl(dvorak_quotes)



Home | Main Index | Thread Index | Old Index