more cairo fixes
Merge branch 'windows' of https://github.com/BergWerkGIS/mapnik-dependencies into windows