diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2014-10-19 19:50:03 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-10-19 19:50:03 +0000 |
| commit | b5d51f0ecc320d6432791f9a0b6a8638c35b49e5 (patch) | |
| tree | fe46bf017d9089598b0857d326d576771bf8bc84 /media-gfx/photivo | |
| parent | Restrict bash USE=readline mask to SLOT=0. (diff) | |
| download | gentoo-2-b5d51f0ecc320d6432791f9a0b6a8638c35b49e5.tar.gz gentoo-2-b5d51f0ecc320d6432791f9a0b6a8638c35b49e5.tar.bz2 gentoo-2-b5d51f0ecc320d6432791f9a0b6a8638c35b49e5.zip | |
Fix compile error, bug #521204
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'media-gfx/photivo')
| -rw-r--r-- | media-gfx/photivo/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/photivo/photivo-0_pre20131115.ebuild | 11 |
2 files changed, 13 insertions, 6 deletions
diff --git a/media-gfx/photivo/ChangeLog b/media-gfx/photivo/ChangeLog index 2b9741b47cb4..92f64805c915 100644 --- a/media-gfx/photivo/ChangeLog +++ b/media-gfx/photivo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/photivo -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/photivo/ChangeLog,v 1.8 2013/12/17 21:13:39 hwoarang Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/photivo/ChangeLog,v 1.9 2014/10/19 19:50:03 blueness Exp $ + + 19 Oct 2014; Anthony G. Basile <blueness@gentoo.org> + photivo-0_pre20131115.ebuild: + Fix compile error, bug #521204 17 Dec 2013; Markos Chandras <hwoarang@gentoo.org> photivo-9999.ebuild: Drop EHG_REVISION so it can be overridden by command line. Bug #494474 by diff --git a/media-gfx/photivo/photivo-0_pre20131115.ebuild b/media-gfx/photivo/photivo-0_pre20131115.ebuild index c9840fe89c98..dc368517ecd8 100644 --- a/media-gfx/photivo/photivo-0_pre20131115.ebuild +++ b/media-gfx/photivo/photivo-0_pre20131115.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/photivo/photivo-0_pre20131115.ebuild,v 1.1 2013/11/17 18:39:02 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/photivo/photivo-0_pre20131115.ebuild,v 1.2 2014/10/19 19:50:03 blueness Exp $ EAPI=4 @@ -23,7 +23,7 @@ RDEPEND="dev-qt/qtcore:4 media-libs/libpng media-libs/cimg media-libs/lcms:2 - media-libs/lensfun + >=media-libs/lensfun-0.2.8-r1 sci-libs/fftw:3.0 media-libs/liblqr media-gfx/graphicsmagick[q16,-lcms] @@ -33,12 +33,15 @@ DEPEND="${RDEPEND}" S=${WORKDIR}/${PN}-${PV/0_pre/} src_prepare() { - # remove ccache dependency + # remove ccache dependency and fix lensfun header path local File for File in $(find "${S}" -type f); do if grep -sq ccache ${File}; then sed -e 's/ccache//' -i "${File}" fi + if grep -sq "lensfun.h" ${File}; then + sed -e 's/lensfun\.h/lensfun\/lensfun.h/' -i ${File} + fi done # useless check (no pkgconfig file is provided) |