It's not enough to just patch the .hg files as the build system doesn't
regenerate the .h files automatically. -Dmaintainer-mode=true comes with
its own pitfalls (see the revert in the previous commit), so this commit
just patches the .h files to match the .hg changes from upstream patch.
https://bugzilla.redhat.com/show_bug.cgi?id=1947838Resolves: #1951127
(cherry picked from Fedora commit b98cb6c4aac0d400d415315241390551644e18da)