Avoid several warnings while building mingw-w64-git*
#560
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We used to include
gettextin thebuild-installersSDK 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.