diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-08-07 16:14:59 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-08-07 16:14:59 +0000 |
| commit | b22509d8bbeff6dbdafac8446d34e830ebe60a0d (patch) | |
| tree | 7b10e23caa028927c00dae96e93cc6631b6cea6c /app-office/dia/dia-0.97.1.ebuild | |
| parent | Fix building with libpng15 wrt #355893 by Mike Frysinger (diff) | |
| download | gentoo-2-b22509d8bbeff6dbdafac8446d34e830ebe60a0d.tar.gz gentoo-2-b22509d8bbeff6dbdafac8446d34e830ebe60a0d.tar.bz2 gentoo-2-b22509d8bbeff6dbdafac8446d34e830ebe60a0d.zip | |
Fix building with libpng15 wrt #373871 by Stuart Longland. Remove automagic USE="png zlib" and always depend on libpng and zlib.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'app-office/dia/dia-0.97.1.ebuild')
| -rw-r--r-- | app-office/dia/dia-0.97.1.ebuild | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app-office/dia/dia-0.97.1.ebuild b/app-office/dia/dia-0.97.1.ebuild index 50ca7230f07c..29b2321b454e 100644 --- a/app-office/dia/dia-0.97.1.ebuild +++ b/app-office/dia/dia-0.97.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.12 2011/04/14 18:28:15 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.13 2011/08/07 16:14:59 ssuominen Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -20,7 +20,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV_MM}/${MY_P}.tar.bz2" SLOT="0" KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" # the doc USE flag doesn't seem to do anything without docbook2html -IUSE="cairo doc gnome png python zlib" +IUSE="cairo doc gnome python" RDEPEND=">=x11-libs/gtk+-2.6.0:2 >=dev-libs/glib-2.6.0 @@ -29,10 +29,9 @@ RDEPEND=">=x11-libs/gtk+-2.6.0:2 >=dev-libs/libxslt-1 >=media-libs/freetype-2.0.95 dev-libs/popt - zlib? ( sys-libs/zlib ) - png? ( - media-libs/libpng - >=media-libs/libart_lgpl-2 ) + sys-libs/zlib + media-libs/libpng + >=media-libs/libart_lgpl-2 gnome? ( >=gnome-base/libgnome-2.0 >=gnome-base/libgnomeui-2.0 ) @@ -65,6 +64,8 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}"/${P}-libpng15.patch + gnome2_src_prepare # Fix compilation in a gnome environment, bug #159831 |