git: f33879ac3ec8 - main - x11/libxkbcommon: Update to 1.13.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 26 Dec 2025 22:11:08 UTC
The branch main has been updated by tagattie:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f33879ac3ec88e7993d570e584957f50c2d28ff6
commit f33879ac3ec88e7993d570e584957f50c2d28ff6
Author: Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2025-12-26 22:07:57 +0000
Commit: Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2025-12-26 22:10:59 +0000
x11/libxkbcommon: Update to 1.13.1
While here, use PLIST_SUB instead of PLIST_FILES for conditional plist
entries according to selected options. [1]
Changelog: https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-1.13.1/NEWS.md
PR: 291943
Suggested by: arrowd (via ports-committers) [1]
Approved by: manu (x11)
---
x11/libxkbcommon/Makefile | 13 ++++++++-----
x11/libxkbcommon/distinfo | 6 +++---
x11/libxkbcommon/pkg-plist | 8 +++++---
3 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index aef2b12b0e69..63dfb800772f 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,7 +1,6 @@
PORTNAME= libxkbcommon
DISTVERSIONPREFIX= xkbcommon-
-DISTVERSION= 1.13.0
-PORTREVISION= 1
+DISTVERSION= 1.13.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -24,7 +23,7 @@ USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= xkbcommon
-HAS_SYMBOL_VERSION= ${PREFIX}/lib/libxkbregistry.so.0.13.0
+HAS_SYMBOL_VERSION= ${PREFIX}/lib/libxkbregistry.so.0.13.1
MESON_ARGS= -Denable-docs=false \
-Dx-locale-root="${PREFIX}/lib/X11/locale"
@@ -48,11 +47,15 @@ X11_MESON_TRUE= enable-x11
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MEVDEV} || ${PORT_OPTIONS:MWAYLAND} || ${PORT_OPTIONS:MX11}
-PLIST_FILES+= libexec/xkbcommon/xkbcli-interactive
+PLIST_SUB+= EVDEV_OR_WAYLAND_OR_X11=""
+.else
+PLIST_SUB+= EVDEV_OR_WAYLAND_OR_X11="@comment "
.endif
.if ${PORT_OPTIONS:MWAYLAND} || ${PORT_OPTIONS:MX11}
-PLIST_FILES+= libexec/xkbcommon/xkbcli-dump-keymap
+PLIST_SUB+= WAYLAND_OR_X11=""
+.else
+PLIST_SUB+= WAYLAND_OR_X11="@comment "
.endif
.include <bsd.port.mk>
diff --git a/x11/libxkbcommon/distinfo b/x11/libxkbcommon/distinfo
index 9cab18f01a13..56541e9d8224 100644
--- a/x11/libxkbcommon/distinfo
+++ b/x11/libxkbcommon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1762978495
-SHA256 (xkbcommon-libxkbcommon-xkbcommon-1.13.0_GH0.tar.gz) = cd9367eec501867dfe7ddc3f6b18a026f2a2844a89d19108448d376cb849c9ed
-SIZE (xkbcommon-libxkbcommon-xkbcommon-1.13.0_GH0.tar.gz) = 1234211
+TIMESTAMP = 1766711285
+SHA256 (xkbcommon-libxkbcommon-xkbcommon-1.13.1_GH0.tar.gz) = aeb951964c2f7ecc08174cb5517962d157595e9e3f38fc4a130b91dc2f9fec18
+SIZE (xkbcommon-libxkbcommon-xkbcommon-1.13.1_GH0.tar.gz) = 1234661
diff --git a/x11/libxkbcommon/pkg-plist b/x11/libxkbcommon/pkg-plist
index 8c8cd1cf33f2..13cc9851275e 100644
--- a/x11/libxkbcommon/pkg-plist
+++ b/x11/libxkbcommon/pkg-plist
@@ -8,21 +8,23 @@ 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.0
+%%X11%%lib/libxkbcommon-x11.so.0.13.1
lib/libxkbcommon.so
lib/libxkbcommon.so.0
-lib/libxkbcommon.so.0.13.0
+lib/libxkbcommon.so.0.13.1
lib/libxkbregistry.so
lib/libxkbregistry.so.0
-lib/libxkbregistry.so.0.13.0
+lib/libxkbregistry.so.0.13.1
%%X11%%libdata/pkgconfig/xkbcommon-x11.pc
libdata/pkgconfig/xkbcommon.pc
libdata/pkgconfig/xkbregistry.pc
libexec/xkbcommon/xkbcli-compile-compose
libexec/xkbcommon/xkbcli-compile-keymap
+%%WAYLAND_OR_X11%%libexec/xkbcommon/xkbcli-dump-keymap
%%WAYLAND%%libexec/xkbcommon/xkbcli-dump-keymap-wayland
%%X11%%libexec/xkbcommon/xkbcli-dump-keymap-x11
libexec/xkbcommon/xkbcli-how-to-type
+%%EVDEV_OR_WAYLAND_OR_X11%%libexec/xkbcommon/xkbcli-interactive
%%EVDEV%%libexec/xkbcommon/xkbcli-interactive-evdev
%%WAYLAND%%libexec/xkbcommon/xkbcli-interactive-wayland
%%X11%%libexec/xkbcommon/xkbcli-interactive-x11