From bd6c452a9ff6d858c03437702fd0e506200772a8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 14 Jan 2025 16:04:01 +0000
Subject: [PATCH 1/2] Put "no-xft" "build-info" tag in the alphabetical correct
 place

---
 generic/tkWindow.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index e4b8ad3c4..08432faf3 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -1008,6 +1008,9 @@ TkCreateMainWindow(
 #ifndef TCL_CFG_OPTIMIZED
 		".no-optimize"
 #endif
+#if !defined(_WIN32) && !defined(MAC_OSX_TK) && !defined(HAVE_XFT)
+		".no-xft"
+#endif
 #ifdef __OBJC__
 		".objective-c"
 #if defined(__cplusplus)
@@ -1031,9 +1034,6 @@ TkCreateMainWindow(
 #endif
 #if !defined(_WIN32) && !defined(MAC_OSX_TK)
 		".x11"
-#if !defined(HAVE_XFT)
-		".no-xft"
-#endif
 #endif
 		), NULL);
     }

From 8cd7a011c6388d7ed254885a435c4a7cd6e94e03 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 15 Jan 2025 17:26:35 +0000
Subject: [PATCH 2/2] Install headers before documentation. If documentation
 copying (which is slow) is aborted, it doesn't affect development work

---
 unix/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index f49e03272..243fa56d5 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -705,8 +705,8 @@ INSTALL_DOC_TARGETS = install-doc
 INSTALL_DEV_TARGETS = install-headers
 INSTALL_DEMO_TARGETS = install-demos
 INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
-INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
-		$(INSTALL_DEMO_TARGETS) $(INSTALL_EXTRA_TARGETS)
+INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DEV_TARGETS) \
+		$(INSTALL_DEMO_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_EXTRA_TARGETS)
 
 install: $(INSTALL_TARGETS)