From: Tobias Oetiker <tobi@oetiker.ch>
Date: Thu, 16 Oct 2014 14:41:07 +0000 (+0200)
Subject: do not require pango_font_map_create_context since pango_cairo_font_map_create_contex... 
X-Git-Tag: v1.5.0-rc1~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09131bd416b460db54c2cbec10cda521d1ac376b;p=thirdparty%2Frrdtool-1.x.git

do not require pango_font_map_create_context since pango_cairo_font_map_create_context works as well and EL5 is happy
---

diff --git a/configure.ac b/configure.ac
index ceb9cb4a..653b8d6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -563,7 +563,7 @@ EX_CHECK_ALL(cairo,      cairo_font_options_create,     cairo.h,
 dnl EX_CHECK_ALL(cairo,      cairo_svg_surface_create,      cairo-svg.h,            cairo-svg,   1.10.2,  http://cairographics.org/releases/, "")
 dnl EX_CHECK_ALL(cairo,      cairo_pdf_surface_create,      cairo-pdf.h,            cairo-pdf,   1.10.2,  http://cairographics.org/releases/, "")
 dnl EX_CHECK_ALL(cairo,      cairo_ps_surface_create,       cairo-ps.h,             cairo-ps,    1.10.2,  http://cairographics.org/releases/, "")
-EX_CHECK_ALL(pangocairo-1.0,  pango_font_map_create_context,  pango/pango.h,  pangocairo,  1.28.4,    http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
+EX_CHECK_ALL(pangocairo-1.0,  pango_cairo_font_map_create_context,  pango/pango.h,  pangocairo,  1.28.4,    http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
 
 fi
 
diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 18091060..ea258e8d 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -4393,7 +4393,7 @@ void rrd_graph_init(
         fontmap = pango_cairo_font_map_get_default();
     }
 
-    context =  pango_font_map_create_context(fontmap);
+    context =  pango_cairo_font_map_create_context((PangoCairoFontMap*)fontmap);
 
     pango_cairo_context_set_resolution(context, 100);