From fac22b7b4cf15294a73a2cb3ac27af87e6a8fd73 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 7 Jan 2025 11:49:56 +0100 Subject: [PATCH] minimal-sdk: accommodate for gettext v0.23.* Since the update of `mingw-w64-gettext-runtime` (0.22.5-2 -> 0.23.1-1), the `ci-artifacts` workflow was failing in `git-sdk-64` (see e.g. https://github.com/git-for-windows/git-sdk-64/actions/runs/12649348500/job/35245565295#step:8:523): MSGFMT po/bg.msg application-specific initialization failed: Can't find a usable init.tcl in the following directories: D:/a/git-sdk-64/git-sdk-64/minimal-sdk/mingw64/lib/tcl8.6 D:/a/git-sdk-64/git-sdk-64/minimal-sdk/mingw64/lib/tcl8.6 D:/a/git-sdk-64/git-sdk-64/minimal-sdk/lib/tcl8.6 D:/a/git-sdk-64/git-sdk-64/minimal-sdk/mingw64/library D:/a/git-sdk-64/git-sdk-64/minimal-sdk/library D:/a/git-sdk-64/git-sdk-64/minimal-sdk/tcl8.6.13/library D:/a/git-sdk-64/git-sdk-64/tcl8.6.13/library This probably means that Tcl wasn't installed properly. The message about Tcl not being installed properly is a red herring: While this _is_ true, the actual fall-back to the real `msgfmt.exe` from the actual `gettext` package _should_ work. As of v0.23, though, that `msgfmt.exe` program now depends on a newly-introduced library, gettext-libtextstyle. So let's include that in minimal SDK's sparse checkout, too. This would have failed in `git-sdk-arm64`, too, if we were running the `ci-artifacts` builds (which we cannot do for financial reasons, seeing as free-of-cost hosted Windows/ARM64 runners for open source are still pushed into the future). What _does_ fail because of this is the `git-artifacts` workflow: https://github.com/git-for-windows/git-for-windows-automation/actions/runs/12689315932/job/35367755275#step:19:1518 So let's fix this also in `git-sdk-arm64`. Cherry-picked-from: e70ecb707be (minimal-sdk: accommodate for gettext v0.23.*, 2025-01-07) Signed-off-by: Johannes Schindelin --- .sparse/minimal-sdk | 1 + 1 file changed, 1 insertion(+) diff --git a/.sparse/minimal-sdk b/.sparse/minimal-sdk index 227b0776068..c7c395c777f 100644 --- a/.sparse/minimal-sdk +++ b/.sparse/minimal-sdk @@ -41,6 +41,7 @@ # gettext (msgfmt) /clangarm64/bin/msgfmt.exe /clangarm64/bin/libgettext*.dll +/clangarm64/bin/libtextstyle-*[0-9].dll # Tcl (to emulate msgfmt, *somewhere*) /clangarm64/bin/tclsh.exe