diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 13:34:50 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 13:34:50 +0000 |
| commit | 9a4cee11bd9353103f0e6335a46a4e07ac0fac98 (patch) | |
| tree | 1f150af1974b1d516518beb7d6392192201c13d5 /media-gfx/flphoto | |
| parent | Revbump: Add patch for crash on shutdown. Fixes #382913. (diff) | |
| download | gentoo-2-9a4cee11bd9353103f0e6335a46a4e07ac0fac98.tar.gz gentoo-2-9a4cee11bd9353103f0e6335a46a4e07ac0fac98.tar.bz2 gentoo-2-9a4cee11bd9353103f0e6335a46a4e07ac0fac98.zip | |
Fix building with libpng15 (missing zlib.h include) wrt #378389 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/flphoto')
| -rw-r--r-- | media-gfx/flphoto/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/flphoto/files/flphoto-1.3.1-libpng15.patch | 12 | ||||
| -rw-r--r-- | media-gfx/flphoto/flphoto-1.3.1-r2.ebuild | 35 |
3 files changed, 34 insertions, 20 deletions
diff --git a/media-gfx/flphoto/ChangeLog b/media-gfx/flphoto/ChangeLog index 37cf4c572d0e..4111953d3d28 100644 --- a/media-gfx/flphoto/ChangeLog +++ b/media-gfx/flphoto/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/flphoto # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/ChangeLog,v 1.25 2011/03/20 20:14:56 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/ChangeLog,v 1.26 2011/09/14 13:34:50 ssuominen Exp $ + + 14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> flphoto-1.3.1-r2.ebuild, + +files/flphoto-1.3.1-libpng15.patch: + Fix building with libpng15 (missing zlib.h include) wrt #378389 by Diego Elio + Pettenò 20 Mar 2011; Justin Lecher <jlec@gentoo.org> flphoto-1.3.1-r1.ebuild, flphoto-1.3.1-r2.ebuild: diff --git a/media-gfx/flphoto/files/flphoto-1.3.1-libpng15.patch b/media-gfx/flphoto/files/flphoto-1.3.1-libpng15.patch new file mode 100644 index 000000000000..c523a4536380 --- /dev/null +++ b/media-gfx/flphoto/files/flphoto-1.3.1-libpng15.patch @@ -0,0 +1,12 @@ +Missing include for Z_BEST_COMPRESSION + +--- image.cxx ++++ image.cxx +@@ -91,6 +91,7 @@ + #endif // HAVE_LIBJPEG + + #ifdef HAVE_LIBPNG ++# include <zlib.h> + # include <png.h> + #endif // HAVE_LIBPNG + diff --git a/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild b/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild index 97d1299ed78d..65ad3b18801e 100644 --- a/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild +++ b/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild,v 1.6 2011/03/20 20:14:56 jlec Exp $ - -EAPI=3 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild,v 1.7 2011/09/14 13:34:50 ssuominen Exp $ +EAPI=4 inherit autotools eutils fdo-mime DESCRIPTION="Basic image management and display program based on the FLTK toolkit" @@ -15,23 +14,24 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="cups debug gphoto2 nls" -DEPEND=" - dev-libs/openssl +RDEPEND="dev-libs/openssl virtual/jpeg - media-libs/libpng + >=media-libs/libpng-1.4 sys-libs/zlib x11-libs/fltk:1 x11-libs/libX11 x11-misc/shared-mime-info cups? ( net-print/cups ) gphoto2? ( media-gfx/gphoto2 )" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" src_prepare() { epatch \ - "${FILESDIR}"/flphoto-1.3.1-glibc28.patch \ - "${FILESDIR}"/flphoto-1.3.1-linking.patch \ - "${FILESDIR}"/espmsg.patch + "${FILESDIR}"/${P}-glibc28.patch \ + "${FILESDIR}"/${P}-linking.patch \ + "${FILESDIR}"/espmsg.patch \ + "${FILESDIR}"/${P}-libpng15.patch + eautoreconf } @@ -42,19 +42,16 @@ src_configure() { } src_compile() { - emake || die - if use nls; then - emake translations || die - fi + emake + use nls && emake translations } src_install() { - emake DESTDIR="${D}" install || die - if use nls; then - emake DESTDIR="${D}" install-translations || die - fi + emake DESTDIR="${D}" install + use nls && emake DESTDIR="${D}" install-translations + insinto /usr/share/mime/packages - doins "${FILESDIR}"/album.xml || die + doins "${FILESDIR}"/album.xml } pkg_postinst() { |