updated cairo patch