Revert "fix cairo dep"

This reverts commit b10f03fc0dcfde0af7a7ad3bd14743925eb46bd6.
Revert "Revert "fix cairo dep""

This reverts commit acb6476611644cf175d9e6ae52ceb1f672c45a9e.
Revert "Revert "Revert "fix cairo dep"""

This reverts commit a907f06a8b4b1dc24eaf3907a54b6595930c7bbd.
cleanup?