From 6ab331448c76fbd1ca4fb599d374924e6d5e3024 Mon Sep 17 00:00:00 2001
From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
Date: Tue, 23 Apr 2024 18:14:09 +0200
Subject: [PATCH] [libx11] Optimize Build (#38319)

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.

To beat:
- x64-windows: 28 min
- x86-windows: 28 min
- x64-windows-static-md: 26 min
- x64-windows-static: 26 min
- arm64-windows: 26 min
---
 ports/libx11/optimize-configure.patch | 13 +++++++++++++
 ports/libx11/portfile.cmake           | 12 +++++++-----
 ports/libx11/vcpkg.json               |  2 +-
 versions/baseline.json                |  2 +-
 versions/l-/libx11.json               |  5 +++++
 5 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 ports/libx11/optimize-configure.patch

diff --git a/ports/libx11/optimize-configure.patch b/ports/libx11/optimize-configure.patch
new file mode 100644
index 00000000000000..d964c2b03faf7e
--- /dev/null
+++ b/ports/libx11/optimize-configure.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index b14f9d78..2df82fe3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,7 +4,7 @@ else
+ ORDER=modules src
+ endif
+ # Order: nls before specs
+-SUBDIRS=include $(ORDER) nls man specs
++SUBDIRS=include $(ORDER) nls
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
diff --git a/ports/libx11/portfile.cmake b/ports/libx11/portfile.cmake
index 9c5cfde59af783..f19be986958238 100644
--- a/ports/libx11/portfile.cmake
+++ b/ports/libx11/portfile.cmake
@@ -14,11 +14,13 @@ vcpkg_from_gitlab(
     REF  3a30ada60c5217ada37b143b541c8e6f6284c7fa
     SHA512 441f86ff8293d27459feaa93f85bcd4d02c6bd64fdb4d95199e5ee8a75340c2ce9b0fccd0b05840ce0de30ff3af3d21e6f37c81840e82b37dbddf082911b585d
     HEAD_REF master
-    PATCHES cl.build.patch
-            io_include.patch
-            ${PATCHES}
-            vcxserver.patch
-            add_dl_pc.patch
+    PATCHES
+        optimize-configure.patch
+        cl.build.patch
+        io_include.patch
+        ${PATCHES}
+        vcxserver.patch
+        add_dl_pc.patch
 ) 
 
 set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
diff --git a/ports/libx11/vcpkg.json b/ports/libx11/vcpkg.json
index e54cf87f0db51e..86115b78f07ac6 100644
--- a/ports/libx11/vcpkg.json
+++ b/ports/libx11/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libx11",
   "version": "1.8.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The X Window System is a network-transparent window system that was designed at MIT.",
   "homepage": "https://www.x.org/wiki/",
   "license": "MIT",
diff --git a/versions/baseline.json b/versions/baseline.json
index 9f0b438e2dcbdb..cd25cf0f7ffa70 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5166,7 +5166,7 @@
     },
     "libx11": {
       "baseline": "1.8.1",
-      "port-version": 1
+      "port-version": 2
     },
     "libxau": {
       "baseline": "1.0.9",
diff --git a/versions/l-/libx11.json b/versions/l-/libx11.json
index ca6147fdc88723..f7500ed52e1adb 100644
--- a/versions/l-/libx11.json
+++ b/versions/l-/libx11.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4fda1cb1b842b106895d2ab377ec91cc9c39e932",
+      "version": "1.8.1",
+      "port-version": 2
+    },
     {
       "git-tree": "990f02cb9422412f2c71e9f3b4616a7331d65fe6",
       "version": "1.8.1",