Build tweaks for Cairo on OSX

Some patches for building the cairo wrapper on OSX