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

[gdk-pixbuf]: fix pkgconfig tools path #26744

Merged
merged 3 commits into from
Sep 13, 2022

Conversation

theartful
Copy link
Contributor

@theartful theartful commented Sep 9, 2022

Describe the pull request

This PR changes pkgconfig path of tools from "${bindir}/../tools" to "${prefix}/tools". On Linux, when using vcpkg manifest mode, the vcpkg installed dir usually doesn't have a bin directory. This leads to No such file or directory errors when using these variables, even though the full path exists.

Also, gdk_pixbuf_binarydir was set correctly in the first place and was incorrectly changed.

@ghost
Copy link

ghost commented Sep 9, 2022

CLA assistant check
All CLA requirements met.

@JackBoosY JackBoosY added the category:port-bug The issue is with a library, which is something the port should already support label Sep 13, 2022
Copy link
Contributor

@JackBoosY JackBoosY left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.
The origin content in gdk-pixbuf-2.0.pc is :

prefix=F:/vcpkg/packages/gdk-pixbuf_x86-windows/debug
libdir=${prefix}/lib
includedir=${prefix}/../include

bindir=${prefix}/bin
gdk_pixbuf_binary_version=2.10.0
gdk_pixbuf_binarydir=${libdir}/gdk-pixbuf-2.0/2.10.0
gdk_pixbuf_moduledir=${gdk_pixbuf_binarydir}/loaders
gdk_pixbuf_cache_file=${gdk_pixbuf_binarydir}/loaders.cache
gdk_pixbuf_csource=${bindir}/gdk-pixbuf-csource
gdk_pixbuf_pixdata=${bindir}/gdk-pixbuf-pixdata
gdk_pixbuf_query_loaders=${bindir}/gdk-pixbuf-query-loaders

Name: GdkPixbuf
Description: Image loading and scaling
Version: 2.42.9
Requires: gobject-2.0 >=  2.56.0
Requires.private: glib-2.0 >=  2.56.0, gmodule-no-export-2.0 >=  2.56.0, gio-2.0 >=  2.56.0
Libs: -L${libdir} -lgdk_pixbuf-2.0
Libs.private: -lintl F:/vcpkg/installed/x86-windows/debug/lib/libpng16d.lib F:/vcpkg/installed/x86-windows/debug/lib/zlibd.lib F:/vcpkg/installed/x86-windows/debug/lib/jpeg.lib F:/vcpkg/installed/x86-windows/debug/lib/tiffd.lib F:/vcpkg/installed/x86-windows/debug/lib/libpng16d.lib F:/vcpkg/installed/x86-windows/debug/lib/zlibd.lib F:/vcpkg/installed/x86-windows/debug/lib/jpeg.lib F:/vcpkg/installed/x86-windows/debug/lib/tiffd.lib F:/vcpkg/installed/x86-windows/debug/lib/libpng16d.lib F:/vcpkg/installed/x86-windows/debug/lib/zlibd.lib F:/vcpkg/installed/x86-windows/debug/lib/jpeg.lib F:/vcpkg/installed/x86-windows/debug/lib/tiffd.lib F:/vcpkg/installed/x86-windows/debug/lib/libpng16d.lib F:/vcpkg/installed/x86-windows/debug/lib/zlibd.lib F:/vcpkg/installed/x86-windows/debug/lib/jpeg.lib F:/vcpkg/installed/x86-windows/debug/lib/tiffd.lib F:/vcpkg/installed/x86-windows/debug/lib/libpng16d.lib F:/vcpkg/installed/x86-windows/debug/lib/zlibd.lib F:/vcpkg/installed/x86-windows/debug/lib/jpeg.lib F:/vcpkg/installed/x86-windows/debug/lib/tiffd.lib F:/vcpkg/installed/x86-windows/debug/lib/libpng16d.lib F:/vcpkg/installed/x86-windows/debug/lib/zlibd.lib F:/vcpkg/installed/x86-windows/debug/lib/jpeg.lib F:/vcpkg/installed/x86-windows/debug/lib/tiffd.lib F:/vcpkg/installed/x86-windows/debug/lib/libpng16d.lib F:/vcpkg/installed/x86-windows/debug/lib/zlibd.lib F:/vcpkg/installed/x86-windows/debug/lib/jpeg.lib F:/vcpkg/installed/x86-windows/debug/lib/tiffd.lib F:/vcpkg/installed/x86-windows/debug/lib/libpng16d.lib F:/vcpkg/installed/x86-windows/debug/lib/zlibd.lib F:/vcpkg/installed/x86-windows/debug/lib/jpeg.lib F:/vcpkg/installed/x86-windows/debug/lib/tiffd.lib F:/vcpkg/installed/x86-windows/debug/lib/libpng16d.lib F:/vcpkg/installed/x86-windows/debug/lib/zlibd.lib F:/vcpkg/installed/x86-windows/debug/lib/jpeg.lib F:/vcpkg/installed/x86-windows/debug/lib/tiffd.lib F:/vcpkg/installed/x86-windows/debug/lib/libpng16d.lib F:/vcpkg/installed/x86-windows/debug/lib/zlibd.lib F:/vcpkg/installed/x86-windows/debug/lib/jpeg.lib F:/vcpkg/installed/x86-windows/debug/lib/tiffd.lib F:/vcpkg/installed/x86-windows/debug/lib/libpng16d.lib F:/vcpkg/installed/x86-windows/debug/lib/zlibd.lib F:/vcpkg/installed/x86-windows/debug/lib/jpeg.lib F:/vcpkg/installed/x86-windows/debug/lib/tiffd.lib F:/vcpkg/installed/x86-windows/debug/lib/libpng16d.lib F:/vcpkg/installed/x86-windows/debug/lib/zlibd.lib F:/vcpkg/installed/x86-windows/debug/lib/jpeg.lib F:/vcpkg/installed/x86-windows/debug/lib/tiffd.lib F:/vcpkg/installed/x86-windows/debug/lib/libpng16d.lib F:/vcpkg/installed/x86-windows/debug/lib/zlibd.lib F:/vcpkg/installed/x86-windows/debug/lib/jpeg.lib F:/vcpkg/installed/x86-windows/debug/lib/tiffd.lib
Cflags: -I${includedir}/gdk-pixbuf-2.0

@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Sep 13, 2022
@vicroms vicroms merged commit 24b59b9 into microsoft:master Sep 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants