diff options
author | Markus Dittrich <markusle@gentoo.org> | 2008-10-15 22:28:44 +0000 |
---|---|---|
committer | Markus Dittrich <markusle@gentoo.org> | 2008-10-15 22:28:44 +0000 |
commit | 8f4ca47d986ea71216044599701c8eb6c29281ac (patch) | |
tree | 56320449adea869eacfb80cbb5442e3550ecfc10 /sci-visualization/paraview | |
parent | Don't inherit autotools (and thus depend on them) for 0.1 series. (diff) | |
download | gentoo-2-8f4ca47d986ea71216044599701c8eb6c29281ac.tar.gz gentoo-2-8f4ca47d986ea71216044599701c8eb6c29281ac.tar.bz2 gentoo-2-8f4ca47d986ea71216044599701c8eb6c29281ac.zip |
Added patch to fix issues due to changed API in >=hdf5-1.6.7 (fixes bug #242184). Also updated gcc-4 patch.
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-SENTINEL-3 i686)
Diffstat (limited to 'sci-visualization/paraview')
4 files changed, 39 insertions, 7 deletions
diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog index 8e11f6f335cc..32ba8e98eaa4 100644 --- a/sci-visualization/paraview/ChangeLog +++ b/sci-visualization/paraview/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-visualization/paraview # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.24 2008/07/30 21:47:18 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.25 2008/10/15 22:28:43 markusle Exp $ + + 15 Oct 2008; Markus Dittrich <markusle@gentoo.org> + +files/paraview-3.3_pre20080514-hdf5.patch, + files/paraview-3.3_pre20080514-gcc4.3.patch, + paraview-3.3_pre20080514.ebuild: + Added patch to fix issues due to changed API in >=hdf5-1.6.7 + (fixes bug #242184). Also updated gcc-4 patch. 29 Jul 2008; Markus Dittrich <markusle@gentoo.org> paraview-3.3_pre20080514.ebuild: diff --git a/sci-visualization/paraview/files/paraview-3.3_pre20080514-gcc4.3.patch b/sci-visualization/paraview/files/paraview-3.3_pre20080514-gcc4.3.patch index bf222fdac2b6..1f6e3176f0c8 100644 --- a/sci-visualization/paraview/files/paraview-3.3_pre20080514-gcc4.3.patch +++ b/sci-visualization/paraview/files/paraview-3.3_pre20080514-gcc4.3.patch @@ -1,6 +1,6 @@ diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfArray.h ParaView3.new/Utilities/Xdmf2/libsrc/XdmfArray.h --- ParaView3/Utilities/Xdmf2/libsrc/XdmfArray.h 2008-02-21 11:55:28.000000000 -0500 -+++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfArray.h 2008-05-15 08:29:38.000000000 -0400 ++++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfArray.h 2008-10-15 18:02:17.000000000 -0400 @@ -26,6 +26,7 @@ #define __XdmfArray_h @@ -11,7 +11,7 @@ diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfArray.h ParaView3.new/Utilities/ #define XDMF_ARRAY_TAG_LENGTH 80 diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfDataDesc.h ParaView3.new/Utilities/Xdmf2/libsrc/XdmfDataDesc.h --- ParaView3/Utilities/Xdmf2/libsrc/XdmfDataDesc.h 2008-02-21 11:55:28.000000000 -0500 -+++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfDataDesc.h 2008-05-15 08:29:38.000000000 -0400 ++++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfDataDesc.h 2008-10-15 18:02:17.000000000 -0400 @@ -27,6 +27,7 @@ #include "XdmfObject.h" @@ -20,9 +20,20 @@ diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfDataDesc.h ParaView3.new/Utiliti #define XDMF_SELECTALL 0 #define XDMF_HYPERSLAB 1 +diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx ParaView3.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx +--- ParaView3/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2007-07-12 15:10:04.000000000 -0400 ++++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2008-10-15 18:02:49.000000000 -0400 +@@ -34,6 +34,7 @@ + #include "XdmfDsmComm.h" + #include "assert.h" + #include "hdf5.h" ++#include <cstdlib> + + #define HDF_IO_DEBUG 1 + #undef HDF_IO_DEBUG diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfObject.h ParaView3.new/Utilities/Xdmf2/libsrc/XdmfObject.h --- ParaView3/Utilities/Xdmf2/libsrc/XdmfObject.h 2008-02-08 10:25:42.000000000 -0500 -+++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfObject.h 2008-05-15 08:29:38.000000000 -0400 ++++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfObject.h 2008-10-15 18:02:17.000000000 -0400 @@ -121,6 +121,9 @@ #define __DEPRECATED # include <fstream> @@ -35,7 +46,7 @@ diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfObject.h ParaView3.new/Utilities using std::cin; diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfRoot.h ParaView3.new/Utilities/Xdmf2/libsrc/XdmfRoot.h --- ParaView3/Utilities/Xdmf2/libsrc/XdmfRoot.h 2007-04-25 15:23:59.000000000 -0400 -+++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfRoot.h 2008-05-15 08:29:38.000000000 -0400 ++++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfRoot.h 2008-10-15 18:02:17.000000000 -0400 @@ -26,7 +26,7 @@ #define __XdmfRoot_h diff --git a/sci-visualization/paraview/files/paraview-3.3_pre20080514-hdf5.patch b/sci-visualization/paraview/files/paraview-3.3_pre20080514-hdf5.patch new file mode 100644 index 000000000000..1349fdc8dd2c --- /dev/null +++ b/sci-visualization/paraview/files/paraview-3.3_pre20080514-hdf5.patch @@ -0,0 +1,13 @@ +# adjust function signature to changed hdf-1.6.7 API +diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx ParaView3.new/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx +--- ParaView3/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx 2008-02-21 17:20:24.000000000 -0500 ++++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfDataDesc.cxx 2008-10-15 16:02:08.000000000 -0400 +@@ -350,7 +350,7 @@ + status = H5Sselect_elements( this->DataSpace, + H5S_SELECT_SET, + NElements, +- ( const hsize_t **)HCoordinates); ++ ( const hsize_t *)HCoordinates); + #else + status = H5Sselect_elements( this->DataSpace, + H5S_SELECT_SET, diff --git a/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild b/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild index 2aa46715411d..38e55c6e6bca 100644 --- a/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild +++ b/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild,v 1.4 2008/07/30 21:47:18 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.3_pre20080514.ebuild,v 1.5 2008/10/15 22:28:43 markusle Exp $ EAPI="1" @@ -17,7 +17,7 @@ LICENSE="paraview" KEYWORDS="~x86 ~amd64" SLOT="0" IUSE="mpi python hdf5 doc examples threads qt4" -RDEPEND="hdf5? ( sci-libs/hdf5 ) +RDEPEND="hdf5? ( >=sci-libs/hdf5-1.6.7 ) mpi? ( || ( sys-cluster/openmpi sys-cluster/mpich2 ) ) @@ -63,6 +63,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-gcc4.3.patch epatch "${FILESDIR}"/${P}-qt4.4.patch epatch "${FILESDIR}"/${PN}-3.2.1-openmpi.patch + epatch "${FILESDIR}"/${P}-hdf5.patch epatch "${DISTDIR}"/${P}-OpenFOAM-1.5.patch.bz2 # rename paraview's assistant wrapper |