From 88fecc52b142b4f2efc104b3224093dbf354e6fa Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 4 Jun 2012 08:47:19 +1000
Subject: [PATCH] libXft 2.3.1

---
 .gitignore                  |  1 +
 libXft-2.3.0-bold-fix.patch | 43 -------------------------------------
 libXft.spec                 | 10 ++++-----
 sources                     |  2 +-
 4 files changed, 7 insertions(+), 49 deletions(-)
 delete mode 100644 libXft-2.3.0-bold-fix.patch

diff --git a/.gitignore b/.gitignore
index 69e724d..6b4db05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libXft-2.1.14.tar.bz2
 /libXft-2.2.0.tar.bz2
+/libXft-2.3.1.tar.bz2
diff --git a/libXft-2.3.0-bold-fix.patch b/libXft-2.3.0-bold-fix.patch
deleted file mode 100644
index 3a71552..0000000
--- a/libXft-2.3.0-bold-fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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 51cd4ae..9b34fda 100644
--- a/libXft.spec
+++ b/libXft.spec
@@ -1,15 +1,13 @@
 Summary: X.Org X11 libXft runtime library
 Name: libXft
-Version: 2.3.0
-Release: 2%{?dist}
+Version: 2.3.1
+Release: 1%{?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
@@ -29,7 +27,6 @@ X.Org X11 libXft development package
 
 %prep
 %setup -q
-%patch0 -p1 -b .bold
 
 %build
 
@@ -73,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Xft.3*
 
 %changelog
+* Mon Jun 04 2012 Peter Hutterer <peter.hutterer@redhat.com> 2.3.1-1
+- libXft 2.3.1
+
 * Mon Mar 12 2012 Adam Jackson <ajax@redhat.com> 2.3.0-2
 - libXft-2.3.0-bold-fix.patch: Fix bold fonts.
 
diff --git a/sources b/sources
index 7d3a3fa..3152182 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cce3c327258116493b753f157e0360c7  libXft-2.2.0.tar.bz2
+78d64dece560c9e8699199f3faa521c0  libXft-2.3.1.tar.bz2