floppym 14/12/14 20:35:02 Modified: ChangeLog Added: freetype-2.5.4-r1.ebuild Removed: freetype-2.5.4.ebuild Log: Backport fixes for bug 532506. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path 1.411 media-libs/freetype/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?rev=1.411&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?rev=1.411&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?r1=1.410&r2=1.411 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v retrieving revision 1.410 retrieving revision 1.411 diff -u -r1.410 -r1.411 --- ChangeLog 14 Dec 2014 19:40:58 -0000 1.410 +++ ChangeLog 14 Dec 2014 20:35:02 -0000 1.411 @@ -1,6 +1,14 @@ # ChangeLog for media-libs/freetype # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.410 2014/12/14 19:40:58 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.411 2014/12/14 20:35:02 floppym Exp $ + +*freetype-2.5.4-r1 (14 Dec 2014) + + 14 Dec 2014; Mike Gilbert <[email protected]> + +files/2.5.4-0001-pcf-Fix-Savannah-bug-43774.patch, + +files/2.5.4-0002-src-pcf-pcfread.c-pcf_read_TOC-Improve-fix-from-2014.patch, + +freetype-2.5.4-r1.ebuild, -freetype-2.5.4.ebuild: + Backport fixes for bug 532506. 14 Dec 2014; Mike Gilbert <[email protected]> freetype-2.5.4.ebuild: Switch back to ${S} after sedding the ftdemos Makefile so that epatch_user 1.1 media-libs/freetype/freetype-2.5.4-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.5.4-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.5.4-r1.ebuild?rev=1.1&content-type=text/plain Index: freetype-2.5.4-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.4-r1.ebuild,v 1.1 2014/12/14 20:35:02 floppym Exp $ EAPI=5 inherit autotools-multilib flag-o-matic multilib toolchain-funcs DESCRIPTION="A high-quality and portable font engine" HOMEPAGE="http://www.freetype.org/"; SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 ) doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 ) infinality? ( http://dev.gentoo.org/~yngwin/distfiles/${P}-infinality-patches.tar.xz )" LICENSE="|| ( FTL GPL-2+ )" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="X +adobe-cff auto-hinter bindist bzip2 debug doc fontforge harfbuzz infinality png static-libs utils" REQUIRED_USE="harfbuzz? ( auto-hinter )" CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] ) png? ( >=media-libs/libpng-1.2.51[${MULTILIB_USEDEP}] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] ) )" DEPEND="${CDEPEND} virtual/pkgconfig" RDEPEND="${CDEPEND} abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )" PDEPEND="infinality? ( media-libs/fontconfig-infinality )" PATCHES=( "${FILESDIR}/2.5.4-0001-pcf-Fix-Savannah-bug-43774.patch" "${FILESDIR}/2.5.4-0002-src-pcf-pcfread.c-pcf_read_TOC-Improve-fix-from-2014.patch" ) src_prepare() { enable_option() { sed -i -e "/#define $1/a #define $1" \ include/config/ftoption.h \ || die "unable to enable option $1" } disable_option() { sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \ include/config/ftoption.h \ || die "unable to disable option $1" } # This is the same as the 01 patch from infinality epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch if use infinality; then EPATCH_SOURCE="${WORKDIR}/${P}-infinality-patches" EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" epatch # FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11 enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING fi if ! use bindist; then # See http://freetype.org/patents.html # ClearType is covered by several Microsoft patents in the US 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 if use debug; then enable_option FT_DEBUG_LEVEL_TRACE enable_option FT_DEBUG_MEMORY fi epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 if use utils; then cd "${WORKDIR}/ft2demos-${PV}" || die # Disable tests needing X11 when USE="-X". (bug #177597) if ! use X; then sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die fi cd "${S}" || die fi # we need non-/bin/sh to run configure if [[ -n ${CONFIG_SHELL} ]] ; then sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \ "${S}"/builds/unix/configure || die fi autotools-utils_src_prepare } multilib_src_configure() { append-flags -fno-strict-aliasing type -P gmake &> /dev/null && export GNUMAKE=gmake local myeconfargs=( --enable-biarch-config $(use_with bzip2) $(use_with harfbuzz) $(use_with png) # avoid using libpng-config LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" ) autotools-utils_src_configure } multilib_src_compile() { default if multilib_is_native_abi && use utils; then einfo "Building utils" # fix for Prefix, bug #339334 emake \ X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" fi } multilib_src_install() { default if multilib_is_native_abi && use utils; then einfo "Installing utils" rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die local ft2demo for ft2demo in ../ft2demos-${PV}/bin/*; do ./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \ "${ED}"/usr/bin || die done fi } multilib_src_install_all() { if use fontforge; then # 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' | \ while read header; do mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die done fi dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} use doc && dohtml -r docs/* 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 }
