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

Avoid several warnings while building mingw-w64-git* #560

Merged
merged 2 commits into from
Jun 19, 2024

Conversation

dscho
Copy link
Member

@dscho dscho commented Jun 18, 2024

We used to include gettext in the build-installers SDK artifact, but more by mistake than on purpose. We need to include it again, this time on purpose, to fix git-for-windows/git#4952.

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>
This avoids the "`error_highlight' was not loaded." warning when
building Git for Windows' `mingw-w64-git-doc-html` package.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho self-assigned this Jun 18, 2024
@dscho dscho merged commit e7e2b5b into git-for-windows:main Jun 19, 2024
12 checks passed
@dscho dscho deleted the include-gettext-in-build-installers branch June 19, 2024 15:22
dscho added a commit to git-for-windows/git-sdk-64 that referenced this pull request 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 added a commit to git-for-windows/git-sdk-arm64 that referenced this pull request 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 this pull request may close these issues.

Fix processing of translated messages in git-artifacts
1 participant