CVS commit: pkgsrc/x11/xkeyboard-config

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 24 08:38:27 UTC 2026

Modified Files:
        pkgsrc/x11/xkeyboard-config: Makefile distinfo
        pkgsrc/x11/xkeyboard-config/patches: patch-meson.build

Log Message:
xkeyboard-config: update to 2.47.

# Layouts

## New

- Added the Slavistic Phonetic Alphabet variant for Polish

# Miscellaneous

## Breaking changes

- Made <ZEHA> behave like <FK24>

  On Linux Kernel before v6.17, the scancode for F24 was bound to the otherwise
  unused <ZEHA> keycode. v6.17 fixed this. To have a consistent behaviour across
  kernel versions, make both <ZEHA> and <FK24> behave the same.

## New

- Added keycodes from recent Linux kernels:
  - `<I455>` for `KEY_LINK_PHONE`
  - `<I709>` for `KEY_PERFORMANCE`
- inet: Added mapping to the following new keysyms:
  - `XF86LinkPhone`
  - `XF86Fn_F1`
  - `XF86Fn_F2`
  - `XF86Fn_F3`
  - `XF86Fn_F4`
  - `XF86Fn_F5`
  - `XF86Fn_F6`
  - `XF86Fn_F7`
  - `XF86Fn_F8`
  - `XF86Fn_F9`
  - `XF86Fn_F10`
  - `XF86Fn_F11`
  - `XF86Fn_F12`
  - `XF86Fn_1`
  - `XF86Fn_2`
  - `XF86Fn_D`
  - `XF86Fn_E`
  - `XF86Fn_F`
  - `XF86Fn_S`
  - `XF86Fn_B`
  - `XF86PerformanceMode`
  - `XF86AudioBassBoost`

  Relevant upstream merge requests: [xorgproto-102] and [xorgproto-103].

  [xorgproto-102]: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/102
  [xorgproto-103]: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/103
- inet: Mapped `F19` for the rare occasion that it exists e.g. on custom keyboards.
- inet: Mapped `F24`, which has a special alternative function as pressing the
  touchpad toggle key on some notebooks produces the key sequence `Super + Control + F24`.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/x11/xkeyboard-config/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/x11/xkeyboard-config/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/x11/xkeyboard-config/patches/patch-meson.build

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.60 pkgsrc/x11/xkeyboard-config/Makefile:1.61
--- pkgsrc/x11/xkeyboard-config/Makefile:1.60   Sat Oct  4 06:30:04 2025
+++ pkgsrc/x11/xkeyboard-config/Makefile        Tue Feb 24 08:38:26 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2025/10/04 06:30:04 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2026/02/24 08:38:26 wiz Exp $
 
-DISTNAME=              xkeyboard-config-2.46
+DISTNAME=              xkeyboard-config-2.47
 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.45 pkgsrc/x11/xkeyboard-config/distinfo:1.46
--- pkgsrc/x11/xkeyboard-config/distinfo:1.45   Sat Oct  4 06:30:04 2025
+++ pkgsrc/x11/xkeyboard-config/distinfo        Tue Feb 24 08:38:26 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.45 2025/10/04 06:30:04 wiz Exp $
+$NetBSD: distinfo,v 1.46 2026/02/24 08:38:26 wiz Exp $
 
-BLAKE2s (xkeyboard-config-2.46.tar.xz) = b4f3288723484c466f67eba83e31f591630ce6c2af1139f9ef90d9ae3262058d
-SHA512 (xkeyboard-config-2.46.tar.xz) = c58ce438ec109e80ff601ad07aea13f0ccdd096720b574838673925ec2a745b9210df6ef2ecfab3911909b492b560fb9af1d4f6bce60bd329e575f1db16b6dfb
-Size (xkeyboard-config-2.46.tar.xz) = 931044 bytes
-SHA1 (patch-meson.build) = 5021794e2821cf1ceab08b1a80c7214c26ba539f
+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
+SHA1 (patch-meson.build) = 8bebbbae8a379fc1e666ddd9d954bdaed0d88e95

Index: pkgsrc/x11/xkeyboard-config/patches/patch-meson.build
diff -u pkgsrc/x11/xkeyboard-config/patches/patch-meson.build:1.3 pkgsrc/x11/xkeyboard-config/patches/patch-meson.build:1.4
--- pkgsrc/x11/xkeyboard-config/patches/patch-meson.build:1.3   Mon Aug 11 10:01:47 2025
+++ pkgsrc/x11/xkeyboard-config/patches/patch-meson.build       Tue Feb 24 08:38:26 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-meson.build,v 1.3 2025/08/11 10:01:47 wiz Exp $
+$NetBSD: patch-meson.build,v 1.4 2026/02/24 08:38:26 wiz Exp $
 
 * Do not find xsltproc from textproc/libxslt.
 
---- meson.build.orig   2025-06-07 23:40:22.000000000 +0000
+--- meson.build.orig   2026-02-23 07:06:44.000000000 +0000
 +++ meson.build
-@@ -53,6 +53,7 @@ subdir('rules')
+@@ -53,6 +53,7 @@ subdir('symbols')
  subdir('symbols')
  
  # man page
@@ -12,11 +12,11 @@ $NetBSD: patch-meson.build,v 1.3 2025/08
  xsltproc = find_program('xsltproc', required: false)
  if xsltproc.found()
    man_substs = configuration_data()
-@@ -86,6 +87,7 @@ if xsltproc.found()
+@@ -85,6 +86,7 @@ if xsltproc.found()
+ 
    verify_group_names = find_program('tests/verify-group-names.sh')
    test('verify group names', verify_group_names)
- endif
 +endif
+ endif
  
- # If needed, copy our data files over to the build directory
- # so we can use the builddir as XKB_CONFIG_ROOT
+ pymod = import('python')