pull in commit 67f9b6e3c5d2397446d39ab454f691c1ee46d2c0 from upstream for freetype2 fix for wine