From 01a0c4bc740842efa3bf1a7e1d6c8be5656e4e2a Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 14 Mar 2012 00:01:30 +0000
Subject: Wed Mar 14 00:01:29 UTC 2012

---
 extra/libxft/PKGBUILD       | 12 ++++++++----
 extra/libxft/git_fixes.diff | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 extra/libxft/git_fixes.diff

(limited to 'extra/libxft')

diff --git a/extra/libxft/PKGBUILD b/extra/libxft/PKGBUILD
index 709f6b6e9..e15cb95bc 100644
--- a/extra/libxft/PKGBUILD
+++ b/extra/libxft/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 152776 2012-03-09 16:13:37Z andyrtr $
+# $Id: PKGBUILD 153277 2012-03-12 20:25:11Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxft
 pkgver=2.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="FreeType-based font drawing library for X"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -11,11 +11,15 @@ url="http://xorg.freedesktop.org/"
 depends=('fontconfig' 'libxrender')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2")
-sha1sums=('687f38a810b9ae58e1169c295d9d438370235e23')
+source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2"
+        git_fixes.diff)
+sha1sums=('687f38a810b9ae58e1169c295d9d438370235e23'
+          'a87a56f62905bfcd85469caf349d07f37f84a989')
 
 build() {
   cd "${srcdir}/libXft-${pkgver}"
+  # fix broken bold fonts in urxvt terinals - https://bugs.freedesktop.org/show_bug.cgi?id=47178 + https://bugs.freedesktop.org/show_bug.cgi?id=47196
+  patch -Np1 -i ${srcdir}/git_fixes.diff
   ./configure --prefix=/usr --sysconfdir=/etc --disable-static
   make
 }
diff --git a/extra/libxft/git_fixes.diff b/extra/libxft/git_fixes.diff
new file mode 100644
index 000000000..3a7155271
--- /dev/null
+++ b/extra/libxft/git_fixes.diff
@@ -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
-- 
cgit v1.2.3-54-g00ecf