[cairo] Making pixman a detail

[Dave Beckett]

You seem to have snuck in an actual code change beyond the merge:

(snip)

diff -u -p -r1.9 pixregion.c
--- pixman/src/pixregion.c      16 Apr 2004 15:32:53 -0000      1.9
+++ pixman/src/pixregion.c      9 Aug 2005 22:27:30 -0000
@@ -1156,7 +1156,7 @@ pixman_region_union_rect(pixman_region16
     pixman_region16_t region;

     if (!width || !height)
-       return PIXMAN_REGION_STATUS_FAILURE;
+       return PIXMAN_REGION_STATUS_SUCCESS;
     region.data = NULL;
     region.extents.x1 = x;
     region.extents.y1 = y;


Maybe that should have a separate commit?

Dave