From 05a793f5b3c40747d5a92a076def7f4fb673c7e7 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 1 Sep 2015 18:50:55 -0700
Subject: dix: Switch to the libXfont2 API (v2)

This new libXfont API eliminates exposing internal X server symbols to
the font library, replacing those with a struct full of the entire API
needed to use that library.

v2: Use libXfont2 instead of libXfont_2

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
---
 miext/damage/damage.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'miext')

diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index ce1cd3247..17c2abfff 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -32,7 +32,7 @@
 #include    <X11/fonts/font.h>
 #include    "dixfontstr.h"
 #include    <X11/fonts/fontstruct.h>
-#include    <X11/fonts/fontutil.h>
+#include    <X11/fonts/libxfont2.h>
 #include    "mi.h"
 #include    "regionstr.h"
 #include    "globals.h"
@@ -1249,7 +1249,7 @@ damageDamageChars(DrawablePtr pDrawable,
     ExtentInfoRec extents;
     BoxRec box;
 
-    QueryGlyphExtents(font, charinfo, n, &extents);
+    xfont2_query_glyph_extents(font, charinfo, n, &extents);
     if (imageblt) {
         if (extents.overallWidth > extents.overallRight)
             extents.overallRight = extents.overallWidth;
-- 
cgit v1.2.3