diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2013-01-25 17:57:45 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2013-01-25 17:57:45 +0000 |
| commit | df0fac1a9bd203312fd65fc427422c0309ff8a65 (patch) | |
| tree | d55283b18544945767bda978a014a127f95c9ae5 /media-libs/freetype | |
| parent | Version bump; remove old version. (diff) | |
| download | gentoo-2-df0fac1a9bd203312fd65fc427422c0309ff8a65.tar.gz gentoo-2-df0fac1a9bd203312fd65fc427422c0309ff8a65.tar.bz2 gentoo-2-df0fac1a9bd203312fd65fc427422c0309ff8a65.zip | |
Fixed compilation with auto-hinter USE flag being enabled (bug #453956)
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'media-libs/freetype')
| -rw-r--r-- | media-libs/freetype/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/freetype/files/freetype-2.4.11-auto-hinter_compile_fix.patch | 53 | ||||
| -rw-r--r-- | media-libs/freetype/freetype-2.4.11.ebuild | 4 |
3 files changed, 62 insertions, 2 deletions
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index 3260da4d719e..53291e832b1e 100644 --- a/media-libs/freetype/ChangeLog +++ b/media-libs/freetype/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/freetype # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.351 2013/01/25 12:23:18 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.352 2013/01/25 17:57:44 polynomial-c Exp $ + + 25 Jan 2013; Lars Wendler <polynomial-c@gentoo.org> freetype-2.4.11.ebuild, + +files/freetype-2.4.11-auto-hinter_compile_fix.patch: + Non-maintainer commit: Fixed compilation with auto-hinter USE flag being + enabled. Thanks to Denis I. Polukarov for reporting this in bug #453956. 25 Jan 2013; Lars Wendler <polynomial-c@gentoo.org> freetype-2.4.11.ebuild: Non-maintainer commit: Replaced one useless enable_option line with a diff --git a/media-libs/freetype/files/freetype-2.4.11-auto-hinter_compile_fix.patch b/media-libs/freetype/files/freetype-2.4.11-auto-hinter_compile_fix.patch new file mode 100644 index 000000000000..e7e69ce50572 --- /dev/null +++ b/media-libs/freetype/files/freetype-2.4.11-auto-hinter_compile_fix.patch @@ -0,0 +1,53 @@ +From f41ee05475695e301ad282bb63b76658f9589b9b Mon Sep 17 00:00:00 2001 +From: Werner Lemberg <wl@gnu.org> +Date: Fri, 25 Jan 2013 16:41:24 +0100 +Subject: [PATCH] Fix Savannah bug #38167. + +This fixes commit 83c0ebab from 2012-06-27. + +* src/truetype/ttinterp.h: +s/TT_CONFIG_OPTION_BYTECODE_INTERPRETER/TT_USE_BYTECODE_INTERPRETER/. + +diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h +index 2aa45a3..6c65df4 100644 +--- a/src/truetype/ttinterp.h ++++ b/src/truetype/ttinterp.h +@@ -296,7 +296,7 @@ FT_BEGIN_HEADER + extern const TT_GraphicsState tt_default_graphics_state; + + +-#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER ++#ifdef TT_USE_BYTECODE_INTERPRETER + FT_LOCAL( FT_Error ) + TT_Goto_CodeRange( TT_ExecContext exec, + FT_Int range, +@@ -319,7 +319,7 @@ FT_BEGIN_HEADER + FT_Long multiplier, + void* _pbuff, + FT_ULong new_max ); +-#endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ ++#endif /* TT_USE_BYTECODE_INTERPRETER */ + + + /*************************************************************************/ +@@ -345,7 +345,7 @@ FT_BEGIN_HEADER + TT_New_Context( TT_Driver driver ); + + +-#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER ++#ifdef TT_USE_BYTECODE_INTERPRETER + FT_LOCAL( FT_Error ) + TT_Done_Context( TT_ExecContext exec ); + +@@ -361,7 +361,7 @@ FT_BEGIN_HEADER + FT_LOCAL( FT_Error ) + TT_Run_Context( TT_ExecContext exec, + FT_Bool debug ); +-#endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ ++#endif /* TT_USE_BYTECODE_INTERPRETER */ + + + /*************************************************************************/ +-- +1.8.1.1 + diff --git a/media-libs/freetype/freetype-2.4.11.ebuild b/media-libs/freetype/freetype-2.4.11.ebuild index ade766acafcd..c622465c0a13 100644 --- a/media-libs/freetype/freetype-2.4.11.ebuild +++ b/media-libs/freetype/freetype-2.4.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.11.ebuild,v 1.6 2013/01/25 12:23:18 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.11.ebuild,v 1.7 2013/01/25 17:57:44 polynomial-c Exp $ EAPI="4" @@ -68,6 +68,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch + epatch "${FILESDIR}"/${P}-auto-hinter_compile_fix.patch # 453956 + if use utils; then cd "${WORKDIR}/ft2demos-${PV}" sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" Makefile || die |