[cairo] OS/2 build break fix

[Peter Weilbacher]

I would be grateful if someone could apply the attached patch to the
head and the 1.6 branch so that OS/2 can build again.

Cheers,
   Peter.

P.S.: Sorry, I should really have noticed this long ago, but I didn't
have time to build standalone cairo in the last month and only now
noticed this when Mozilla upgraded cairo.

P.P.S.: I am also trying to get back access to my FreeDesktop account
but that didn't work as fast as I had hoped. Otherwise I would have
pushed that myself...
-------------- next part --------------
diff --git a/gfx/cairo/cairo/src/cairo-os2-surface.c b/gfx/cairo/cairo/src/cairo-os2-surface.c
--- a/gfx/cairo/cairo/src/cairo-os2-surface.c
+++ b/gfx/cairo/cairo/src/cairo-os2-surface.c
@@ -132,17 +132,17 @@ cairo_os2_fini (void)
     if (cairo_os2_initialization_count <= 0) return;
     cairo_os2_initialization_count--;
     if (cairo_os2_initialization_count > 0) return;
 
     DisableFPUException ();
 
     /* Free allocated memories! */
     /* (Check cairo_debug_reset_static_data () for an example of this!) */
-    _cairo_font_reset_static_data ();
+    _cairo_font_face_reset_static_data ();
 #if CAIRO_HAS_FT_FONT
     _cairo_ft_font_reset_static_data ();
 #endif
 
     CAIRO_MUTEX_FINALIZE ();
 
 #if CAIRO_HAS_FT_FONT
 # if HAVE_FCFINI