diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2015-06-04 15:05:39 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2015-06-04 15:05:39 +0000 |
| commit | 7f7c1b8341484085f3783e03319174f4f1204ea4 (patch) | |
| tree | d66c4f63aeebe64a77e90efd02547677a134f8f7 /app-text | |
| parent | Version bump. (diff) | |
| download | gentoo-2-7f7c1b8341484085f3783e03319174f4f1204ea4.tar.gz gentoo-2-7f7c1b8341484085f3783e03319174f4f1204ea4.tar.bz2 gentoo-2-7f7c1b8341484085f3783e03319174f4f1204ea4.zip | |
Fix build with freetype 2.5.1 and newer (#514794 by Dmitry 'daks' Fomenko and Patrick)
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/ttf2pt1/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch | 20 | ||||
| -rw-r--r-- | app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild | 11 |
3 files changed, 32 insertions, 6 deletions
diff --git a/app-text/ttf2pt1/ChangeLog b/app-text/ttf2pt1/ChangeLog index d163928be043..520c77f683c7 100644 --- a/app-text/ttf2pt1/ChangeLog +++ b/app-text/ttf2pt1/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/ttf2pt1 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ChangeLog,v 1.29 2015/04/14 23:47:08 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ChangeLog,v 1.30 2015/06/04 15:05:39 pacho Exp $ + + 04 Jun 2015; Pacho Ramos <pacho@gentoo.org> + +files/ttf2pt1-3.4.4-freetype-2.5.patch, ttf2pt1-3.4.4-r1.ebuild: + Fix build with freetype 2.5.1 and newer (#514794 by Dmitry 'daks' Fomenko and + Patrick) 14 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -ttf2pt1-3.4.4.ebuild: Remove old. diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch new file mode 100644 index 000000000000..613da6c7339b --- /dev/null +++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch @@ -0,0 +1,20 @@ +diff -Naur ttf2pt1-3.4.4-orig/ft.c ttf2pt1-3.4.4/ft.c +--- ttf2pt1-3.4.4.orig/ft.c 2014-07-02 14:19:32.000000000 -0700 ++++ ttf2pt1-3.4.4/ft.c 2014-07-02 14:20:22.794538869 -0700 +@@ -13,11 +13,11 @@ + #include <ctype.h> + #include <sys/types.h> + #include <ft2build.h> +-#include <freetype/freetype.h> +-#include <freetype/ftglyph.h> +-#include <freetype/ftsnames.h> +-#include <freetype/ttnameid.h> +-#include <freetype/ftoutln.h> ++#include <freetype2/freetype.h> ++#include <freetype2/ftglyph.h> ++#include <freetype2/ftsnames.h> ++#include <freetype2/ttnameid.h> ++#include <freetype2/ftoutln.h> + #include "pt1.h" + #include "global.h" + diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild index cf1635752201..40cfd156d927 100644 --- a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild +++ b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild,v 1.5 2011/02/12 18:32:40 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild,v 1.6 2015/06/04 15:05:39 pacho Exp $ -EAPI="3" +EAPI=5 inherit eutils multilib toolchain-funcs @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="amd64 ppc sparc x86" IUSE="" -DEPEND=">=media-libs/freetype-2.0" +DEPEND=">=media-libs/freetype-2.5.1:2" RDEPEND="${DEPEND}" src_prepare() { @@ -23,6 +23,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-LDFLAGS.patch epatch "${FILESDIR}"/${PN}-3.4.0-man-pages.diff epatch "${FILESDIR}"/${P}-freetype.patch + epatch "${FILESDIR}"/${P}-freetype-2.5.patch sed -i -e "/^CC=/ { s:gcc:$(tc-getCC): }" Makefile sed -i -e "/^CFLAGS_SYS=/ { s:-O.*$:${CFLAGS}: }" Makefile @@ -31,7 +32,7 @@ src_prepare() { } src_install() { - emake INSTDIR="${D}"/usr install || die + emake INSTDIR="${D}"/usr install dodir /usr/share/doc/${PF} pushd "${D}"/usr/share/ttf2pt1 > /dev/null rm -r app other |