Log Message:
Fix pkg-config usage.

This applies two commits from upstream. Reported by Bastian Germann in
PR pkg/53603, thanks!

(Build untested, as one of the dependencies did not build for me. But
"make patch" works.)