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

Fix processing of translated messages in git-artifacts #4952

Closed
dscho opened this issue May 12, 2024 · 1 comment · Fixed by git-for-windows/build-extra#560
Closed

Fix processing of translated messages in git-artifacts #4952

dscho opened this issue May 12, 2024 · 1 comment · Fixed by git-for-windows/build-extra#560

Comments

@dscho
Copy link
Member

dscho commented May 12, 2024

I noticed that recent git-artifacts builds in git-sdk-64 started outputting lines like this:

/usr/bin/makepkg: line 1023: /usr/bin/gettext: No such file or directory

The reason is most likely that I recently changed Git for Windows not to include gettext, and the makepkg-git sparse-checkout definition needing to account for that.

A probable consequence of this issue is that the translated messages (which are not shipped in Git for Windows' installer, to save on bandwidth) are either broken or not even included in the mingw-w64-git package anymore.

dscho added a commit to dscho/build-extra that referenced this issue Jun 18, 2024
In msys2/MSYS2-packages@d7c37ffdadd, `gettext`
was identified as an incorrect dependency of the `xz` package and that
dependency was dropped.

As a consequence, Git for Windows no longer included `gettext`, which
uncovered a bug in the definition of the `build-installers` SDK artifact
where it relied on that implicit dependency instead of making it an
explicit requirement (needed by `makepkg` and `makepkg-mingw`).

Let's make it explicit that `gettext.exe` (and `xgettext.exe`) are to be
included in the `build-installers` SDK artifact.

This fixes git-for-windows/git#4952.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit to git-for-windows/git-sdk-64 that referenced this issue Jul 22, 2024
In msys2/MSYS2-packages@d7c37ffdadd, `gettext`
was identified as an incorrect dependency of the `xz` package and that
dependency was dropped.

As a consequence, Git for Windows no longer included `gettext`, which
uncovered a bug in the definition of the `makepkg-git` SDK artifact
where it relied on that implicit dependency instead of making it an
explicit requirement (because it is needed by `makepkg` and
`makepkg-mingw`).

Let's make it explicit that `gettext.exe` (and `xgettext.exe`) are to be
included in the `makepkg-git` SDK artifact.

While at it, also avoid the "`error_highlight' was not loaded." warning
when building Git for Windows' `mingw-w64-git-doc-html` package.

This addresses the previously-forgotten x86_64 part of
git-for-windows/git#4952; The i686 part of was
fixed by git-for-windows/build-extra#560
already.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Copy link
Member Author

dscho commented Jul 22, 2024

Turns out that git-for-windows/build-extra#560 only addressed the i686 build, but not the x86_64 one. I fixed this via git-for-windows/git-sdk-64@a6f190c.

dscho added a commit to git-for-windows/git-sdk-arm64 that referenced this issue Aug 13, 2024
In msys2/MSYS2-packages@d7c37ffdadd, `gettext`
was identified as an incorrect dependency of the `xz` package and that
dependency was dropped.

As a consequence, Git for Windows no longer included `gettext`, which
uncovered a bug in the definition of the `makepkg-git` SDK artifact
where it relied on that implicit dependency instead of making it an
explicit requirement (because it is needed by `makepkg` and
`makepkg-mingw`).

Let's make it explicit that `gettext.exe` (and `xgettext.exe`) are to be
included in the `makepkg-git` SDK artifact.

While at it, also avoid the "`error_highlight' was not loaded." warning
when building Git for Windows' `mingw-w64-git-doc-html` package.

This addresses the previously-forgotten x86_64 part of
git-for-windows/git#4952; The i686 part of was
fixed by git-for-windows/build-extra#560
already.

Ported-from-git-sdk-64: a6f190c (makepkg-git: do include gettext and error_highlight, 2024-07-22)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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 a pull request may close this issue.

1 participant