diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-10-10 16:53:29 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-10-10 16:53:29 +0000 |
| commit | b6a0d0269807c7d0c6710d2b203e1702daa720d3 (patch) | |
| tree | 15e6c39ee1013950b823de95dd45600277b7e513 /media-libs | |
| parent | Bumping to 0.9.21 (diff) | |
| download | gentoo-2-b6a0d0269807c7d0c6710d2b203e1702daa720d3.tar.gz gentoo-2-b6a0d0269807c7d0c6710d2b203e1702daa720d3.tar.bz2 gentoo-2-b6a0d0269807c7d0c6710d2b203e1702daa720d3.zip | |
Include kpathsea/version.h when available. Fixes a build failure with TeX Live 2010.
(Portage version: 2.2_rc91/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/freetype/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/freetype/files/freetype-1.4_pre20080316-kpathsea_version.patch | 36 | ||||
| -rw-r--r-- | media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild | 6 |
3 files changed, 47 insertions, 3 deletions
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index 5071c65cb17c..263cc82c6160 100644 --- a/media-libs/freetype/ChangeLog +++ b/media-libs/freetype/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/freetype # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.267 2010/10/04 00:28:28 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.268 2010/10/10 16:53:29 aballier Exp $ + + 10 Oct 2010; Alexis Ballier <aballier@gentoo.org> + freetype-1.4_pre20080316-r2.ebuild, + +files/freetype-1.4_pre20080316-kpathsea_version.patch: + Include kpathsea/version.h when available. Fixes a build failure with TeX + Live 2010. *freetype-2.4.3 (04 Oct 2010) diff --git a/media-libs/freetype/files/freetype-1.4_pre20080316-kpathsea_version.patch b/media-libs/freetype/files/freetype-1.4_pre20080316-kpathsea_version.patch new file mode 100644 index 000000000000..2cc82027d04b --- /dev/null +++ b/media-libs/freetype/files/freetype-1.4_pre20080316-kpathsea_version.patch @@ -0,0 +1,36 @@ +Include kpathsea/version.h when available. Fixes a build failure with TeX Live +2010. + +Index: freetype/freetype1-contrib/ttf2pk/configure.ac +=================================================================== +--- freetype.orig/freetype1-contrib/ttf2pk/configure.ac ++++ freetype/freetype1-contrib/ttf2pk/configure.ac +@@ -58,6 +58,7 @@ if test -n "$kpathsea_include" -o -n "$k + + AC_CHECK_HEADER(kpathsea/c-auto.h, ,[ + AC_MSG_ERROR([Can't find kpathsea include files! Use --with-kpathsea-include option.])]) ++ AC_CHECK_HEADERS([kpathsea/version.h]) + else + CPPFLAGS="$CPPFLAGS -I$srcdir" + fi +Index: freetype/freetype1-contrib/ttf2pk/filesrch.c +=================================================================== +--- freetype.orig/freetype1-contrib/ttf2pk/filesrch.c ++++ freetype/freetype1-contrib/ttf2pk/filesrch.c +@@ -34,12 +34,16 @@ + #include "kpathsea/kpathsea.h" + #endif + ++#ifdef HAVE_KPATHSEA_VERSION_H ++#include <kpathsea/version.h> ++#else + #ifdef KPSEDLL + /* this is kpathsea 3.3 and newer */ + extern KPSEDLL char *kpathsea_version_string; + #else + extern DllImport char *kpathsea_version_string; + #endif ++#endif + + /* + * Initialize kpathsea library; arguments are the full name of the diff --git a/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild b/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild index 1fb61ec2a0f0..329227d91282 100644 --- a/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild +++ b/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild,v 1.6 2009/05/27 17:40:47 rich0 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild,v 1.7 2010/10/10 16:53:29 aballier Exp $ inherit autotools eutils libtool multilib @@ -47,6 +47,8 @@ src_unpack() { epatch "${FILESDIR}"/${P}-CVE-2006-1861.patch #271234 epatch "${FILESDIR}"/${P}-CVE-2007-2754.patch #271234 + epatch "${FILESDIR}"/${P}-kpathsea_version.patch #Fix build with TL2010 + # disable tests (they don't compile) sed -i -e "/^all:/ s:tttest ::" Makefile.in |