From 84b845eafc20c031a628038460027609ccd402f9 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 22 Jul 2024 12:42:52 +0200 Subject: [PATCH] makepkg-git: do include gettext and error_highlight In https://github.com/msys2/MSYS2-packages/commit/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 https://github.com/git-for-windows/git/issues/4952; The i686 part of was fixed by https://github.com/git-for-windows/build-extra/pull/560 already. Ported-from-git-sdk-64: a6f190ccbfb (makepkg-git: do include gettext and error_highlight, 2024-07-22) Signed-off-by: Johannes Schindelin --- .sparse/makepkg-git | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.sparse/makepkg-git b/.sparse/makepkg-git index 512d41ff5d0..6f2b4020392 100644 --- a/.sparse/makepkg-git +++ b/.sparse/makepkg-git @@ -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