libxkbcommon: update to 0.9.1.

libxkbcommon 0.9.1 - 2019-10-19
==================

- Fix context creation failing when run in privileged processes as defined by
  `secure_getenv(3)`, e.g. GDM.


libxkbcommon 0.9.0 - 2019-10-19
==================

- Move ~/.xkb to before XKB_CONFIG_ROOT (the system XKB path, usually
  /usr/share/X11/xkb) in the default include path. This enables the user
  to have full control of the keymap definitions, instead of only augmenting
  them.

- Remove the Autotools build system. Use the meson build system instead.

- Fix invalid names used for levels above 8 when dumping keymaps. Previously,
  e.g. "Level20" was dumped, but only up to "Level8" is accepted by the
  parser. Now "20" is dumped.

- Change level references to always be dumped as e.g. "5" instead of "Level5".

  Change group references to always be dumped capitalized e.g. "Group3" instead
  of "group3". Previously it was inconsistent.

  These changes affect the output of xkb_keymap_get_as_string().

- Fix several build issues on macOS/Darwin, Solaris, NetBSD, cross compilation.

- Port the interactive-wayland test program to the stable version of xdg-shell.

4 files changed, 87 insertions, 86 deletions

diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index 84dcccd2f2a..85d6e4f532e 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2019/02/24 14:59:07 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2019/11/06 12:51:55 wiz Exp $
 
-DISTNAME=	libxkbcommon-0.8.4
+DISTNAME=	libxkbcommon-0.9.1
 CATEGORIES=	x11
 MASTER_SITES=	https://xkbcommon.org/download/
 EXTRACT_SUFX=	.tar.xz
@@ -10,11 +10,13 @@ HOMEPAGE=	https://xkbcommon.org/
 COMMENT=	Library to handle keyboard descriptions
 LICENSE=	mit
 
-GNU_CONFIGURE=	yes
 USE_TOOLS+=	bison gmake pkg-config
-USE_LIBTOOL=	yes
 
-PKGCONFIG_OVERRIDE+=	xkbcommon.pc.in
+MESON_ARGS+=	-Denable-wayland=false
+
+PKGCONFIG_OVERRIDE+=		output/meson-private/xkbcommon.pc
+PKGCONFIG_OVERRIDE+=		output/meson-private/xkbcommon-x11.pc
+PKGCONFIG_OVERRIDE_STAGE=       post-configure
 
 .include "options.mk"
 
@@ -27,4 +29,5 @@ BUILDLINK_TRANSFORM+=	rm:-Wl,--version-script=./xkbcommon-x11.map
 BUILDLINK_API_DEPENDS.libxcb+=	libxcb>=1.10
 .include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/xkeyboard-config/buildlink3.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxkbcommon/PLIST b/x11/libxkbcommon/PLIST
index ea15f64e552..9013ababcdd 100644
--- a/x11/libxkbcommon/PLIST
+++ b/x11/libxkbcommon/PLIST
@@ -1,81 +1,80 @@
-@comment $NetBSD: PLIST,v 1.7 2014/11/17 21:21:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2019/11/06 12:51:55 wiz Exp $
 include/xkbcommon/xkbcommon-compat.h
 include/xkbcommon/xkbcommon-compose.h
 include/xkbcommon/xkbcommon-keysyms.h
 include/xkbcommon/xkbcommon-names.h
 include/xkbcommon/xkbcommon-x11.h
 include/xkbcommon/xkbcommon.h
-lib/libxkbcommon-x11.la
-lib/libxkbcommon.la
+lib/libxkbcommon-x11.so
+lib/libxkbcommon-x11.so.0
+lib/libxkbcommon-x11.so.0.0.0
+lib/libxkbcommon.so
+lib/libxkbcommon.so.0
+lib/libxkbcommon.so.0.0.0
 lib/pkgconfig/xkbcommon-x11.pc
 lib/pkgconfig/xkbcommon.pc
-${PLIST.doc}share/doc/libxkbcommon/annotated.html
-${PLIST.doc}share/doc/libxkbcommon/bc_s.png
-${PLIST.doc}share/doc/libxkbcommon/bdwn.png
-${PLIST.doc}share/doc/libxkbcommon/classes.html
-${PLIST.doc}share/doc/libxkbcommon/closed.png
-${PLIST.doc}share/doc/libxkbcommon/dir_000000.html
-${PLIST.doc}share/doc/libxkbcommon/doxygen-extra.css
-${PLIST.doc}share/doc/libxkbcommon/doxygen.css
-${PLIST.doc}share/doc/libxkbcommon/doxygen.png
-${PLIST.doc}share/doc/libxkbcommon/dynsections.js
-${PLIST.doc}share/doc/libxkbcommon/files.html
-${PLIST.doc}share/doc/libxkbcommon/ftv2blank.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2doc.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2folderclosed.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2folderopen.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2lastnode.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2link.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2mlastnode.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2mnode.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2node.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2plastnode.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2pnode.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2splitbar.png
-${PLIST.doc}share/doc/libxkbcommon/ftv2vertline.png
-${PLIST.doc}share/doc/libxkbcommon/functions.html
-${PLIST.doc}share/doc/libxkbcommon/functions_func.html
-${PLIST.doc}share/doc/libxkbcommon/functions_type.html
-${PLIST.doc}share/doc/libxkbcommon/functions_vars.html
-${PLIST.doc}share/doc/libxkbcommon/globals.html
-${PLIST.doc}share/doc/libxkbcommon/globals_defs.html
-${PLIST.doc}share/doc/libxkbcommon/globals_enum.html
-${PLIST.doc}share/doc/libxkbcommon/globals_eval.html
-${PLIST.doc}share/doc/libxkbcommon/globals_func.html
-${PLIST.doc}share/doc/libxkbcommon/globals_type.html
-${PLIST.doc}share/doc/libxkbcommon/group__components.html
-${PLIST.doc}share/doc/libxkbcommon/group__compose.html
-${PLIST.doc}share/doc/libxkbcommon/group__context.html
-${PLIST.doc}share/doc/libxkbcommon/group__include-path.html
-${PLIST.doc}share/doc/libxkbcommon/group__keymap.html
-${PLIST.doc}share/doc/libxkbcommon/group__keysyms.html
-${PLIST.doc}share/doc/libxkbcommon/group__logging.html
-${PLIST.doc}share/doc/libxkbcommon/group__state.html
-${PLIST.doc}share/doc/libxkbcommon/group__x11.html
-${PLIST.doc}share/doc/libxkbcommon/index.html
-${PLIST.doc}share/doc/libxkbcommon/jquery.js
-${PLIST.doc}share/doc/libxkbcommon/md_doc_compat.html
-${PLIST.doc}share/doc/libxkbcommon/md_doc_quick-guide.html
-${PLIST.doc}share/doc/libxkbcommon/modules.html
-${PLIST.doc}share/doc/libxkbcommon/nav_f.png
-${PLIST.doc}share/doc/libxkbcommon/nav_g.png
-${PLIST.doc}share/doc/libxkbcommon/nav_h.png
-${PLIST.doc}share/doc/libxkbcommon/open.png
-${PLIST.doc}share/doc/libxkbcommon/pages.html
-${PLIST.doc}share/doc/libxkbcommon/structxkb__compose__state.html
-${PLIST.doc}share/doc/libxkbcommon/structxkb__compose__table.html
-${PLIST.doc}share/doc/libxkbcommon/structxkb__context.html
-${PLIST.doc}share/doc/libxkbcommon/structxkb__keymap.html
-${PLIST.doc}share/doc/libxkbcommon/structxkb__rule__names.html
-${PLIST.doc}share/doc/libxkbcommon/structxkb__state.html
-${PLIST.doc}share/doc/libxkbcommon/sync_off.png
-${PLIST.doc}share/doc/libxkbcommon/sync_on.png
-${PLIST.doc}share/doc/libxkbcommon/tab_a.png
-${PLIST.doc}share/doc/libxkbcommon/tab_b.png
-${PLIST.doc}share/doc/libxkbcommon/tab_h.png
-${PLIST.doc}share/doc/libxkbcommon/tab_s.png
-${PLIST.doc}share/doc/libxkbcommon/tabs.css
-${PLIST.doc}share/doc/libxkbcommon/xkbcommon-compose_8h.html
-${PLIST.doc}share/doc/libxkbcommon/xkbcommon-names_8h.html
-${PLIST.doc}share/doc/libxkbcommon/xkbcommon-x11_8h.html
-${PLIST.doc}share/doc/libxkbcommon/xkbcommon_8h.html
+${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
+${PLIST.doc}share/doc/libxkbcommon/html/classes.html
+${PLIST.doc}share/doc/libxkbcommon/html/closed.png
+${PLIST.doc}share/doc/libxkbcommon/html/deprecated.html
+${PLIST.doc}share/doc/libxkbcommon/html/dir_000000.html
+${PLIST.doc}share/doc/libxkbcommon/html/dir_000001.html
+${PLIST.doc}share/doc/libxkbcommon/html/doc.png
+${PLIST.doc}share/doc/libxkbcommon/html/doxygen-extra.css
+${PLIST.doc}share/doc/libxkbcommon/html/doxygen.css
+${PLIST.doc}share/doc/libxkbcommon/html/doxygen.png
+${PLIST.doc}share/doc/libxkbcommon/html/dynsections.js
+${PLIST.doc}share/doc/libxkbcommon/html/files.html
+${PLIST.doc}share/doc/libxkbcommon/html/folderclosed.png
+${PLIST.doc}share/doc/libxkbcommon/html/folderopen.png
+${PLIST.doc}share/doc/libxkbcommon/html/functions.html
+${PLIST.doc}share/doc/libxkbcommon/html/functions_func.html
+${PLIST.doc}share/doc/libxkbcommon/html/functions_type.html
+${PLIST.doc}share/doc/libxkbcommon/html/functions_vars.html
+${PLIST.doc}share/doc/libxkbcommon/html/globals.html
+${PLIST.doc}share/doc/libxkbcommon/html/globals_defs.html
+${PLIST.doc}share/doc/libxkbcommon/html/globals_enum.html
+${PLIST.doc}share/doc/libxkbcommon/html/globals_eval.html
+${PLIST.doc}share/doc/libxkbcommon/html/globals_func.html
+${PLIST.doc}share/doc/libxkbcommon/html/globals_type.html
+${PLIST.doc}share/doc/libxkbcommon/html/group__components.html
+${PLIST.doc}share/doc/libxkbcommon/html/group__compose.html
+${PLIST.doc}share/doc/libxkbcommon/html/group__context.html
+${PLIST.doc}share/doc/libxkbcommon/html/group__include-path.html
+${PLIST.doc}share/doc/libxkbcommon/html/group__keymap.html
+${PLIST.doc}share/doc/libxkbcommon/html/group__keysyms.html
+${PLIST.doc}share/doc/libxkbcommon/html/group__logging.html
+${PLIST.doc}share/doc/libxkbcommon/html/group__state.html
+${PLIST.doc}share/doc/libxkbcommon/html/group__x11.html
+${PLIST.doc}share/doc/libxkbcommon/html/index.html
+${PLIST.doc}share/doc/libxkbcommon/html/jquery.js
+${PLIST.doc}share/doc/libxkbcommon/html/md_doc_compat.html
+${PLIST.doc}share/doc/libxkbcommon/html/md_doc_quick-guide.html
+${PLIST.doc}share/doc/libxkbcommon/html/menu.js
+${PLIST.doc}share/doc/libxkbcommon/html/menudata.js
+${PLIST.doc}share/doc/libxkbcommon/html/modules.html
+${PLIST.doc}share/doc/libxkbcommon/html/nav_f.png
+${PLIST.doc}share/doc/libxkbcommon/html/nav_g.png
+${PLIST.doc}share/doc/libxkbcommon/html/nav_h.png
+${PLIST.doc}share/doc/libxkbcommon/html/open.png
+${PLIST.doc}share/doc/libxkbcommon/html/pages.html
+${PLIST.doc}share/doc/libxkbcommon/html/splitbar.png
+${PLIST.doc}share/doc/libxkbcommon/html/structxkb__compose__state.html
+${PLIST.doc}share/doc/libxkbcommon/html/structxkb__compose__table.html
+${PLIST.doc}share/doc/libxkbcommon/html/structxkb__context.html
+${PLIST.doc}share/doc/libxkbcommon/html/structxkb__keymap.html
+${PLIST.doc}share/doc/libxkbcommon/html/structxkb__rule__names.html
+${PLIST.doc}share/doc/libxkbcommon/html/structxkb__state.html
+${PLIST.doc}share/doc/libxkbcommon/html/sync_off.png
+${PLIST.doc}share/doc/libxkbcommon/html/sync_on.png
+${PLIST.doc}share/doc/libxkbcommon/html/tab_a.png
+${PLIST.doc}share/doc/libxkbcommon/html/tab_b.png
+${PLIST.doc}share/doc/libxkbcommon/html/tab_h.png
+${PLIST.doc}share/doc/libxkbcommon/html/tab_s.png
+${PLIST.doc}share/doc/libxkbcommon/html/tabs.css
+${PLIST.doc}share/doc/libxkbcommon/html/xkbcommon-compose_8h.html
+${PLIST.doc}share/doc/libxkbcommon/html/xkbcommon-names_8h.html
+${PLIST.doc}share/doc/libxkbcommon/html/xkbcommon-x11_8h.html
+${PLIST.doc}share/doc/libxkbcommon/html/xkbcommon_8h.html
diff --git a/x11/libxkbcommon/distinfo b/x11/libxkbcommon/distinfo
index a7692e3a727..d35f65b3180 100644
--- a/x11/libxkbcommon/distinfo
+++ b/x11/libxkbcommon/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2019/02/24 14:59:07 wiz Exp $
+$NetBSD: distinfo,v 1.17 2019/11/06 12:51:55 wiz Exp $
 
-SHA1 (libxkbcommon-0.8.4.tar.xz) = 0ce9df42239d451f61b2112c6ba8d0a1a0879009
-RMD160 (libxkbcommon-0.8.4.tar.xz) = c4f2a8fc8ce7f79d3265e6ee3ba86ccae98187af
-SHA512 (libxkbcommon-0.8.4.tar.xz) = dbd441d0d7d5ba4fb352d64d150d163d4cdcf8340059457c291dc1fc69d1606ff6589732cb41a7fcfe106af0192977b243d7d68c4d95b90ece7abb620df360e3
-Size (libxkbcommon-0.8.4.tar.xz) = 648592 bytes
+SHA1 (libxkbcommon-0.9.1.tar.xz) = 6685b3b98d1903e5e0ece1c234b9055fcb24701d
+RMD160 (libxkbcommon-0.9.1.tar.xz) = f3dc87a56b8f43e1a4ad73234760359e7e3e7c9e
+SHA512 (libxkbcommon-0.9.1.tar.xz) = 8d4551a06e7dd4936633f544409401dc33f8f1900adb5daa6403615c71f321d17212db739f89a5b3e393d729b3f33167691404849a25d5526b403fd9ec3e8878
+Size (libxkbcommon-0.9.1.tar.xz) = 376164 bytes
diff --git a/x11/libxkbcommon/options.mk b/x11/libxkbcommon/options.mk
index aa8d683a433..4e64be1f577 100644
--- a/x11/libxkbcommon/options.mk
+++ b/x11/libxkbcommon/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2015/12/29 04:54:39 dholland Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/06 12:51:55 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libxkbcommon
 PKG_SUPPORTED_OPTIONS=	doc
@@ -10,7 +10,6 @@ PLIST_VARS+=		doc
 .if !empty(PKG_OPTIONS:Mdoc)
 BUILD_DEPENDS+=		doxygen-[0-9]*:../../devel/doxygen
 PLIST.doc=		yes
-CONFIGURE_ARGS+=	--enable-docs=yes
 .else
-CONFIGURE_ARGS+=	--enable-docs=no
+MESON_ARGS+=		-Denable-docs=false
 .endif