x11/libxkbcommon: Backport upstream patch for libxml2 2.14 compatibility with libxml 2.14+ and improve port

* Backport upstream commit d7e112febb7ab756563da6eced0a650396be5945
* Rework Makefile to closer follow Porters Handbook
  PORTVERSION --> DISTVERSION
  Move CPE_VENDOR, SHEBANG_FILES and USE_LDCONFIG to USES block
  Remove unused reference in MESON_ARGS

Reference:
d7e112febb

PR:		285910
Reviewed by:	manu
Approved by:	x11 (manu)
This commit is contained in:
Daniel Engberg 2025-04-18 09:38:19 +02:00
parent 3ab9a26410
commit 0d3fd1df08
2 changed files with 17 additions and 11 deletions

View file

@ -1,8 +1,11 @@
PORTNAME= libxkbcommon PORTNAME= libxkbcommon
PORTVERSION= 1.8.1 DISTVERSION= 1.8.1
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= x11 CATEGORIES= x11
PATCH_SITES= https://github.com/xkbcommon/libxkbcommon/commit/
PATCHFILES= d7e112febb7ab756563da6eced0a650396be5945.patch:-p1
MAINTAINER= x11@FreeBSD.org MAINTAINER= x11@FreeBSD.org
COMMENT= Keymap handling library for toolkits and window systems COMMENT= Keymap handling library for toolkits and window systems
WWW= https://xkbcommon.org/ WWW= https://xkbcommon.org/
@ -14,20 +17,21 @@ RUN_DEPENDS= xkeyboard-config>0:x11/xkeyboard-config
USES= bison compiler:c11 cpe gnome meson pkgconfig python:test \ USES= bison compiler:c11 cpe gnome meson pkgconfig python:test \
shebangfix shebangfix
USE_GNOME= libxml2
USE_GITHUB= yes
GH_ACCOUNT= xkbcommon
GH_TAGNAME= ${GH_ACCOUNT}-${PORTVERSION}
USE_LDCONFIG= yes
MESON_ARGS= -Denable-docs=false \
-Dx-locale-root="${PREFIX}/lib/X11/locale" \
${MESON_ARGS_${OPSYS}_${OSREL:R}}
CPE_VENDOR= xkbcommon CPE_VENDOR= xkbcommon
SHEBANG_FILES= test/xkeyboard-config-test.py.in \ SHEBANG_FILES= test/xkeyboard-config-test.py.in \
test/*.py test/*.py
USE_GNOME= libxml2
USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= xkbcommon
GH_TAGNAME= ${GH_ACCOUNT}-${DISTVERSION}
HAS_SYMBOL_VERSION= ${PREFIX}/lib/libxkbregistry.so.0.8.1 HAS_SYMBOL_VERSION= ${PREFIX}/lib/libxkbregistry.so.0.8.1
MESON_ARGS= -Denable-docs=false \
-Dx-locale-root="${PREFIX}/lib/X11/locale"
OPTIONS_DEFINE= EVDEV WAYLAND X11 OPTIONS_DEFINE= EVDEV WAYLAND X11
OPTIONS_DEFAULT=EVDEV WAYLAND X11 OPTIONS_DEFAULT=EVDEV WAYLAND X11
OPTIONS_SUB= yes OPTIONS_SUB= yes

View file

@ -1,3 +1,5 @@
TIMESTAMP = 1741855108 TIMESTAMP = 1743897665
SHA256 (xkbcommon-libxkbcommon-1.8.1-xkbcommon-1.8.1_GH0.tar.gz) = c65c668810db305c4454ba26a10b6d84a96b5469719fe3c729e1c6542b8d0d87 SHA256 (xkbcommon-libxkbcommon-1.8.1-xkbcommon-1.8.1_GH0.tar.gz) = c65c668810db305c4454ba26a10b6d84a96b5469719fe3c729e1c6542b8d0d87
SIZE (xkbcommon-libxkbcommon-1.8.1-xkbcommon-1.8.1_GH0.tar.gz) = 983334 SIZE (xkbcommon-libxkbcommon-1.8.1-xkbcommon-1.8.1_GH0.tar.gz) = 983334
SHA256 (d7e112febb7ab756563da6eced0a650396be5945.patch) = 5701bd42031689331fe9b9746d0443cedcc3b0834ed42ec622392827e32f4c7c
SIZE (d7e112febb7ab756563da6eced0a650396be5945.patch) = 1858