diff options
| author |   Benda XU <heroxbd@gentoo.org> | 2013-08-24 11:51:14 +0000 |
|---|---|---|
| committer | Benda XU <heroxbd@gentoo.org> | 2013-08-24 11:51:14 +0000 |
| commit | 17e70b8bc37d9f19d6c04ca2642d72b9c98fd1ec (patch) | |
| tree | ceeb0d80c40d74d49f035ed0ca835ad229176103 /media-libs/freetype | |
| parent | old (diff) | |
| download | gentoo-2-17e70b8bc37d9f19d6c04ca2642d72b9c98fd1ec.tar.gz gentoo-2-17e70b8bc37d9f19d6c04ca2642d72b9c98fd1ec.tar.bz2 gentoo-2-17e70b8bc37d9f19d6c04ca2642d72b9c98fd1ec.zip | |
fix include path output for freetype-config, bug 482172. Credits to Ben de Groot for reviewing.
(Portage version: 2.2.0/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'media-libs/freetype')
| -rw-r--r-- | media-libs/freetype/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/freetype/files/freetype-2.4.12-clean-include.patch | 20 | ||||
| -rw-r--r-- | media-libs/freetype/freetype-2.4.12.ebuild | 4 |
3 files changed, 29 insertions, 2 deletions
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index 1b9a31030827..1b183ab215c6 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.376 2013/07/30 18:59:40 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.377 2013/08/24 11:51:14 heroxbd Exp $ + + 24 Aug 2013; Benda Xu <heroxbd@gentoo.org> + +files/freetype-2.4.12-clean-include.patch, freetype-2.4.12.ebuild: + fix include path output for freetype-config, bug 482172. Credits to Ben de + Groot for reviewing. 30 Jul 2013; Michał Górny <mgorny@gentoo.org> freetype-2.4.11-r2.ebuild, freetype-2.4.12.ebuild: diff --git a/media-libs/freetype/files/freetype-2.4.12-clean-include.patch b/media-libs/freetype/files/freetype-2.4.12-clean-include.patch new file mode 100644 index 000000000000..f9b2bad94ea7 --- /dev/null +++ b/media-libs/freetype/files/freetype-2.4.12-clean-include.patch @@ -0,0 +1,20 @@ +do not output extra include dir in any chance, for Prefix. + +Index: freetype-2.4.12/builds/unix/freetype-config.in +=================================================================== +--- freetype-2.4.12.orig/builds/unix/freetype-config.in ++++ freetype-2.4.12/builds/unix/freetype-config.in +@@ -132,12 +132,7 @@ if test "$echo_ft_version" = "yes" ; the + fi + + if test "$echo_cflags" = "yes" ; then +- cflags="-I${SYSROOT}$includedir/freetype2" +- if test "${SYSROOT}$includedir" != "/usr/include" ; then +- echo $cflags -I${SYSROOT}$includedir +- else +- echo $cflags +- fi ++ echo "-I${SYSROOT}$includedir/freetype2" + fi + + if test "$echo_libs" = "yes" ; then diff --git a/media-libs/freetype/freetype-2.4.12.ebuild b/media-libs/freetype/freetype-2.4.12.ebuild index 67f23d210212..5a054d442fa7 100644 --- a/media-libs/freetype/freetype-2.4.12.ebuild +++ b/media-libs/freetype/freetype-2.4.12.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.12.ebuild,v 1.3 2013/07/30 18:59:40 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.12.ebuild,v 1.4 2013/08/24 11:51:14 heroxbd Exp $ EAPI=5 @@ -77,6 +77,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966 + epatch "${FILESDIR}"/${PN}-2.4.12-clean-include.patch # 482172 + if use utils; then cd "${WORKDIR}/ft2demos-${PV}" || die # Disable tests needing X11 when USE="-X". (bug #177597) |