Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minimal-sdk: accommodate for gettext v0.23.* #90

Merged
merged 1 commit into from
Jan 7, 2025

Conversation

dscho
Copy link
Member

@dscho dscho commented Jan 7, 2025

Since the update of mingw-w64-gettext-runtime (0.22.5-2 -> 0.23.1-1), the ci-artifacts workflow is failing to build Git (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.

Since the update of `mingw-w64-gettext-runtime` (0.22.5-2 -> 0.23.1-1),
the `ci-artifacts` workflow is failing to build Git (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.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho self-assigned this Jan 7, 2025
@mjcheetham mjcheetham self-requested a review January 7, 2025 10:59
@dscho
Copy link
Member Author

dscho commented Jan 7, 2025

This will need to be done for git-sdk-arm64, too, I think.

@dscho dscho merged commit 7ae9003 into git-for-windows:main Jan 7, 2025
21 checks passed
@dscho dscho deleted the fix-msgfmt-in-minimal-sdk branch January 7, 2025 11:12
@dscho
Copy link
Member Author

dscho commented Jan 9, 2025

This will need to be done for git-sdk-arm64, too, I think.

And sure enough, it has to be done, seeing as the git-artifacts run for aarch64 just failed. Oh, and i686, too, so git-sdk-32 also needs this fix!

dscho added a commit to dscho/git-sdk-32 that referenced this pull request Jan 9, 2025
As of `mingw-w64-gettext-runtime` (0.22.5-2 -> 0.23.1-1), `msgfmt.exe`
now depends on a newly-introduced library, gettext-libtextstyle. So
let's include that in the `makepkg-git` sparse checkout, too.

This is a companion of git-for-windows/git-sdk-64#90

Signed-off-by: Johannes Schindelin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants