Update the internal patches to work now that the Mac OS X functionality has been merged upstream via <http://bazaar.launchpad.net/~kicad-testing-committers/kicad/testing/revision/4562> and potentially <http://bazaar.launchpad.net/~kicad-testing-committers/kicad/testing/revision/4568>.
Remove some whitespace added by the patch generation method suggested by homebrew.
Add Cairo dependency which is now required for building.
Merge pull request #20 from follower/fix-cairo-dependency

Fix Cairo dependency