From 726da86456a5bd8b5a24761079fb96c286e569d7 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 12 Mar 2012 11:15:24 -0400
Subject: [PATCH] libXft-2.3.0-bold-fix.patch: Fix bold fonts.

---
 libXft-2.3.0-bold-fix.patch | 43 +++++++++++++++++++++++++++++++++++++
 libXft.spec                 |  8 ++++++-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 libXft-2.3.0-bold-fix.patch

diff --git a/libXft-2.3.0-bold-fix.patch b/libXft-2.3.0-bold-fix.patch
new file mode 100644
index 0000000..3a71552
--- /dev/null
+++ b/libXft-2.3.0-bold-fix.patch
@@ -0,0 +1,43 @@
+From 84b8b5b46773f9b686d57f28092824b86bffed9d Mon Sep 17 00:00:00 2001
+From: Mikael Magnusson <mikachu@gmail.com>
+Date: Sun, 11 Mar 2012 01:41:55 +0000
+Subject: Fixup for 550b2f76401c2 which broke bold fonts
+
+The commit removed the line
+AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_GlyphSlot_Embolden)
+but failed to remove the #if lines that this commit removes, resulting
+in that code never being executed.
+
+Fixes: https://bugs.freedesktop.org/attachment.cgi?id=58280
+
+Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+diff --git a/src/xftglyphs.c b/src/xftglyphs.c
+index 4a3b9d6..2f3dc5a 100644
+--- a/src/xftglyphs.c
++++ b/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 v0.9.0.2-2-gbebe
diff --git a/libXft.spec b/libXft.spec
index bff782b..51cd4ae 100644
--- a/libXft.spec
+++ b/libXft.spec
@@ -1,13 +1,15 @@
 Summary: X.Org X11 libXft runtime library
 Name: libXft
 Version: 2.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
+Patch0: libXft-2.3.0-bold-fix.patch
+
 BuildRequires: pkgconfig(xrender)
 BuildRequires: freetype-devel >= 2.1.9-2
 BuildRequires: fontconfig-devel >= 2.2-1
@@ -27,6 +29,7 @@ X.Org X11 libXft development package
 
 %prep
 %setup -q
+%patch0 -p1 -b .bold
 
 %build
 
@@ -70,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Xft.3*
 
 %changelog
+* Mon Mar 12 2012 Adam Jackson <ajax@redhat.com> 2.3.0-2
+- libXft-2.3.0-bold-fix.patch: Fix bold fonts.
+
 * Thu Mar 08 2012 Adam Jackson <ajax@redhat.com> 2.3.0-1
 - libXft 2.3.0