diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-08-13 03:19:23 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-08-13 03:19:23 +0000 |
| commit | 63410dada5ec1842e84f04a18e004a7b69c525be (patch) | |
| tree | 9c200d4f1e40d78863f63f86dcc4fa8063b64bd6 | |
| parent | Check image dir rather than filesystem for multilib paths so we get proper LD... (diff) | |
| download | gentoo-2-63410dada5ec1842e84f04a18e004a7b69c525be.tar.gz gentoo-2-63410dada5ec1842e84f04a18e004a7b69c525be.tar.bz2 gentoo-2-63410dada5ec1842e84f04a18e004a7b69c525be.zip | |
Fix building with libpng15 wrt #378511 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
| -rw-r--r-- | media-gfx/pngtoico/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch | 11 | ||||
| -rw-r--r-- | media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild | 19 |
3 files changed, 27 insertions, 11 deletions
diff --git a/media-gfx/pngtoico/ChangeLog b/media-gfx/pngtoico/ChangeLog index dcf484eb9723..de422e0ca9ff 100644 --- a/media-gfx/pngtoico/ChangeLog +++ b/media-gfx/pngtoico/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/pngtoico -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/ChangeLog,v 1.15 2010/10/10 11:57:19 phajdan.jr Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/ChangeLog,v 1.16 2011/08/13 03:19:23 ssuominen Exp $ + + 13 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> pngtoico-1.0.1-r1.ebuild, + +files/pngtoico-1.0.1-libpng15.patch: + Fix building with libpng15 wrt #378511 by Diego Elio Pettenò 10 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> pngtoico-1.0.1-r1.ebuild: diff --git a/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch b/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch new file mode 100644 index 000000000000..c81b25ade627 --- /dev/null +++ b/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch @@ -0,0 +1,11 @@ +--- pngtoico.c ++++ pngtoico.c +@@ -188,7 +188,7 @@ + goto perrexit; + } + +- if ( setjmp(png_ptr->jmpbuf) ) { ++ if ( setjmp(png_jmpbuf(png_ptr)) ) { + fprintf(stderr, "%s: PNG format error\n", file); + goto errexit; + } diff --git a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild index 9801a71ace44..9ab9d1950304 100644 --- a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild +++ b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild,v 1.3 2010/10/10 11:57:19 phajdan.jr Exp $ - -EAPI=2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild,v 1.4 2011/08/13 03:19:23 ssuominen Exp $ +EAPI=4 inherit eutils toolchain-funcs DESCRIPTION="Convert png images to MS ico format" @@ -15,11 +14,13 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" -DEPEND="media-libs/libpng" -RDEPEND="${DEPEND}" +RDEPEND=">=media-libs/libpng-1.4" +DEPEND="${RDEPEND}" src_prepare() { - epatch "${FILESDIR}/${P}-Makefile.patch" + epatch \ + "${FILESDIR}"/${P}-Makefile.patch \ + "${FILESDIR}"/${P}-libpng15.patch } src_compile() { @@ -27,6 +28,6 @@ src_compile() { } src_install() { - dobin pngtoico - doman pngtoico.1 + dobin ${PN} + doman ${PN}.1 } |