modified patch for fontconfig to work with current master