Whoops, seems I blundered and didn't see there was not one, but two different
patch files.

The compilation succeeds now, will proceed to testing it.