rebase local patchset on top of fontconfig 2.11.0-6