Skip to content

Commit

Permalink
makepkg-git: do include gettext and error_highlight
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
dscho committed Aug 13, 2024
1 parent 0d5e711 commit 84b845e
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions .sparse/makepkg-git
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@
/usr/share/makepkg/
/usr/bin/zstd.exe

# gettext (for makepkg)
/usr/bin/gettext.exe
/usr/bin/xgettext.exe
/usr/bin/msys-gettext*.dll

# The `error_highlight` Ruby gem, needed by `asciidoctor`
*error_highlight*

# AsciiDoc
/clangarm64/bin/asciidoc.exe
/clangarm64/bin/asciidoc-script.py
Expand Down

0 comments on commit 84b845e

Please sign in to comment.