Update freetype to 2.6
Fixes a font crash
BUG=chromium:524296
TEST=on lumpy: go to http://www.academyart.edu and see no crash
Change-Id: If1f43dc1085a1cd4e10f80299aba9acdcc8024f1
(cherry picked from commit 87673509c5e00f9ecc2b34e16879565c2f874bab)
Reviewed-on: https://chromium-review.googlesource.com/299795
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Commit-Queue: Stéphane Marchesin <marcheu@chromium.org>
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index a1eaf5b..f8b5489 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,4 +1 @@
-DIST freetype-2.5.5-infinality-patches.tar.xz 24380 SHA256 6b7bc373b068c71feca2e19c3741993ee0ff787984aa0653ca66814e05ef195f SHA512 8831e3337214cc57a0381c56ef6750f85b11f1b6358adaa3dda34d449f234335bede124be9d23df817ae8c06f80c8e3ce63ed3fc32eb05586b8c8e43ce52e575 WHIRLPOOL 27b945e9524e984ef57f96415a86095d91dea8fa8e402a3eb6a3d7c38a7636d53d5e47fc37b734ca88f41a499f3398ab9d7bd147e1424c19b09f41e17f2cbe8d
-DIST freetype-2.5.5.tar.bz2 1714529 SHA256 387bcc4b780b12484aa2ec9f7db1a55d8286eb5639f45fbc0fbba7a4e5a1afb9 SHA512 1fc72d24da1744a6a5faf3338e49912c81ce83f30def1e80a2a15b50e7f83893a4fe24a70ef88b65ecc217bed1c15d85804c364eba221b35e25531c727fe8559 WHIRLPOOL 57cf0f020cda6a66cfe8e2a30e1e997c0fd7f97bdaed38da65cce0b360fcc60cfdf1ba0724c1745668ae3f80743052e135edb8356dff4c90365caa6262d59158
-DIST freetype-doc-2.5.5.tar.bz2 108133 SHA256 68becbae3578a8101e9f3c55f10e435fb75535011d3f7a523719371e86e368e7 SHA512 0e2455433f72766ec88275d2e53e49630457579a83ca491697bb5ce12196ee964618d1af86956651557d34e8ea1d57f75f69e0d60ef90e943509bc571370fb64 WHIRLPOOL 28d13ae3ce9bc3fb278df9a963cef3622672fa288fc0fd654e874054bedccd8510a3dcf7636ea2ec107b5299984742607d2a9436d5e473202856e27bf262655f
-DIST ft2demos-2.5.5.tar.bz2 182006 SHA256 b87c7deb5d9b1fddb8520c091a5491cc63ecac4de25139e1da38aebee82195ea SHA512 c6e1855f2315665e39a894ecfcb65f8546de435c1dada0ea0a6665a1e3ef22331d6949cd9261dfb6b68e653631d4c2e74f8ea31b53b40e46f44ab4dae38e368b WHIRLPOOL 55d6add5e3fac008a39231e3805e151a5a9b7cafb6ef970e546d96d3fa338a6a4a744aeb59ea04804312164aedd5e5a21e19773dbf5c42a1acfc42d283d90930
+DIST freetype-2.6.tar.bz2 1726219 SHA256 8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e SHA512 0242c832dcac3d9dc5d434b7f5145e63f2289d5df32f16e1c7afc1e31c3c92f0dd374e20dfef79a9ecb26b14419f42b0d897c7154f249f629c35ee7af0aa5297 WHIRLPOOL bf7f105b74348a1ca0e95e21091670a5d73793e8aea8aa8e0dad515086885a182f3bced713c2cf76704c7814031f308a642d6db45a0c065627d0e7bdcaedffd6
diff --git a/media-libs/freetype/freetype-2.5.5-r1.ebuild b/media-libs/freetype/freetype-2.5.5-r1.ebuild
deleted file mode 120000
index 8aa5825..0000000
--- a/media-libs/freetype/freetype-2.5.5-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-freetype-2.5.5.ebuild
\ No newline at end of file
diff --git a/media-libs/freetype/freetype-2.5.5.ebuild b/media-libs/freetype/freetype-2.6.ebuild
similarity index 83%
rename from media-libs/freetype/freetype-2.5.5.ebuild
rename to media-libs/freetype/freetype-2.6.ebuild
index cf8e603..b985270 100644
--- a/media-libs/freetype/freetype-2.5.5.ebuild
+++ b/media-libs/freetype/freetype-2.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.5.ebuild,v 1.12 2015/02/27 06:19:31 yngwin Exp $
+# $Id$
EAPI=5
inherit autotools-multilib flag-o-matic multilib toolchain-funcs
@@ -13,14 +13,13 @@
mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )
- infinality? ( http://dev.gentoo.org/~polynomial-c/${P}-infinality-patches.tar.xz )"
+ infinality? ( https://dev.gentoo.org/~polynomial-c/${P}-infinality-patches.tar.xz )"
LICENSE="|| ( FTL GPL-2+ )"
SLOT="2"
KEYWORDS="*"
-IUSE="X +adobe-cff auto-hinter bindist bzip2 debug doc fontforge harfbuzz
+IUSE="X +adobe-cff bindist bzip2 debug doc fontforge harfbuzz
infinality png static-libs utils"
-REQUIRED_USE="harfbuzz? ( auto-hinter )"
RESTRICT="!bindist? ( bindist )" # bug 541408
CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
@@ -70,11 +69,6 @@
enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
fi
- if use auto-hinter; then
- disable_option TT_CONFIG_OPTION_BYTECODE_INTERPRETER
- enable_option TT_CONFIG_OPTION_UNPATENTED_HINTING
- fi
-
if ! use adobe-cff; then
enable_option CFF_CONFIG_OPTION_OLD_ENGINE
fi
@@ -153,7 +147,7 @@
# Probably fontforge needs less but this way makes things simplier...
einfo "Installing internal headers required for fontforge"
local header
- find src/truetype include/freetype/internal -name '*.h' | \
+ find src/truetype include/internal -name '*.h' | \
while read header; do
mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
@@ -165,12 +159,3 @@
prune_libtool_files --all
}
-
-pkg_postinst() {
- if use auto-hinter && ! use harfbuzz; then
- elog "To improve OpenType font hinting with the auto-hinter, the harfbuzz"
- elog "useflag needs to be enabled for ${CATEGORY}/${PN}."
- elog "See the INSTALL.UNIX file in the doc directory of this package for"
- elog "more information. But it is recommended not to use the auto-hinter."
- fi
-}
