diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-08-05 19:00:34 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-08-05 19:00:34 +0000 |
| commit | 87774d26a6887cc65f427b3006d74b09340738a9 (patch) | |
| tree | 4db65f005a1b859544833016d905e7ec7c7519a2 /x11-libs | |
| parent | [bump] dev-perl/FCGI-ProcManager-0.220.0 (diff) | |
| download | gentoo-2-87774d26a6887cc65f427b3006d74b09340738a9.tar.gz gentoo-2-87774d26a6887cc65f427b3006d74b09340738a9.tar.bz2 gentoo-2-87774d26a6887cc65f427b3006d74b09340738a9.zip | |
Fix building with libpng15.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/fox/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/fox/files/fox-1.6.40-libpng15.patch | 32 | ||||
| -rw-r--r-- | x11-libs/fox/fox-1.6.40.ebuild | 9 |
3 files changed, 44 insertions, 3 deletions
diff --git a/x11-libs/fox/ChangeLog b/x11-libs/fox/ChangeLog index 067fcffc9f72..a69287c26081 100644 --- a/x11-libs/fox/ChangeLog +++ b/x11-libs/fox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/fox # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.150 2011/02/26 22:34:33 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.151 2011/08/05 19:00:34 ssuominen Exp $ + + 05 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> fox-1.6.40.ebuild, + +files/fox-1.6.40-libpng15.patch: + Fix building with libpng15. 26 Feb 2011; Kevin McCarthy <signals@gentoo.org> fox-1.6.40.ebuild, fox-1.7.23.ebuild: diff --git a/x11-libs/fox/files/fox-1.6.40-libpng15.patch b/x11-libs/fox/files/fox-1.6.40-libpng15.patch new file mode 100644 index 000000000000..2411226694de --- /dev/null +++ b/x11-libs/fox/files/fox-1.6.40-libpng15.patch @@ -0,0 +1,32 @@ +--- src/fxpngio.cpp ++++ src/fxpngio.cpp +@@ -75,7 +75,11 @@ + static void user_error_fn(png_structp png_ptr,png_const_charp){ + FXStream* store=(FXStream*)png_get_error_ptr(png_ptr); + store->setError(FXStreamFormat); // Flag this as a format error in FXStream ++#if (PNG_LIBPNG_VER < 10500) + longjmp(png_ptr->jmpbuf,1); // Bail out ++#else ++ png_longjmp(png_ptr,1); // Bail out ++#endif + } + + +@@ -118,7 +122,7 @@ + } + + // Set error handling +- if(setjmp(png_ptr->jmpbuf)){ ++ if(setjmp(png_jmpbuf(png_ptr))){ + + // Free all of the memory associated with the png_ptr and info_ptr + png_destroy_read_struct(&png_ptr,&info_ptr,(png_infopp)NULL); +@@ -231,7 +235,7 @@ + } + + // Set error handling. +- if(setjmp(png_ptr->jmpbuf)){ ++ if(setjmp(png_jmpbuf(png_ptr))){ + png_destroy_write_struct(&png_ptr,&info_ptr); + return false; + } diff --git a/x11-libs/fox/fox-1.6.40.ebuild b/x11-libs/fox/fox-1.6.40.ebuild index a991d7c600d1..9a88e2a2fde5 100644 --- a/x11-libs/fox/fox-1.6.40.ebuild +++ b/x11-libs/fox/fox-1.6.40.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.40.ebuild,v 1.8 2011/02/26 22:34:32 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.6.40.ebuild,v 1.9 2011/08/05 19:00:34 ssuominen Exp $ EAPI="2" -inherit fox +inherit eutils fox LICENSE="LGPL-2.1" SLOT="1.6" @@ -33,3 +33,8 @@ FOXCONF="$(use_enable bzip2 bz2lib) \ $(use_enable tiff) \ $(use_with truetype xft) \ $(use_enable zlib)" + +src_prepare() { + epatch "${FILESDIR}"/${P}-libpng15.patch + fox_src_prepare +} |