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

[glib] Bump to 2.75.3 #29644

Merged
merged 4 commits into from
Feb 15, 2023
Merged

Conversation

FtZPetruska
Copy link
Contributor

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

This PR also fixes an issue when consuming glib in CMake using pkg_check_modules where libintl is not properly detected and thus breaking static linking.

Instead of containing -lintl, the pc files would contain:

  • "${prefix}/debug/lib/libintl.a" in static release
  • "${prefix}/lib/libintl.a" in static debug
  • in dynamic builds, these would appear twice once with and once without quotation marks

For now the fix in 1f11c33 solves this issue, but any feedback to improve it would be greatly appreciated!

It was tested on:

  • x64-windows
  • x64-windows-static
  • arm64-osx
  • arm64-osx-release
  • x64-linux

When consuming glib in CMake through `pkg_check_modules`, libintl
(provided by `gettext`) needs to specified in the pc file as `-lintl`
without any quotation. Otherwise it is not picked up as a dependency
and static linking fails.

Also `vcpkg_fixup_pkgconfig` needs to be called before editing pc files.
@dg0yt
Copy link
Contributor

dg0yt commented Feb 14, 2023

The pc file issue with cmake is 6 years old: https://gitlab.kitware.com/cmake/cmake/-/issues/16154.
I guess we need to help fix it in CMake. AFAIU it is already solved for the imported target.

@Cheney-W Cheney-W added the category:port-update The issue is with a library, which is requesting update new revision label Feb 14, 2023
@Cheney-W Cheney-W added the info:reviewed Pull Request changes follow basic guidelines label Feb 15, 2023
@JavierMatosD JavierMatosD merged commit f468f46 into microsoft:master Feb 15, 2023
@FtZPetruska FtZPetruska deleted the bump-glib-2.75.3 branch February 15, 2023 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants