CVS commit: pkgsrc/x11/libxkbcommon

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Oct 19 14:57:08 UTC 2023

Modified Files:
        pkgsrc/x11/libxkbcommon: Makefile PLIST distinfo

Log Message:
libxkbcommon: update to 1.6.0.

libxkbcommon 1.6.0 - 2023-10-08
==================

API
---

### Breaking changes

- *Remove* keysyms that were intended for German T3 layout but are unused:

  - `XKB_KEY_dead_lowline`
  - `XKB_KEY_dead_aboveverticalline`
  - `XKB_KEY_dead_belowverticalline`
  - `XKB_KEY_dead_longsolidusoverlay`

  See the upstream [`xorgproto` MR](https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70). See hereinafter for further changes related to keysyms.

### New

- Add Compose iterator API to iterate the entries in a compose table:

  - `xkb_compose_table_entry_sequence`
  - `xkb_compose_table_entry_keysym`
  - `xkb_compose_table_entry_utf8`
  - `xkb_compose_table_iterator_new`
  - `xkb_compose_table_iterator_free`
  - `xkb_compose_table_iterator_next`

- *Structured log messages* with a message registry. There is an *ongoing* work
  to assign unique identifiers to log messages and add a corresponding error
  index documentation page:

  - The log entries are preceded with an identifier in the form `XKB-NNN`, where
    `NNN` is a decimal number.

  - The log entries can then be parsed with third-party tools, to check for
    specific identifiers.

  - The new documentation page “**Error index**” lists all the kind of error messages
    with their identifiers. The aim is that each entry could present detailed
    information on the error and how to fix it.

- Add a new warning for numeric keysyms references in XKB files: the preferred
  keysym reference form is its name or its Unicode value, if relevant.

- Add the upper bound `XKB_KEYSYM_MAX` to check valid keysyms.

- Add a warning when loading a keymap using RMLVO with no layout but with the
  variant set. The variant is actually discarded and both layout and variant are
  set to default values, but this was done previously with no warning, confusing
  end users.

- Add support for `modifier_map None { … }`. This feature is missing compared to
  the X11 implementation. It allows to reset the modifier map of a key.

- Update keysyms using latest [xorgproto] (commit: `1c8128d72df22843a2022576850bc5ab5e3a46ea`):

  - Additions:

    - `XKB_KEY_ordmasculine` ([xorgproto-68])
    - `XKB_KEY_guillemetleft` ([xorgproto-68])
    - `XKB_KEY_guillemetright` ([xorgproto-68])
    - `XKB_KEY_dead_schwa` ([xorgproto-78])
    - `XKB_KEY_dead_SCHWA` ([xorgproto-78])
    - `XKB_KEY_dead_hamza` ([xorgproto-71])
    - `XKB_KEY_XF86EmojiPicker` ([xorgproto-44])
    - `XKB_KEY_XF86Dictate` ([xorgproto-49])
    - `XKB_KEY_XF86CameraAccessEnable` ([xorgproto-82])
    - `XKB_KEY_XF86CameraAccessDisable` ([xorgproto-82])
    - `XKB_KEY_XF86CameraAccessToggle` ([xorgproto-82])
    - `XKB_KEY_XF86NextElement` ([xorgproto-82])
    - `XKB_KEY_XF86PreviousElement` ([xorgproto-82])
    - `XKB_KEY_XF86AutopilotEngageToggle` ([xorgproto-82])
    - `XKB_KEY_XF86MarkWaypoint` ([xorgproto-82])
    - `XKB_KEY_XF86Sos` ([xorgproto-82])
    - `XKB_KEY_XF86NavChart` ([xorgproto-82])
    - `XKB_KEY_XF86FishingChart` ([xorgproto-82])
    - `XKB_KEY_XF86SingleRangeRadar` ([xorgproto-82])
    - `XKB_KEY_XF86DualRangeRadar` ([xorgproto-82])
    - `XKB_KEY_XF86RadarOverlay` ([xorgproto-82])
    - `XKB_KEY_XF86TraditionalSonar` ([xorgproto-82])
    - `XKB_KEY_XF86ClearvuSonar` ([xorgproto-82])
    - `XKB_KEY_XF86SidevuSonar` ([xorgproto-82])
    - `XKB_KEY_XF86NavInfo` ([xorgproto-82])

  - Deprecations:

    - `XKB_KEY_masculine`: use `XKB_KEY_ordmasculine` instead ([xorgproto-68])
    - `XKB_KEY_guillemotleft`: use `XKB_KEY_guillemetleft` instead ([xorgproto-68])
    - `XKB_KEY_guillemotright`: use `XKB_KEY_guillemetright` instead ([xorgproto-68])
    - `XKB_KEY_dead_small_schwa`: use `XKB_KEY_dead_schwa` instead ([xorgproto-78])
    - `XKB_KEY_dead_capital_schwa`: use `XKB_KEY_dead_SCHWA` instead ([xorgproto-78])

  [xorgproto]: https://gitlab.freedesktop.org/xorg/proto/xorgproto
  [xorgproto-44]: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/44
  [xorgproto-49]: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/49
  [xorgproto-68]: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/68
  [xorgproto-71]: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/71
  [xorgproto-78]: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/78
  [xorgproto-82]: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/82

- Ongoing work to improve the documentation about XKB and its V1 format.

### Fixes

- Prevent `xkb_keysym_from_name` to parse out-of-range hexadecimal keysyms.

- Disallow producing NULL character with escape sequences `\0` and `\x0`.

- Prevent overflow of octal escape sequences by making `\400..\777` invalid.

- Prevent interpreting and emitting invalid Unicode encoding forms: surrogates
  are invalid in both UTF-32 and UTF-8.

- `xkb_keymap_new_from_buffer`: Allow for a NULL-terminated keymap string.

- Compose: Increase the limit of possible entries to handle huge Compose files.

Tools
-----

### New

- Add bash completions for `xkbcli` and its subcommands.

- `xkbcli interactive-*`: Add options `--short` to hide some fields.

- `xkbcli interactive-evdev`: Add `--includes` and `--include-defaults` options.

- Add `xkb-check-messages` *experimental* tool (not installed).
  It checks whether given log messages identifiers are supported.

### Fixes

- `xkbcli compile-keymap`: Allow to use without arguments.

- `xkbcli interactive-*`: Always print keycode.

- `xkbcli interactive-*`: Escape control characters for Unicode output, instead of
  printing them as-is, messing the output.

Build system
------------

- Bump required meson to 0.52.0.

- Allow `xkbcommon` to be used as a subproject.

- Improve Windows compilation.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/x11/libxkbcommon/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/libxkbcommon/PLIST
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/libxkbcommon/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/libxkbcommon/Makefile
diff -u pkgsrc/x11/libxkbcommon/Makefile:1.45 pkgsrc/x11/libxkbcommon/Makefile:1.46
--- pkgsrc/x11/libxkbcommon/Makefile:1.45       Mon Aug 14 05:25:34 2023
+++ pkgsrc/x11/libxkbcommon/Makefile    Thu Oct 19 14:57:08 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2023/08/14 05:25:34 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2023/10/19 14:57:08 wiz Exp $
 
-DISTNAME=      libxkbcommon-1.5.0
-PKGREVISION=   2
+DISTNAME=      libxkbcommon-1.6.0
 CATEGORIES=    x11
 MASTER_SITES=  https://xkbcommon.org/download/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/x11/libxkbcommon/PLIST
diff -u pkgsrc/x11/libxkbcommon/PLIST:1.9 pkgsrc/x11/libxkbcommon/PLIST:1.10
--- pkgsrc/x11/libxkbcommon/PLIST:1.9   Sun Sep 13 09:25:37 2020
+++ pkgsrc/x11/libxkbcommon/PLIST       Thu Oct 19 14:57:08 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2020/09/13 09:25:37 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2023/10/19 14:57:08 wiz Exp $
 bin/xkbcli
 include/xkbcommon/xkbcommon-compat.h
 include/xkbcommon/xkbcommon-compose.h
@@ -28,6 +28,7 @@ man/man1/xkbcli-how-to-type.1
 man/man1/xkbcli-interactive-x11.1
 man/man1/xkbcli-list.1
 man/man1/xkbcli.1
+share/bash-completion/completions/xkbcli
 ${PLIST.doc}share/doc/libxkbcommon/html/annotated.html
 ${PLIST.doc}share/doc/libxkbcommon/html/bc_s.png
 ${PLIST.doc}share/doc/libxkbcommon/html/bdwn.png

Index: pkgsrc/x11/libxkbcommon/distinfo
diff -u pkgsrc/x11/libxkbcommon/distinfo:1.31 pkgsrc/x11/libxkbcommon/distinfo:1.32
--- pkgsrc/x11/libxkbcommon/distinfo:1.31       Mon Jan  9 13:20:33 2023
+++ pkgsrc/x11/libxkbcommon/distinfo    Thu Oct 19 14:57:08 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.31 2023/01/09 13:20:33 wiz Exp $
+$NetBSD: distinfo,v 1.32 2023/10/19 14:57:08 wiz Exp $
 
-BLAKE2s (libxkbcommon-1.5.0.tar.xz) = 8aebec0d715a93b8ae1563cdf5facc98da23142befbaf26a4d9b1ce34fc49cc1
-SHA512 (libxkbcommon-1.5.0.tar.xz) = bbba6665f052c04c7450413cc5e2badd6bfd41326b0e4c60e3ec01d730cae695fd34ce2662b8a91ece7a76b974a0ea330f7462dd5d2db148b0d0da26264ced9c
-Size (libxkbcommon-1.5.0.tar.xz) = 472700 bytes
+BLAKE2s (libxkbcommon-1.6.0.tar.xz) = 308f618e2c7ca3f92b08ab228db791ae9195565b7e30502ab662a0d8e49f27de
+SHA512 (libxkbcommon-1.6.0.tar.xz) = 4f93225eada1c5d0806bbc01f72d82d72729f4580ade963ff6a386711c9b2232aae5213c8488abf01c3b81f0e1fdb7f4d8a4d3786113ccc134251ff164c4be5c
+Size (libxkbcommon-1.6.0.tar.xz) = 510456 bytes