The attached patch allows --with-cairo build to compile again.