Sun Sep 13 09:25:38 2020 UTC ()
libxkbcommon: update to 1.0.1.

libxkbcommon 1.0.1 - 2020-09-11
==================

- Fix the tool-option-parsing test failing.

- Remove requirement for pytest in the tool-option-parsing test.

- Make the table output of `xkbcli how-to-type` aligned.

- Some portability and test isolation fixes.

libxkbcommon 1.0.0 - 2020-09-05
==================

Note: this release is API and ABI compatible with previous releases -- the
major version bump is only an indication of stability.

- Add libxkbregistry as configure-time optional library. libxkbregistry is a C
  library that lists available XKB models, layouts and variants for a given
  ruleset. This is a separate library (libxkbregistry.so, pkgconfig file
  xkbregistry.pc) and aimed at tools that provide a listing of available
  keyboard layouts to the user. See the Documentation for details on the API.

  Contributed by Peter Hutterer <@who-t.net>.

- Better support custom user configuration:

    * Allow including XKB files from other paths.

      Previously, a 'symbols/us' file in path A would shadow the same file in
      path B. This is suboptimal, we rarely need to hide the system files - we
      care mostly about *extending* them. By continuing to check other lookup
      paths, we make it possible for a XDG_CONFIG_HOME/xkb/symbols/us file to
      have sections including those from /usr/share/X11/xkb/symbols/us.

      Note that this is not possible for rules files, which need to be manually
      controlled to get the right bits resolved.

    * Add /etc/xkb as extra lookup path for system data files.

      This completes the usual triplet of configuration locations available for
      most processes:
      - vendor-provided data files in /usr/share/X11/xkb
      - system-specific data files in /etc/xkb
      - user-specific data files in $XDG_CONFIG_HOME/xkb

      The default lookup order user, system, vendor, just like everything else
      that uses these conventions.

      For include directives in rules files, the '%E' resolves to that path.

    * Add a new section to the documentation for custom user configuration.

  Contributed by Peter Hutterer <@who-t.net>.

- Add an `xkbcli` command-line utility.

  This tool offers various subcommands for introspection and debugging.
  Currently the available subcommands are:

  list
    List available rules, models, layouts, variants and options

  interactive-wayland
    Interactive debugger for XKB keymaps for Wayland

  interactive-x11
    Interactive debugger for XKB keymaps for X11

  interactive-evdev
    Interactive debugger for XKB keymaps for evdev (Linux)

  compile-keymap
    Compile an XKB keymap

  how-to-type
    See separate entry below.

  See the manpages for usage information.

  Contributed by Peter Hutterer <@who-t.net>.

- Add `xkb_utf32_to_keysym()` to translate a Unicode codepoint to a keysym.
  When a special keysym (`XKB_KEY_` constant) for the codepoint exists, it is
  returned, otherwise the direct encoding is used, if permissible.

  Contributed by Jaroslaw Kubik <@froglogic.com>.

- Add `xkb_keymap_key_get_mods_for_level()` which retrieves sets of modifiers
  which produce a given shift level in a given key+layout.

  Contributed by Jaroslaw Kubik <@froglogic.com>.

- Add `xkbcli how-to-type` command, which, using `xkb_utf32_to_keysym()`
  and `xkb_keymap_key_get_mods_for_level()` and other APIs, prints out all
  the ways to produce a given keysym.

  For example, how to type `?` (codepoint 63) in a us,de keymap?

    $ xkbcli how-to-type --layout us,de 63 | column -ts $'\t'
    keysym: question (0x3f)
    KEYCODE  KEY NAME  LAYOUT#  LAYOUT NAME   LEVEL#  MODIFIERS
    20       AE11      2        German        2       [ Shift ]
    20       AE11      2        German        2       [ Shift Lock ]
    61       AB10      1        English (US)  2       [ Shift ]

- Add a new section to the documentation describing the format of the XKB
  rules file.

- Search for Compose in $XDG_CONFIG_HOME/XCompose (fallback to
  ~/.config/XCompose) before trying $HOME/.XCompose.

  Note that libX11 still only searches in $HOME/.XCompose.

  Contributed by Emmanuel Gil Peyrot <@linkmauve.fr>.

- Bump meson requirement to >= 0.49.0.

- Fix build with byacc.

- Fix building X11 tests on PE targets.

  Contributed by Jon Turney <@dronecode.org.uk>

- The tests no longer rely on bash, only Python (which is already used by
  meson).

- New API:
  xkb_utf32_to_keysym
  xkb_keymap_key_get_mods_for_level
  XKB_KEY_XF86FullScreen


(wiz)
diff -r1.25 -r1.26 pkgsrc/x11/libxkbcommon/Makefile
diff -r1.8 -r1.9 pkgsrc/x11/libxkbcommon/PLIST
diff -r1.18 -r1.19 pkgsrc/x11/libxkbcommon/distinfo

cvs diff -r1.25 -r1.26 pkgsrc/x11/libxkbcommon/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libxkbcommon/Makefile 2020/01/27 10:53:28 1.25
+++ pkgsrc/x11/libxkbcommon/Makefile 2020/09/13 09:25:37 1.26
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.25 2020/01/27 10:53:28 wiz Exp $ 1# $NetBSD: Makefile,v 1.26 2020/09/13 09:25:37 wiz Exp $
2 2
3DISTNAME= libxkbcommon-0.10.0 3DISTNAME= libxkbcommon-1.0.1
4CATEGORIES= x11 4CATEGORIES= x11
5MASTER_SITES= https://xkbcommon.org/download/ 5MASTER_SITES= https://xkbcommon.org/download/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= ryoon@NetBSD.org 8MAINTAINER= ryoon@NetBSD.org
9HOMEPAGE= https://xkbcommon.org/ 9HOMEPAGE= https://xkbcommon.org/
10COMMENT= Library to handle keyboard descriptions 10COMMENT= Library to handle keyboard descriptions
11LICENSE= mit 11LICENSE= mit
12 12
13USE_TOOLS+= bison gmake pkg-config 13USE_TOOLS+= bison gmake pkg-config
14 14
15MESON_ARGS+= -Denable-wayland=false 15MESON_ARGS+= -Denable-wayland=false
16 16
@@ -19,15 +19,16 @@ PKGCONFIG_OVERRIDE+= output/meson-priva @@ -19,15 +19,16 @@ PKGCONFIG_OVERRIDE+= output/meson-priva
19PKGCONFIG_OVERRIDE_STAGE= post-configure 19PKGCONFIG_OVERRIDE_STAGE= post-configure
20 20
21.include "options.mk" 21.include "options.mk"
22 22
23.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS" 23.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
24BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=./xkbcommon.map 24BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=./xkbcommon.map
25BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=./xkbcommon-x11.map 25BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=./xkbcommon-x11.map
26.endif 26.endif
27 27
28.include "../../devel/xorg-util-macros/buildlink3.mk" 28.include "../../devel/xorg-util-macros/buildlink3.mk"
29BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.10 29BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.10
30.include "../../x11/libxcb/buildlink3.mk" 30.include "../../x11/libxcb/buildlink3.mk"
31.include "../../x11/xkeyboard-config/buildlink3.mk" 31.include "../../x11/xkeyboard-config/buildlink3.mk"
 32.include "../../textproc/libxml2/buildlink3.mk"
32.include "../../devel/meson/build.mk" 33.include "../../devel/meson/build.mk"
33.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"

cvs diff -r1.8 -r1.9 pkgsrc/x11/libxkbcommon/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/libxkbcommon/PLIST 2019/11/06 12:51:55 1.8
+++ pkgsrc/x11/libxkbcommon/PLIST 2020/09/13 09:25:37 1.9
@@ -1,28 +1,43 @@ @@ -1,28 +1,43 @@
1@comment $NetBSD: PLIST,v 1.8 2019/11/06 12:51:55 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.9 2020/09/13 09:25:37 wiz Exp $
 2bin/xkbcli
2include/xkbcommon/xkbcommon-compat.h 3include/xkbcommon/xkbcommon-compat.h
3include/xkbcommon/xkbcommon-compose.h 4include/xkbcommon/xkbcommon-compose.h
4include/xkbcommon/xkbcommon-keysyms.h 5include/xkbcommon/xkbcommon-keysyms.h
5include/xkbcommon/xkbcommon-names.h 6include/xkbcommon/xkbcommon-names.h
6include/xkbcommon/xkbcommon-x11.h 7include/xkbcommon/xkbcommon-x11.h
7include/xkbcommon/xkbcommon.h 8include/xkbcommon/xkbcommon.h
 9include/xkbcommon/xkbregistry.h
8lib/libxkbcommon-x11.so 10lib/libxkbcommon-x11.so
9lib/libxkbcommon-x11.so.0 11lib/libxkbcommon-x11.so.0
10lib/libxkbcommon-x11.so.0.0.0 12lib/libxkbcommon-x11.so.0.0.0
11lib/libxkbcommon.so 13lib/libxkbcommon.so
12lib/libxkbcommon.so.0 14lib/libxkbcommon.so.0
13lib/libxkbcommon.so.0.0.0 15lib/libxkbcommon.so.0.0.0
 16lib/libxkbregistry.so
 17lib/libxkbregistry.so.0
 18lib/libxkbregistry.so.0.0.0
14lib/pkgconfig/xkbcommon-x11.pc 19lib/pkgconfig/xkbcommon-x11.pc
15lib/pkgconfig/xkbcommon.pc 20lib/pkgconfig/xkbcommon.pc
 21lib/pkgconfig/xkbregistry.pc
 22libexec/xkbcommon/xkbcli-compile-keymap
 23libexec/xkbcommon/xkbcli-how-to-type
 24libexec/xkbcommon/xkbcli-interactive-x11
 25libexec/xkbcommon/xkbcli-list
 26man/man1/xkbcli-compile-keymap.1
 27man/man1/xkbcli-how-to-type.1
 28man/man1/xkbcli-interactive-x11.1
 29man/man1/xkbcli-list.1
 30man/man1/xkbcli.1
16${PLIST.doc}share/doc/libxkbcommon/html/annotated.html 31${PLIST.doc}share/doc/libxkbcommon/html/annotated.html
17${PLIST.doc}share/doc/libxkbcommon/html/bc_s.png 32${PLIST.doc}share/doc/libxkbcommon/html/bc_s.png
18${PLIST.doc}share/doc/libxkbcommon/html/bdwn.png 33${PLIST.doc}share/doc/libxkbcommon/html/bdwn.png
19${PLIST.doc}share/doc/libxkbcommon/html/classes.html 34${PLIST.doc}share/doc/libxkbcommon/html/classes.html
20${PLIST.doc}share/doc/libxkbcommon/html/closed.png 35${PLIST.doc}share/doc/libxkbcommon/html/closed.png
21${PLIST.doc}share/doc/libxkbcommon/html/deprecated.html 36${PLIST.doc}share/doc/libxkbcommon/html/deprecated.html
22${PLIST.doc}share/doc/libxkbcommon/html/dir_000000.html 37${PLIST.doc}share/doc/libxkbcommon/html/dir_000000.html
23${PLIST.doc}share/doc/libxkbcommon/html/dir_000001.html 38${PLIST.doc}share/doc/libxkbcommon/html/dir_000001.html
24${PLIST.doc}share/doc/libxkbcommon/html/doc.png 39${PLIST.doc}share/doc/libxkbcommon/html/doc.png
25${PLIST.doc}share/doc/libxkbcommon/html/doxygen-extra.css 40${PLIST.doc}share/doc/libxkbcommon/html/doxygen-extra.css
26${PLIST.doc}share/doc/libxkbcommon/html/doxygen.css 41${PLIST.doc}share/doc/libxkbcommon/html/doxygen.css
27${PLIST.doc}share/doc/libxkbcommon/html/doxygen.png 42${PLIST.doc}share/doc/libxkbcommon/html/doxygen.png
28${PLIST.doc}share/doc/libxkbcommon/html/dynsections.js 43${PLIST.doc}share/doc/libxkbcommon/html/dynsections.js

cvs diff -r1.18 -r1.19 pkgsrc/x11/libxkbcommon/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/libxkbcommon/distinfo 2020/01/27 10:53:28 1.18
+++ pkgsrc/x11/libxkbcommon/distinfo 2020/09/13 09:25:37 1.19
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.18 2020/01/27 10:53:28 wiz Exp $ 1$NetBSD: distinfo,v 1.19 2020/09/13 09:25:37 wiz Exp $
2 2
3SHA1 (libxkbcommon-0.10.0.tar.xz) = d8f956f4bc5382d5d8e0e4dd590c4f090e0e985a 3SHA1 (libxkbcommon-1.0.1.tar.xz) = c3eb29be002785f51f74614bbd61fd64fce7812d
4RMD160 (libxkbcommon-0.10.0.tar.xz) = 9c31510f78ca9b39d839b667ea7de01bc5d49981 4RMD160 (libxkbcommon-1.0.1.tar.xz) = 2bbad312d88b4b7bc1f89490ef44b62f52634803
5SHA512 (libxkbcommon-0.10.0.tar.xz) = 58c523b42a8ea0cae7322d453fbc5d4624374221246cb067074e2ff9820eef3ceea8686283136432cdf0842acfc0858c7b2d3954de234b6501092ae1d27c9e79 5SHA512 (libxkbcommon-1.0.1.tar.xz) = 929be7b52fae360a696f01e0a8f3aa9b585ad99db975a88680ababf623e46f4d98e6f7590a2859c24060856f45b27e7249072702fbbf5a7bd0d4a10791e6d489
6Size (libxkbcommon-0.10.0.tar.xz) = 383788 bytes 6Size (libxkbcommon-1.0.1.tar.xz) = 432692 bytes