summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-03-11 20:10:02 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-03-11 20:10:02 +0000
commit806724a6e8cdae52c1bd5c7dbf18d4faea4ab9c7 (patch)
tree60ff1dab326eb1a5f76550b1ffe8dde7b2a513ca /x11-libs/libXft
parentAdd ~mips keyword, unbundled in newer ghostscript-gpl wrt #401853 (diff)
downloadhistorical-806724a6e8cdae52c1bd5c7dbf18d4faea4ab9c7.tar.gz
historical-806724a6e8cdae52c1bd5c7dbf18d4faea4ab9c7.tar.bz2
historical-806724a6e8cdae52c1bd5c7dbf18d4faea4ab9c7.zip
Add patch to fix bold fonts, bug #407751.
Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/libXft')
-rw-r--r--x11-libs/libXft/ChangeLog8
-rw-r--r--x11-libs/libXft/Manifest4
-rw-r--r--x11-libs/libXft/files/libXft-2.3.0-bold-fonts.patch43
-rw-r--r--x11-libs/libXft/libXft-2.3.0-r1.ebuild24
4 files changed, 77 insertions, 2 deletions
diff --git a/x11-libs/libXft/ChangeLog b/x11-libs/libXft/ChangeLog
index 83e488d93f2e..7ef4283dc0df 100644
--- a/x11-libs/libXft/ChangeLog
+++ b/x11-libs/libXft/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/libXft
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/ChangeLog,v 1.76 2012/03/08 23:58:55 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/ChangeLog,v 1.77 2012/03/11 20:10:02 chithanh Exp $
+
+*libXft-2.3.0-r1 (11 Mar 2012)
+
+ 11 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ +files/libXft-2.3.0-bold-fonts.patch, +libXft-2.3.0-r1.ebuild:
+ Add patch to fix bold fonts, bug #407751.
*libXft-2.3.0 (08 Mar 2012)
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 57c740000492..d5046124ead4 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,6 +1,8 @@
+AUX libXft-2.3.0-bold-fonts.patch 1212 RMD160 ffc48267d7d60b6a5964a7129ad3ea273b4ca4e1 SHA1 a87a56f62905bfcd85469caf349d07f37f84a989 SHA256 1e22da1702fd7bd0d94c7e3b77a563020beb3943571b0278eaba88a9338c2940
DIST libXft-2.2.0.tar.bz2 290451 RMD160 e2955cfd5c8d2e02d4dba5f01b5132634005f971 SHA1 ed29784259f4e26df78141035560ae8a7c62e83f SHA256 c8685ae56da0c1dcc2bc1e34607e7d76ae98b86a1a71baba3a6b76dbcf5ff9b2
DIST libXft-2.3.0.tar.bz2 325561 RMD160 4941af3b2c5bcc06baf5246a1d6249e01087a7be SHA1 687f38a810b9ae58e1169c295d9d438370235e23 SHA256 3426393ad72a5c47006536d474e396c7a21c33131bb28f495578e05a5858b044
EBUILD libXft-2.2.0.ebuild 708 RMD160 7c80ddf90568fca80f7de3c3df6d4c5d3d839335 SHA1 0101509b3b7c7703b06958be78405d475610d772 SHA256 d043138baf772bf2d3657653755e23ff68feb2464de04cb68e9086a63125cb78
+EBUILD libXft-2.3.0-r1.ebuild 769 RMD160 8693d4a2584be8b7fa7dc87f0fa05401810667e6 SHA1 a0d2359f4e8b69f3301152a2456fa2023f5172c4 SHA256 35247e4ce01a782876d8bde15f2bb2b394fc9d6780b545567869a241a47abb3e
EBUILD libXft-2.3.0.ebuild 716 RMD160 80761374a62fcb7a2c7064cdd38023ce57769c8e SHA1 e082ca0e21f99524a9b388517e3283f2cb27daec SHA256 55aa22b3287c4749f1ef9c64afc8558b3c455f3fa601b336d89baa6b003265e2
-MISC ChangeLog 8719 RMD160 f2ef491fc21fbd1dd8f560253cdcfaccf46d8f73 SHA1 9347bdcf0ebc6f71878e52a5e39ff36292efac91 SHA256 147fb85a3e12d471c9788ce100ba749e789b0454145a82897f7ca7bab4d40a07
+MISC ChangeLog 8930 RMD160 e828dd99d7c218c3efa8f24ea1ae5eb46e8e63f0 SHA1 4a0003f881620e5a7c70bba17df5ed71c4e0407d SHA256 16e4c408c9cefe7debb1bc1495b122dc7349d15aa5cdc8b43e2350e27128c300
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libXft/files/libXft-2.3.0-bold-fonts.patch b/x11-libs/libXft/files/libXft-2.3.0-bold-fonts.patch
new file mode 100644
index 000000000000..3a715527169d
--- /dev/null
+++ b/x11-libs/libXft/files/libXft-2.3.0-bold-fonts.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/x11-libs/libXft/libXft-2.3.0-r1.ebuild b/x11-libs/libXft/libXft-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..b9bccb5d1c7f
--- /dev/null
+++ b/x11-libs/libXft/libXft-2.3.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.3.0-r1.ebuild,v 1.1 2012/03/11 20:10:02 chithanh Exp $
+
+EAPI=4
+inherit xorg-2 flag-o-matic
+
+DESCRIPTION="X.Org Xft library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libXrender-0.8.2
+ x11-libs/libX11
+ x11-libs/libXext
+ media-libs/freetype
+ media-libs/fontconfig
+ x11-proto/xproto
+ virtual/ttf-fonts"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-bold-fonts.patch
+)