CVS commit: pkgsrc/x11/xkeyboard-config

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jun 22 19:27:18 UTC 2026

Modified Files:
        pkgsrc/x11/xkeyboard-config: Makefile distinfo

Log Message:
xkeyboard-config: update to 2.48.

Layouts
-------

Breaking changes
~~~~~~~~~~~~~~~~

- Spanish layout: move `dead_doubleacute` and `dead_caron` to easier to remember positions:
  - `dead_doubleacute` is moved to same key as `dead_acute` and `dead_diaeresis`, replacing `dead_caron`.
  - `dead_caron` is moved to same key as `dead_circumflex`, replacing `dead_abovering`.
  - `dead_abovering` is moved to `Ntilde`, where `dead_doubleacute` used to be.

New
~~~

- - `pl`: Added Colemak-DH ortholinear variant

     Contributed by Aria Węgrzyn ([#pl-colemak-dh-ortho](https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/pl-colemak-dh-ortho))
- `ca(multix)`:
  - Added `oneeighth` (U+215B) to `<AE02>`
  - Duplicated `currency` (U+00A4) on `<AE04>`
  - Added `dstroke` (U+0111) to `<AC04>`

  Contributed by Alexandre Bouvier ([#563](https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/563))
- Added `br(thinkpad_nodeadkeys)`: Portuguese (Brazil, IBM/Lenovo ThinkPad, no dead keys). ([#868](https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/868))

Miscellaneous
-------------

Breaking changes
~~~~~~~~~~~~~~~~

- Made key type `KEYPAD` independent of `Shift`, so that `Shift` can be used in
  keyboard shortcuts with numpad keys, with and without `NumLock`.

  This removes the counter-intuitive behavior of `Shift + NumLock` mapping to the
  arrow/edition keys on the numpad.
- numpad  key types: Changed `FOUR_LEVEL_KEYPAD` and `FOUR_LEVEL_MIXED_KEYPAD`
  so that they are identical and enable to use `Shift` in keyboard shortcuts
  with *both* arrows/edition keys and numbers:

  - `Shift` maps to level 1, usually corresponding to numpad `KP_`
    arrows/editing keysyms variants);
  - `Shift` is preserved.
  - No “`Shift` cancels `NumLock`” behavior.

  All numpad key types have now the same consistent behavior with `Shift`
  and `NumLock`.

New
~~~

- inet: Added mapping to the following new keysyms:
  - `XF86ElectronicPrivacyScreenOn`
  - `XF86ElectronicPrivacyScreenOff`
  - `XF86ActionOnSelection`
  - `XF86ContextualInsert`
  - `XF86ContextualQuery`

  Relevant upstream merge requests: [xorgproto-109], [xorgproto-112]

  [xorgproto-109]: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/109
  [xorgproto-112]: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/112

Fixes
~~~~~

- Fixed key types missing or erroneous `map` and `preserve` entries:
  - `extra`: `FOUR_LEVEL_X`
  - `numpad(shift3)`: `FOUR_LEVEL_MIXED_KEYPAD`
  - `pc`: `PC_SHIFT_SUPER_LEVEL2` and `CTRL+ALT`


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/x11/xkeyboard-config/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/x11/xkeyboard-config/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xkeyboard-config/Makefile
diff -u pkgsrc/x11/xkeyboard-config/Makefile:1.61 pkgsrc/x11/xkeyboard-config/Makefile:1.62
--- pkgsrc/x11/xkeyboard-config/Makefile:1.61   Tue Feb 24 08:38:26 2026
+++ pkgsrc/x11/xkeyboard-config/Makefile        Mon Jun 22 19:27:18 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2026/02/24 08:38:26 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2026/06/22 19:27:18 wiz Exp $
 
-DISTNAME=              xkeyboard-config-2.47
+DISTNAME=              xkeyboard-config-2.48
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_XORG:=data/${PKGBASE}/}
 EXTRACT_SUFX=          .tar.xz

Index: pkgsrc/x11/xkeyboard-config/distinfo
diff -u pkgsrc/x11/xkeyboard-config/distinfo:1.46 pkgsrc/x11/xkeyboard-config/distinfo:1.47
--- pkgsrc/x11/xkeyboard-config/distinfo:1.46   Tue Feb 24 08:38:26 2026
+++ pkgsrc/x11/xkeyboard-config/distinfo        Mon Jun 22 19:27:18 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.46 2026/02/24 08:38:26 wiz Exp $
+$NetBSD: distinfo,v 1.47 2026/06/22 19:27:18 wiz Exp $
 
-BLAKE2s (xkeyboard-config-2.47.tar.xz) = ca0e22cc8936dae7dbb75edb90f27454f3feacbcce8f9aed866233858441dfb1
-SHA512 (xkeyboard-config-2.47.tar.xz) = bd9b70ec5c8957e087f6c12272725044e6e124c15c7cbbfffb7f3c231944984d3302adda604da05464b7be6c91b5461e74fbec8544ac21b06e3bd8c748fd04e3
-Size (xkeyboard-config-2.47.tar.xz) = 930468 bytes
+BLAKE2s (xkeyboard-config-2.48.tar.xz) = 74bb1934052a048e7fdca43b29b09a1b639109defa55c63001338c053314657f
+SHA512 (xkeyboard-config-2.48.tar.xz) = 2c24f9cca97b8863ff2e71fc3780e9c3e22e4486c80d45022e2208d559bdb40824bdb8a4037e0d5690900b6e080ddef4eacfc8bff843e04ba5ab86940f1fb6ea
+Size (xkeyboard-config-2.48.tar.xz) = 953316 bytes
 SHA1 (patch-meson.build) = 8bebbbae8a379fc1e666ddd9d954bdaed0d88e95