From 37f6e7de3dae703bdbadd2f9ebffd679afd759b6 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 15 Jan 2026 19:45:44 +0100 Subject: [PATCH] [libxtst] update to 1.2.5 (#49452) Signed-off-by: Vitalii Koshura --- ports/libxtst/fix-configure.patch | 12 ++++++++++++ ports/libxtst/portfile.cmake | 16 +++++++++------- ports/libxtst/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libxtst.json | 5 +++++ 5 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 ports/libxtst/fix-configure.patch diff --git a/ports/libxtst/fix-configure.patch b/ports/libxtst/fix-configure.patch new file mode 100644 index 0000000000..d04d9a3038 --- /dev/null +++ b/ports/libxtst/fix-configure.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index e0d2256..6113dfd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -26,7 +26,6 @@ AC_INIT([libXtst], [1.2.5], + [https://gitlab.freedesktop.org/xorg/lib/libxtst/-/issues], [libXtst]) + AC_CONFIG_SRCDIR([Makefile.am]) + AC_CONFIG_HEADERS([config.h]) +-AC_CONFIG_MACRO_DIRS([m4]) + + # Initialize Automake + AM_INIT_AUTOMAKE([foreign dist-xz]) diff --git a/ports/libxtst/portfile.cmake b/ports/libxtst/portfile.cmake index b23b6ec380..256ce77eca 100644 --- a/ports/libxtst/portfile.cmake +++ b/ports/libxtst/portfile.cmake @@ -4,13 +4,15 @@ if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) else() vcpkg_from_gitlab( - GITLAB_URL https://gitlab.freedesktop.org/xorg + GITLAB_URL "https://gitlab.freedesktop.org/xorg" OUT_SOURCE_PATH SOURCE_PATH - REPO lib/libxtst - REF 99b89c3bcb0ebb0b6dd86bfdc9d276715eaea889 - SHA512 6479294057c73e91a086891e461e98d2717ae1fbe746cd74c9d13036a59bce931b8b0d5293d3c5ab4feeea426f2297647335179997e06a040b847697c7557199 + REPO "lib/libxtst" + REF "libXtst-${VERSION}" + SHA512 d48df671f212a1784ef1aefe69b16bc42395ff4ae083b7087dc55827fa6f8635b17adb5e26d976c8f8c7f02aeeb51f66c9808a037ef783c44139483c1c76ce3e HEAD_REF master -) + PATCHES + fix-configure.patch +) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") @@ -26,5 +28,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -endif() \ No newline at end of file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +endif() diff --git a/ports/libxtst/vcpkg.json b/ports/libxtst/vcpkg.json index 796f433ba1..617d83e4e7 100644 --- a/ports/libxtst/vcpkg.json +++ b/ports/libxtst/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libxtst", - "version": "1.2.4", + "version": "1.2.5", "description": "Xlib-based library for XTEST & RECORD extensions", "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxtst", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 7611d91993..89ca1d662e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5881,7 +5881,7 @@ "port-version": 0 }, "libxtst": { - "baseline": "1.2.4", + "baseline": "1.2.5", "port-version": 0 }, "libxv": { diff --git a/versions/l-/libxtst.json b/versions/l-/libxtst.json index 42a4516bf8..784a486727 100644 --- a/versions/l-/libxtst.json +++ b/versions/l-/libxtst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9494732c1aa47be37810d1a22b1faa566b7a8d4b", + "version": "1.2.5", + "port-version": 0 + }, { "git-tree": "8b2a80b040031d2b2c9952e885bc68884f13c099", "version": "1.2.4",