update cairo

wrongly moves to trunk some things of the spur work, but shouldn't be a problem