Re: gp_cairo.c patch for win32

[Ethan M. <merritt@u.washington.edu>]

On Thursday 05 November 2009 11:39:19 Allin Cottrell wrote:
> Ah, in the pango docs it says that this is new since pango
> version 1.22.  Maybe conditionalize the relevant line as:
> 
> #if PANGO_VERSION_MAJOR == 1 && PANGO_VERSION_MINOR < 22
>   context = pango_cairo_font_map_create_context(fontmap);
> #else
>   context = pango_font_map_create_context(fontmap);
> #endif
>
> (The first formulation above is now "deprecated".)

Nope. Doesn't help:

p_cairo.o: In function `gp_cairo_create_layout':
/home/merritt/cvs/gnuplot-cvs/src/wxterminal/gp_cairo.c:708: undefined reference to `pango_font_map_create_context'
collect2: ld returned 1 exit status
make[1]: *** [gnuplot] Error 1
make[1]: Leaving directory `/home/merritt/cvs/gnuplot-cvs/src'
make: *** [all-recursive] Error 1

I think it's not picking up the right header, so it doesn't have values
for PANGO_VERSION_* at all.

How about if we turn that around, and see if this works for you

 #if PANGO_VERSION_MAJOR > 1 || PANGO_VERSION_MINOR >= 22
   context = pango_font_map_create_context(fontmap);
 #else
   context = pango_cairo_font_map_create_context(fontmap);
 #endif



-- 
Ethan A Merritt
Biomolecular Structure Center
University of Washington, Seattle 98195-7742