Comment 3 for bug 1834767

OK, I've tried that fix and it does now build, but haven't used the build in anger.
Doc build problems did occur...seems to be a regular issue with Fedora, so had to switch off building of any docs.
I haven't looked at why the docs are an issue, beyond my ken.
I have attached a patch for others to test further.

Cheers,
Terry