[cairo] cairo 0.1.22 won't build with glitz 0.1.1

[Dave Beckett]

In looking at packaging cairo 0.1.22 for debian:

compile:

...
cc -DHAVE_CONFIG_H -I. -I. -I.. -I. -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/include/libpng12 -g -Wall -O2 -MT cairo_gl_surface.lo -MD -MP -MF .deps/cairo_gl_surface.Tpo -c cairo_gl_surface.c  -fPIC -DPIC -o .libs/cairo_gl_surface.o
cairo_gl_surface.c: In function `_cairo_gl_surface_create_pattern':
cairo_gl_surface.c:680: error: `glitz_distance_fixed_t' undeclared (first use in this function)
cairo_gl_surface.c:680: error: (Each undeclared identifier is reported only oncecairo_gl_surface.c:680: error: for each function it appears in.)
cairo_gl_surface.c:680: error: parse error before "radius"
cairo_gl_surface.c:686: error: `radius' undeclared (first use in this function)
cairo_gl_surface.c:692: warning: passing arg 3 of `glitz_surface_create_radial' makes integer from pointer without a cast
cairo_gl_surface.c:692: error: too few arguments to function `glitz_surface_create_radial'


glitz changelog:
	* src/glitz.h: Removed glitz_distance_fixed_t. Updated linear
	and radial surfaces.

...


Other quick things I noticed the packaging todo list:
* sort out the automake/conf version mess
* patches for using conditional sources breaking 'make dist'

and since it's 01:14 local here, I'm not looking further tonight.

Dave