From 8a86cea99876b66ec41374a360fbfd75bb9f609c Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@cvs.openbsd.org>
Date: Sun, 18 Mar 2012 11:15:40 +0000
Subject: Merge patch from git master: Fixup for 550b2f76401c2 which broke bold
 fonts

---
 lib/libXft/src/xftglyphs.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/libXft/src/xftglyphs.c b/lib/libXft/src/xftglyphs.c
index 4a3b9d606..2f3dc5a6b 100644
--- a/lib/libXft/src/xftglyphs.c
+++ b/lib/libXft/src/xftglyphs.c
@@ -24,9 +24,7 @@
 #include <freetype/ftoutln.h>
 #include <freetype/ftlcdfil.h>
 
-#if HAVE_FT_GLYPHSLOT_EMBOLDEN
 #include <freetype/ftsynth.h>
-#endif
 
 /*
  * Validate the memory info for a font
@@ -434,12 +432,10 @@ XftFontLoadGlyphs (Display	    *dpy,
 
 	glyphslot = face->glyph;
 
-#if HAVE_FT_GLYPHSLOT_EMBOLDEN
 	/*
 	 * Embolden if required
 	 */
 	if (font->info.embolden) FT_GlyphSlot_Embolden(glyphslot);
-#endif
 
 	/*
 	 * Compute glyph metrics from FreeType information
-- 
cgit v1.2.3