git: b1ffc2ddfa3d - main - x11/libxkbcommon: Update to 1.13.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 26 Jun 2026 20:00:35 UTC
The branch main has been updated by mce:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b1ffc2ddfa3d8a5b1c7a6ccc2be826d2b190e1a2
commit b1ffc2ddfa3d8a5b1c7a6ccc2be826d2b190e1a2
Author: Kousuke Kannagi <mce@FreeBSD.org>
AuthorDate: 2026-06-26 18:36:29 +0000
Commit: Kousuke Kannagi <mce@FreeBSD.org>
CommitDate: 2026-06-26 19:59:31 +0000
x11/libxkbcommon: Update to 1.13.2
Add BUILD_DEPENDS for new tool 'xkbcli info'.
Introduce SHLIB_VERSION variable.
Since there are no older versions in the port tree, remove the version
specification for wayland-protocols.
Update pkg-descr.
https://lore.freedesktop.org/wayland-devel/5d4c2e76872bbbc0f2bbef757573ba0832df8251@wismill.eu/
PR: 295843
Approved by: x11 (arrowd)
Approved by: osa (mentor)
---
x11/libxkbcommon/Makefile | 12 +++++++++---
x11/libxkbcommon/distinfo | 6 +++---
x11/libxkbcommon/files/patch-meson.build | 6 +++---
x11/libxkbcommon/files/patch-test_compose.c | 11 +++++++++++
x11/libxkbcommon/pkg-descr | 12 +++++++++---
x11/libxkbcommon/pkg-plist | 8 +++++---
6 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index 63dfb800772f..116ea7c25e6a 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,6 +1,6 @@
PORTNAME= libxkbcommon
DISTVERSIONPREFIX= xkbcommon-
-DISTVERSION= 1.13.1
+DISTVERSION= 1.13.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -10,7 +10,10 @@ WWW= https://xkbcommon.org/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
+BUILD_DEPENDS= xkeyboard-config>0:x11/xkeyboard-config
RUN_DEPENDS= xkeyboard-config>0:x11/xkeyboard-config
+TEST_DEPENDS= setxkbmap>0:x11/setxkbmap \
+ xorg-vfbserver>0:x11-servers/xorg-server@xvfb
USES= bison compiler:c11 cpe gnome meson pkgconfig python:test \
shebangfix
@@ -23,7 +26,10 @@ USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= xkbcommon
-HAS_SYMBOL_VERSION= ${PREFIX}/lib/libxkbregistry.so.0.13.1
+SHLIB_VERSION= ${DISTVERSION:S/^1./0./}
+HAS_SYMBOL_VERSION= ${PREFIX}/lib/libxkbregistry.so.${SHLIB_VERSION}
+
+PLIST_SUB= SHLIB_VERSION=${SHLIB_VERSION}
MESON_ARGS= -Denable-docs=false \
-Dx-locale-root="${PREFIX}/lib/X11/locale"
@@ -36,7 +42,7 @@ EVDEV_DESC= Interactive debugger for XKB keymaps for evdev
EVDEV_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto
EVDEV_USES= localbase
-WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.12:graphics/wayland-protocols
+WAYLAND_BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols
WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland
WAYLAND_MESON_TRUE= enable-wayland
diff --git a/x11/libxkbcommon/distinfo b/x11/libxkbcommon/distinfo
index 56541e9d8224..f84db09e4cdf 100644
--- a/x11/libxkbcommon/distinfo
+++ b/x11/libxkbcommon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1766711285
-SHA256 (xkbcommon-libxkbcommon-xkbcommon-1.13.1_GH0.tar.gz) = aeb951964c2f7ecc08174cb5517962d157595e9e3f38fc4a130b91dc2f9fec18
-SIZE (xkbcommon-libxkbcommon-xkbcommon-1.13.1_GH0.tar.gz) = 1234661
+TIMESTAMP = 1780497447
+SHA256 (xkbcommon-libxkbcommon-xkbcommon-1.13.2_GH0.tar.gz) = acc4d5f7c3cbba5f9f8d08d8bdbeede84ecede46792f47929aa9321873385528
+SIZE (xkbcommon-libxkbcommon-xkbcommon-1.13.2_GH0.tar.gz) = 1243485
diff --git a/x11/libxkbcommon/files/patch-meson.build b/x11/libxkbcommon/files/patch-meson.build
index ac0c651dc44f..5fdec11960d9 100644
--- a/x11/libxkbcommon/files/patch-meson.build
+++ b/x11/libxkbcommon/files/patch-meson.build
@@ -1,9 +1,9 @@
---- meson.build.orig 2025-03-11 23:24:11 UTC
+--- meson.build.orig 2026-06-03 14:42:00 UTC
+++ meson.build
-@@ -168,7 +168,7 @@ have_version_script = cc.links(
+@@ -310,7 +310,7 @@ have_version_script = cc.links(
meson_test_map = meson.current_source_dir() / 'test/meson_test.map'
have_version_script = cc.links(
- 'int main() { return 0; }',
+ 'int main(void) { return 0; }',
- args: f'-Wl,--version-script=@meson_test_map@',
+ args: ['-shared', f'-Wl,--version-script=@meson_test_map@'],
name: '-Wl,--version-script',
diff --git a/x11/libxkbcommon/files/patch-test_compose.c b/x11/libxkbcommon/files/patch-test_compose.c
new file mode 100644
index 000000000000..13e889f3cb4c
--- /dev/null
+++ b/x11/libxkbcommon/files/patch-test_compose.c
@@ -0,0 +1,11 @@
+--- test/compose.c.orig 2026-06-26 17:56:33 UTC
++++ test/compose.c
+@@ -24,6 +24,8 @@
+ #include "test/compose-iter.h"
+ #include "test/utils-text.h"
+
++#undef HAVE_NEWLOCALE
++
+ static const char *
+ compose_status_string(enum xkb_compose_status status)
+ {
diff --git a/x11/libxkbcommon/pkg-descr b/x11/libxkbcommon/pkg-descr
index 6985ea3c5412..c6772bd521b4 100644
--- a/x11/libxkbcommon/pkg-descr
+++ b/x11/libxkbcommon/pkg-descr
@@ -1,3 +1,9 @@
-xkbcommon is a library to handle keyboard descriptions, including loading them
-from disk, parsing them and handling their state. It's mainly meant for client
-toolkits, window systems, and other system applications
+libxkbcommon is a keyboard keymap compiler and support library which
+processes keymaps as defined by the XKB specification. It also contains
+a module for handling Compose and dead keys, a separate registry library
+for listing available keyboard layouts and a fair set of CLI tools to
+support keyboard layouts development.
+
+libxkbcommon is the standard keymap handling library on Wayland and is
+used by compositors, toolkits, and applications to handle keyboard state
+and translate key events into characters and actions.
diff --git a/x11/libxkbcommon/pkg-plist b/x11/libxkbcommon/pkg-plist
index 13cc9851275e..cedde4da08a6 100644
--- a/x11/libxkbcommon/pkg-plist
+++ b/x11/libxkbcommon/pkg-plist
@@ -8,18 +8,19 @@ include/xkbcommon/xkbcommon.h
include/xkbcommon/xkbregistry.h
%%X11%%lib/libxkbcommon-x11.so
%%X11%%lib/libxkbcommon-x11.so.0
-%%X11%%lib/libxkbcommon-x11.so.0.13.1
+%%X11%%lib/libxkbcommon-x11.so.%%SHLIB_VERSION%%
lib/libxkbcommon.so
lib/libxkbcommon.so.0
-lib/libxkbcommon.so.0.13.1
+lib/libxkbcommon.so.%%SHLIB_VERSION%%
lib/libxkbregistry.so
lib/libxkbregistry.so.0
-lib/libxkbregistry.so.0.13.1
+lib/libxkbregistry.so.%%SHLIB_VERSION%%
%%X11%%libdata/pkgconfig/xkbcommon-x11.pc
libdata/pkgconfig/xkbcommon.pc
libdata/pkgconfig/xkbregistry.pc
libexec/xkbcommon/xkbcli-compile-compose
libexec/xkbcommon/xkbcli-compile-keymap
+libexec/xkbcommon/xkbcli-info
%%WAYLAND_OR_X11%%libexec/xkbcommon/xkbcli-dump-keymap
%%WAYLAND%%libexec/xkbcommon/xkbcli-dump-keymap-wayland
%%X11%%libexec/xkbcommon/xkbcli-dump-keymap-x11
@@ -38,5 +39,6 @@ share/man/man1/xkbcli-how-to-type.1.gz
%%EVDEV%%share/man/man1/xkbcli-interactive-evdev.1.gz
%%WAYLAND%%share/man/man1/xkbcli-interactive-wayland.1.gz
%%X11%%share/man/man1/xkbcli-interactive-x11.1.gz
+share/man/man1/xkbcli-info.1.gz
share/man/man1/xkbcli-list.1.gz
share/man/man1/xkbcli.1.gz