diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-10-17 18:12:36 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-10-17 18:12:36 +0000 |
| commit | b1a7fbcd567706966ca14433bd3bd9b37dc57057 (patch) | |
| tree | c2b1dd0e964084e02b2bcb952f3081ab4ffa3373 /sci-visualization/paraview | |
| parent | mask games-arcade/stepmania for removal (diff) | |
| download | gentoo-2-b1a7fbcd567706966ca14433bd3bd9b37dc57057.tar.gz gentoo-2-b1a7fbcd567706966ca14433bd3bd9b37dc57057.tar.bz2 gentoo-2-b1a7fbcd567706966ca14433bd3bd9b37dc57057.zip | |
Fix building with libpng15 wrt #387437 by Ruggero Morsucci
(Portage version: 2.2.0_alpha67/cvs/Linux x86_64)
Diffstat (limited to 'sci-visualization/paraview')
| -rw-r--r-- | sci-visualization/paraview/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch | 21 | ||||
| -rw-r--r-- | sci-visualization/paraview/paraview-3.6.2.ebuild | 3 |
3 files changed, 28 insertions, 2 deletions
diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog index 5660272ec090..3b06b3f086f7 100644 --- a/sci-visualization/paraview/ChangeLog +++ b/sci-visualization/paraview/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-visualization/paraview # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.59 2011/07/27 17:38:47 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.60 2011/10/17 18:12:36 ssuominen Exp $ + + 17 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> paraview-3.6.2.ebuild, + +files/paraview-3.6.2-libpng15.patch: + Fix building with libpng15 wrt #387437 by Ruggero Morsucci 27 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> paraview-3.6.2.ebuild: Fix for python 2.7 wrt #348151 diff --git a/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch b/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch new file mode 100644 index 000000000000..0fb717a561f8 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.6.2-libpng15.patch @@ -0,0 +1,21 @@ +--- VTK/IO/vtkPNGWriter.cxx ++++ VTK/IO/vtkPNGWriter.cxx +@@ -148,7 +148,7 @@ + void vtkPNGWriteErrorFunction(png_structp png_ptr, + png_const_charp vtkNotUsed(error_msg)) + { +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + } + +@@ -224,7 +224,7 @@ + png_init_io(png_ptr, this->TempFP); + png_set_error_fn(png_ptr, png_ptr, + vtkPNGWriteErrorFunction, vtkPNGWriteWarningFunction); +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + fclose(this->TempFP); + this->SetErrorCode(vtkErrorCode::OutOfDiskSpaceError); +Only in ParaView3/VTK/IO: vtkPNGWriter.cxx.orig diff --git a/sci-visualization/paraview/paraview-3.6.2.ebuild b/sci-visualization/paraview/paraview-3.6.2.ebuild index 6de9fa45cd62..ddd2190a7b79 100644 --- a/sci-visualization/paraview/paraview-3.6.2.ebuild +++ b/sci-visualization/paraview/paraview-3.6.2.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/sci-visualization/paraview/paraview-3.6.2.ebuild,v 1.16 2011/07/27 17:38:47 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.2.ebuild,v 1.17 2011/10/17 18:12:36 ssuominen Exp $ EAPI="3" @@ -74,6 +74,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-odbc.patch epatch "${FILESDIR}"/${P}-h5part.patch epatch "${FILESDIR}"/${P}-libpng14.patch + epatch "${FILESDIR}"/${P}-libpng15.patch if has_version '>=sci-libs/hdf5-1.8.0'; then epatch "${FILESDIR}"/${P}-hdf-1.8.3.patch |