From 7bb810743cbd9abd428be024c838783a58d5d4c1 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Wed, 22 Apr 2026 21:54:15 +0200
Subject: [PATCH] [libxau] Revise (#51316)

---
 ports/libxau/fix-configure-ac.patch | 25 ------------
 ports/libxau/portfile.cmake         | 63 ++++++++++++++---------------
 ports/libxau/vcpkg.json             |  2 +-
 versions/baseline.json              |  2 +-
 versions/l-/libxau.json             |  5 +++
 5 files changed, 37 insertions(+), 60 deletions(-)
 delete mode 100644 ports/libxau/fix-configure-ac.patch

diff --git a/ports/libxau/fix-configure-ac.patch b/ports/libxau/fix-configure-ac.patch
deleted file mode 100644
index cef5690446..0000000000
--- a/ports/libxau/fix-configure-ac.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index cb3adbe..dd17d48 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -62,6 +62,5 @@ ChangeLog:
- 
- dist-hook: ChangeLog INSTALL
- 
--ACLOCAL_AMFLAGS = -I m4
- 
--EXTRA_DIST = meson.build meson_options.txt
-\ No newline at end of file
-+EXTRA_DIST = meson.build meson_options.txt
-diff --git a/configure.ac b/configure.ac
-index e1182b6..97b9d41 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -26,7 +26,6 @@ AC_INIT([libXau], [1.0.12],
- 	[https://gitlab.freedesktop.org/xorg/lib/libxau/-/issues], [libXau])
- AC_CONFIG_SRCDIR([Makefile.am])
- AC_CONFIG_HEADERS([config.h])
--AC_CONFIG_MACRO_DIRS([m4])
- AC_USE_SYSTEM_EXTENSIONS
- 
- # Initialize Automake
diff --git a/ports/libxau/portfile.cmake b/ports/libxau/portfile.cmake
index f6342be8c0..18a0fe4827 100644
--- a/ports/libxau/portfile.cmake
+++ b/ports/libxau/portfile.cmake
@@ -1,33 +1,30 @@
-if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
-    message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet")
-    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-else()
-
-vcpkg_from_gitlab(
-    GITLAB_URL "https://gitlab.freedesktop.org/xorg"
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO "lib/libxau"
-    REF "libXau-${VERSION}"
-    SHA512 d76ea5a7d5f70159b3d40242cee66b4a763b98ce57b0b5660ce47cac9bc240d51fb20eec969f8fffdfd79fa46ec8e1b9bf2aa4ca9d39d1f45d515e75afb23a7d
-    HEAD_REF master
-    PATCHES
-        fix-configure-ac.patch
-)
-
-set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
-
-vcpkg_make_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    AUTORECONF
-    OPTIONS "${OPTIONS}"
-)
-
-vcpkg_make_install()
-vcpkg_fixup_pkgconfig()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-# Handle copyright
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
-endif()
+if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
+    message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet")
+    set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+    return()
+endif()
+
+vcpkg_from_gitlab(
+    GITLAB_URL "https://gitlab.freedesktop.org/xorg"
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO "lib/libxau"
+    REF "libXau-${VERSION}"
+    SHA512 d76ea5a7d5f70159b3d40242cee66b4a763b98ce57b0b5660ce47cac9bc240d51fb20eec969f8fffdfd79fa46ec8e1b9bf2aa4ca9d39d1f45d515e75afb23a7d
+    HEAD_REF master
+)
+file(MAKE_DIRECTORY "${SOURCE_PATH}/m4")
+
+set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
+
+vcpkg_make_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    AUTORECONF
+)
+
+vcpkg_make_install()
+vcpkg_fixup_pkgconfig()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
diff --git a/ports/libxau/vcpkg.json b/ports/libxau/vcpkg.json
index 400a9aae43..29115b0c6b 100644
--- a/ports/libxau/vcpkg.json
+++ b/ports/libxau/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libxau",
   "version": "1.0.12",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Functions for handling Xauthority files and entries.",
   "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxau",
   "license": "MIT-open-group",
diff --git a/versions/baseline.json b/versions/baseline.json
index 1b604c8b97..8096f703c7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5854,7 +5854,7 @@
     },
     "libxau": {
       "baseline": "1.0.12",
-      "port-version": 1
+      "port-version": 2
     },
     "libxaw": {
       "baseline": "1.0.13",
diff --git a/versions/l-/libxau.json b/versions/l-/libxau.json
index b0dc1564d2..dccf83d581 100644
--- a/versions/l-/libxau.json
+++ b/versions/l-/libxau.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "44da13403d81833b1eec97b22c787fb5b9a13c6e",
+      "version": "1.0.12",
+      "port-version": 2
+    },
     {
       "git-tree": "ad22e5798fd0cadf1617251a773ba74f9098e62c",
       "version": "1.0.12",