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.37.
details: https://anonhg.NetBSD.org/src/rev/bced0eb4327b
branches: trunk
changeset: 371918:bced0eb4327b
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Oct 17 07:40:22 2022 +0000
description:
updates for xkeyboard-config 2.37.
diffstat:
distrib/sets/lists/xbase/mi | 5 +-
external/mit/xorg/lib/xkeyboard-config/rules/Makefile | 12 +-
external/mit/xorg/lib/xkeyboard-config/rules/base | 556 ++++-------
external/mit/xorg/lib/xkeyboard-config/rules/base.lst | 91 +-
external/mit/xorg/lib/xkeyboard-config/rules/evdev | 503 +++-------
external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst | 91 +-
external/mit/xorg/lib/xkeyboard-config/symbols/Makefile | 6 +-
external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man | 143 +-
8 files changed, 560 insertions(+), 847 deletions(-)
diffs (truncated from 2947 to 300 lines):
diff -r 9790782434b3 -r bced0eb4327b distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi Mon Oct 17 07:03:19 2022 +0000
+++ b/distrib/sets/lists/xbase/mi Mon Oct 17 07:40:22 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.171 2022/09/11 05:54:00 mrg Exp $
+# $NetBSD: mi,v 1.172 2022/10/17 07:40:22 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -866,6 +866,7 @@
./usr/X11R7/lib/X11/xkb/symbols/ben xbase-obsolete obsolete
./usr/X11R7/lib/X11/xkb/symbols/bg xbase-xkeyboard-config-lib xorg
./usr/X11R7/lib/X11/xkb/symbols/bn xbase-obsolete obsolete
+./usr/X11R7/lib/X11/xkb/symbols/bqn xbase-xkeyboard-config-lib xorg
./usr/X11R7/lib/X11/xkb/symbols/br xbase-xkeyboard-config-lib xorg
./usr/X11R7/lib/X11/xkb/symbols/brai xbase-xkeyboard-config-lib xorg
./usr/X11R7/lib/X11/xkb/symbols/braille xbase-obsolete obsolete
@@ -962,7 +963,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/jv xbase-obsolete obsolete
./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 9790782434b3 -r bced0eb4327b external/mit/xorg/lib/xkeyboard-config/rules/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/rules/Makefile Mon Oct 17 07:03:19 2022 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/rules/Makefile Mon Oct 17 07:40:22 2022 +0000
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2021/04/27 03:58:55 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2022/10/17 07:40:23 mrg Exp $
#
# When upgrading, re-assemble the files base, base.lst, evdev and
# evdev.lst by running ./configure && make in the dist directory,
# and copy the resulting files back here.
#
-# % env PKG_CONFIG_PATH=/usr/X11R7/lib/pkgconfig ./configure --prefix=/usr/X11R7
-# % cd man
-# % gmake xkeyboard-config.7
-# % cd ../rules
-# % ln -s /usr/pkg/bin/python3.8 ./python3
-# % env PATH=${PATH}:. PYTHON=python3.8 gmake base base.lst evdev evdev.lst
+# % env PKG_CONFIG_PATH=/usr/X11R7/lib/pkgconfig meson --prefix=/usr/X11R7 build
+# % env PKG_CONFIG_PATH=/usr/X11R7/lib/pkgconfig meson compile -C build
+# % cp build/xkeyboard-config.7 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
+# % cp build/rules/{base,evdev}{,.lst} src/external/mit/xorg/lib/xkeyboard-config/rules
.include <bsd.own.mk>
diff -r 9790782434b3 -r bced0eb4327b external/mit/xorg/lib/xkeyboard-config/rules/base
--- a/external/mit/xorg/lib/xkeyboard-config/rules/base Mon Oct 17 07:03:19 2022 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/rules/base Mon Oct 17 07:40:22 2022 +0000
@@ -42,30 +42,6 @@
! $azerty = be fr
! $qwertz = al ch cz de hr hu ro si sk
-
-// All layouts with 3rd and 4th levels:
-! $threelevellayouts = af al az \
- bd be bg br bt \
- ca ch cm cn cz \
- de dk dz \
- ee es eu \
- fi fo fr \
- gb ge gh gr \
- hr hu \
- ie il in ir is it \
- kh kz \
- latam \
- lk lt lv \
- ml mm mn mt \
- ng nl no \
- ph pk pl pt \
- ro rs \
- se si sk sn sy \
- tg tm tr tw \
- ua us \
- vn \
- za
-
! $thinkpads = thinkpad thinkpad60 thinkpadz60
! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \
@@ -87,7 +63,7 @@
! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
- airkey \
+ airkey apex300 \
apple armada azonaRF2300 \
benqx brother \
btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \
@@ -98,64 +74,60 @@
compaqeak8 compaqik7 compaqik13 compaqik18 \
creativedw7000 \
cymotionlinux \
- dell dellm65 inspiron dellusbmm \
+ dell dellm65 dellusbmm \
emachines ennyah_dkb1008 evdev \
genius geniuscomfy2 \
gyration honeywell_euroboard \
hp250x hp5xx hp500fa hpdv5 \
hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
- ibm_spacesaver ipaq inspiron intel \
- logiaccess logicda logicink \
- logiex110 logiclx300 \
- logiinkse logiinkseusb logiitc logiik \
- logitech_base itouch logiultrax \
- logitech_g15 \
- logidinovo logidinovoedge \
- microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
- microsoftoffice microsoftmult \
+ ibm_spacesaver inspiron intel ipaq itouch \
+ logiaccess logicda logicink logiclx300 \
+ logidinovo logidinovoedge logiex110 \
+ logiik logiinkse logiinkseusb logiitc \
+ logitech_base logitech_g15 logiultrax \
+ microsoft4000 microsoft7000 microsoftinet microsoftmult \
+ microsoftoffice microsoftprooem microsoftprose microsoftprousb \
mx1998 mx2500 mx2750 \
oretec \
- pc105 \
- presario propeller \
+ pc105 ppkb presario propeller \
qtronix \
- rapidaccess rapidaccess2 thinkpad60 \
+ rapidaccess rapidaccess2 \
samsung4500 samsung4510 \
silvercrest \
sk1300 sk2500 sk6200 sk7100 \
sven sven303 symplon \
- teck227 teck229 \
+ teck227 teck229 thinkpad60 \
toshiba_s3000 trust trustda \
- unitekkb1925 yahoo \
- apex300
+ unitekkb1925 yahoo
-! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \
- cherrybluea herrycyboard chicony042 compaqik13 compaqik18 \
- armada presario dellm65 inspiron dellusbmm diamond \
- ennyah_dkb1008 genius geniuscomfy2 hpi6 hpxe3gc hpxe3gf \
- hpxt1000 hpzt11xx hpdv5 hpxe4xxx hp5xx thinkpad60 ogitech_base \
- logidinovo logidinovoedge logitech_g15 mx1998 mx2500 mx2750 \
- microsoft4000 microsoft7000 microsoftprooem microsoftmult \
- propeller samsung4500 samsung4510 sk1300 sk2500 sk7100 \
- toshiba_s3000 trust trustda cymotionlinux silvercrest \
- emachines benqx unitekkb1925 creativedw7000 compalfl90 \
- pc105 a4techKB21 a4techKBS8 a4_rfkb23 asus_laptop btc6301urf \
- dexxa dtk2000 fscaa1667g geniuskb19e geniuscomfy latitude \
- microsoftpro precision_m scorpius sp_inet targa_v811 thinkpad \
- tm2030USB-102 tm2030USB-106 trust_slimline
-
-! $dvoraklayouts = br ca de ee es fr gb no pl se us
+! $inetmediakbds = \
+ a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop \
+ armada asus_laptop benqx btc5090 btc6301urf btc9019u \
+ cherrybluea cherryblueb cherrycyboard chicony042 \
+ compalfl90 compaqik13 compaqik18 creativedw7000 \
+ cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 \
+ emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy \
+ geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf \
+ hpxe4xxx hpxt1000 hpzt11xx inspiron latitude \
+ logidinovo logidinovoedge logitech_base logitech_g15 \
+ microsoft4000 microsoft7000 microsoftmult microsoftpro \
+ microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m \
+ presario propeller samsung4500 samsung4510 scorpius \
+ silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 \
+ thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 \
+ toshiba_s3000 trust trustda trust_slimline unitekkb1925
! model = keycodes
amiga = amiga(de)
ataritt = ataritt(de)
- empty = empty
+ empty = empty
$sun_jp = sun(type6_jp_usb)
$sun = sun(type6_usb)
pc98 = xfree98(pc98)
$applealu = macintosh(alukbd)
macintosh_hhk = macintosh(hhk)
macintosh_old = macintosh(old)
- $macs = macintosh
+ $macs = macintosh
thinkpadz60 = xfree86(thinkpadz60)
* = xfree86
@@ -172,7 +144,7 @@
! option = keycodes
! model layout = geometry
- thinkpad us = thinkpad(us)
+ thinkpad us = thinkpad(us)
! model = geometry
microsoftelite = microsoft(elite)
@@ -216,11 +188,6 @@
* 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)
@@ -253,27 +220,17 @@
* 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)
classmate us intl = pc+us(classmate-intl)
classmate us alt-intl = pc+us(classmate-alt-intl)
classmate us altgr-intl = pc+us(classmate-altgr-intl)
nokiarx51 cz qwerty = nokia_vndr/rx-51(cz_qwerty)
- * $sun_custom $sun_var = pc+sun_vndr/%l%(v)
+ * $sun_custom $sun_var = pc+sun_vndr/%l%(v)
! model layout = symbols
* ar = pc+ara
* ben = pc+in(ben)
* bs = pc+ba
- * cs = pc+rs
- * cz_qwerty = pc+cz(qwerty)
* dev = pc+in(deva)
* dvorak = pc+us(dvorak)
* dzdwi = pc+bt
@@ -286,23 +243,15 @@
* kan = pc+in(kan)
* mi = pc+mao
* ogham = pc+ie(ogam)
- * ori = pc+ie(ori)
+ * ori = pc+in(ori)
* sapmi = pc+no(smi)
- * sr = pc+srp
* syr = pc+sy(syc)
* tel = pc+in(tel)
* tml = pc+in(tam)
- * yu = pc+srp
- * 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)
@@ -335,23 +284,17 @@
* 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 = symbols
ataritt $nonlatin = xfree68_vndr/ataritt(us)+%l%(v):2
ataritt * = xfree68_vndr/ataritt(us)+%l%(v)
amiga $nonlatin = xfree68_vndr/amiga(usa1)+%l%(v):2
amiga * = xfree68_vndr/amiga(usa1)+%l%(v)
classmate us = pc+%l(classmate)
- empty * = empty(basic)
- * empty = empty(basic)
- jollasbj $nonlatin = jolla_vndr/sbj(common)+us+%l%(v):2
+ 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)
@@ -374,21 +317,19 @@
olpc * = olpc+%l%(v)
olpcm $olpclayouts = olpc+%l%(m)
olpcm * = olpc+%l%(v)
- $thinkpads br = pc+br(thinkpad)
+ $thinkpads br = pc+br(thinkpad)
sl-c3x00 * = pc+sharp_vndr/sl-c3x00(basic)
ws003sh * = pc+sharp_vndr/ws003sh(basic)
Home |
Main Index |
Thread Index |
Old Index