diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2013-12-10 09:51:02 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2013-12-10 09:51:02 +0000 |
| commit | 88f145e8eb9645079a5b78a439856f760d867138 (patch) | |
| tree | 08ddec6ddd16877914e68eec8cd6c853964f8ed4 /media-libs | |
| parent | Version bump wrt bug #485960, drop old (diff) | |
| download | gentoo-2-88f145e8eb9645079a5b78a439856f760d867138.tar.gz gentoo-2-88f145e8eb9645079a5b78a439856f760d867138.tar.bz2 gentoo-2-88f145e8eb9645079a5b78a439856f760d867138.zip | |
Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493588)
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/sk1libs/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/media-libs/sk1libs/ChangeLog b/media-libs/sk1libs/ChangeLog index 2903a5964bae..0333ee68b2d2 100644 --- a/media-libs/sk1libs/ChangeLog +++ b/media-libs/sk1libs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/sk1libs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sk1libs/ChangeLog,v 1.23 2013/09/05 18:55:06 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sk1libs/ChangeLog,v 1.24 2013/12/10 09:51:02 polynomial-c Exp $ + + 10 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> sk1libs-0.9.1-r3.ebuild: + Fixed compilation with >=media-libs/freetype-2.5.1 (bug #493588). 05 Sep 2013; Michał Górny <mgorny@gentoo.org> sk1libs-0.9.1-r2.ebuild, sk1libs-0.9.1-r3.ebuild: diff --git a/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild b/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild index 2d6862e0006a..502b9202149b 100644 --- a/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild +++ b/media-libs/sk1libs/sk1libs-0.9.1-r3.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/sk1libs/sk1libs-0.9.1-r3.ebuild,v 1.3 2013/09/05 18:55:06 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sk1libs/sk1libs-0.9.1-r3.ebuild,v 1.4 2013/12/10 09:51:02 polynomial-c Exp $ EAPI=5 @@ -10,7 +10,8 @@ inherit distutils-r1 python-r1 DESCRIPTION="sk1 vector graphics lib" HOMEPAGE="http://sk1project.org" -SRC_URI="http://uniconvertor.googlecode.com/files/${P}.tar.gz" +SRC_URI="http://uniconvertor.googlecode.com/files/${P}.tar.gz + https://github.com/python-imaging/Pillow/commit/c6040f618d8f2706a7b46d1cdf37d1a587f9701f.patch -> ${PN}-0.9.1-freetype251.patch" LICENSE="LGPL-2" SLOT="0" @@ -32,6 +33,10 @@ RDEPEND="${DEPEND} " python_prepare_all() { + pushd src/imaging/libimagingft &>/dev/null || die + epatch "${DISTDIR}"/${PN}-0.9.1-freetype251.patch + popd &>/dev/null || die + sed \ -e "/include_dirs/s:\(/usr/include/freetype2\):${EPREFIX}\1:" \ -i setup.py || die |