diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 18:47:03 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 18:47:03 +0000 |
| commit | d467ea0712dbc6fa24112bf827068c8127eb990e (patch) | |
| tree | c8ae0cd65440884ce252bc52c927168001960482 /media-libs/simage | |
| parent | Bug #378169: fixes for libpng15. (diff) | |
| download | gentoo-2-d467ea0712dbc6fa24112bf827068c8127eb990e.tar.gz gentoo-2-d467ea0712dbc6fa24112bf827068c8127eb990e.tar.bz2 gentoo-2-d467ea0712dbc6fa24112bf827068c8127eb990e.zip | |
Fix building with libpng15 wrt #383131 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/simage')
| -rw-r--r-- | media-libs/simage/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/simage/files/simage-1.7.0-libpng15.patch | 11 | ||||
| -rw-r--r-- | media-libs/simage/simage-1.7.0.ebuild | 7 |
3 files changed, 21 insertions, 5 deletions
diff --git a/media-libs/simage/ChangeLog b/media-libs/simage/ChangeLog index c8b540752a85..734e832b3946 100644 --- a/media-libs/simage/ChangeLog +++ b/media-libs/simage/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/simage -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/simage/ChangeLog,v 1.4 2010/11/09 09:05:53 ssuominen Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/simage/ChangeLog,v 1.5 2011/09/15 18:47:03 ssuominen Exp $ + + 15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> simage-1.7.0.ebuild, + +files/simage-1.7.0-libpng15.patch: + Fix building with libpng15 wrt #383131 by Diego Elio Pettenò 09 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> simage-1.7.0.ebuild: Use virtual/jpeg wrt #327487. diff --git a/media-libs/simage/files/simage-1.7.0-libpng15.patch b/media-libs/simage/files/simage-1.7.0-libpng15.patch new file mode 100644 index 000000000000..c42fd1fe27e9 --- /dev/null +++ b/media-libs/simage/files/simage-1.7.0-libpng15.patch @@ -0,0 +1,11 @@ +--- src/simage_png.c ++++ src/simage_png.c +@@ -323,7 +323,7 @@ + /* Set error handling. REQUIRED if you aren't supplying your own + * error hadnling functions in the png_create_write_struct() call. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* If we get here, we had a problem reading the file */ + fclose(fp); + png_destroy_write_struct(&png_ptr, (png_infopp)info_ptr); diff --git a/media-libs/simage/simage-1.7.0.ebuild b/media-libs/simage/simage-1.7.0.ebuild index f1777111b0da..1a460ef823b4 100644 --- a/media-libs/simage/simage-1.7.0.ebuild +++ b/media-libs/simage/simage-1.7.0.ebuild @@ -1,6 +1,6 @@ -# 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-libs/simage/simage-1.7.0.ebuild,v 1.4 2010/11/09 09:05:53 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/simage/simage-1.7.0.ebuild,v 1.5 2011/09/15 18:47:03 ssuominen Exp $ EAPI=2 @@ -35,7 +35,8 @@ DEPEND="${RDEPEND} DOCS=(AUTHORS ChangeLog NEWS README) PATCHES=( - "${FILESDIR}/${PN}-1.7.0-pkgconfig-partial.patch" + "${FILESDIR}"/${PN}-1.7.0-pkgconfig-partial.patch + "${FILESDIR}"/${PN}-1.7.0-libpng15.patch ) # --with-pic, two defined (PIC and one for image format, sillyt), no not pass |