-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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
[gtk] Add a dependency on gettext[tools] to build translation files #24596
Conversation
No portfile changes for explicit control? |
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
cc @Neumann-A |
/azp run |
Commenter does not have sufficient privileges for PR 24596 in repo microsoft/vcpkg |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the PR!
ports/gtk/portfile.cmake
Outdated
@@ -17,6 +17,7 @@ vcpkg_find_acquire_program(PKGCONFIG) | |||
get_filename_component(PKGCONFIG_DIR "${PKGCONFIG}" DIRECTORY ) | |||
vcpkg_add_to_path("${PKGCONFIG_DIR}") # Post install script runs pkg-config so it needs to be on PATH | |||
vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/glib/") | |||
vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin") |
We should instead add msgfmt to ADDITIONAL_NATIVE_BINARIES
in vcpkg_configure_meson()
below to ensure it's using our copy of gettext
:
msgfmt='${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin/msgfmt${VCPKG_HOST_EXECUTABLE_SUFFIX}'
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ADDITIONAL_NATIVE_BINARIES
invcpkg_configure_meson()
... undocumented ...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually PATH is altered by ports/gettext/vcpkg-port-config.cmake so I removed this patch hunk.
Additionally, when checking for gettext availability meson checks for xgettext binary, not msgfmt, so your suggestion does not seem to be valid.
GTK translation files are built only when gettext-tools is present
What does your PR fix?
N/A
Which triplets are supported/not supported? Have you updated the CI baseline?
all
Does your PR follow the maintainer guide?
Yes
If you have added/updated a port: Have you run
./vcpkg x-add-version --all
and committed the result?Yes
If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/