Added patch to fix issues due to changed API in >=hdf5-1.6.7 (fixes bug #242184). Also updated gcc-4 patch.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-SENTINEL-3 i686

5 files changed, 43 insertions, 10 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/Manifest b/sci-visualization/paraview/Manifest
index 8647b1ec4dad..e5f766765586 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -4,7 +4,8 @@ AUX paraview-2.6.2-tkImgGIF.patch 1333 RMD160 e941a279bbfa4a47c407f294f30e63ec8a
 AUX paraview-3.2-libxml2-fix.patch 1774 RMD160 11ab022b0abca2a226deb648d48fe69cbf5c9352 SHA1 476d18040197100127184e1f547fc5840d8d0d45 SHA256 fda2240e2f0deaef39081e7375e7b99f967cbbe3aa99761f6940bb7c27c942e4
 AUX paraview-3.2-support-qt4.3.patch 3835 RMD160 06d572100ee65f6f68c042bf7204b49c062c4e3a SHA1 ea7a30324e36ea9ed58129818769bafab30c078d SHA256 c2a412b2418f4b34e210851e6d1d7f7d5112d1ead93ddcadd5c8119ea40c160e
 AUX paraview-3.2.1-openmpi.patch 1651 RMD160 64025fcb74f62939e0b71f4cfc0de09e83aa38fb SHA1 f3863c718d8c2d9da4201b194b24fb75c2794269 SHA256 148d4e22419b31af9f1c357b478820a09bffff0eada0acd3758e6dca7da3209b
-AUX paraview-3.3_pre20080514-gcc4.3.patch 1792 RMD160 56781fb8ac9fa8bc50bb7c34d2167986228a2602 SHA1 e700406300648ef10c131c073832b42a88f7e02c SHA256 fe24d033ca80da86af324fa6afef2fdbe67fe3b3cd0e4ca6abeb796caf83b032
+AUX paraview-3.3_pre20080514-gcc4.3.patch 2242 RMD160 3a088e61318bf4e3faaedc401e678b0ff1fd0569 SHA1 9027ecbb8f984fa9eac950c22e46cd3f6a5bd258 SHA256 c5e6651134ce95fed5be4d3a3d3751aeaf936cc0b31977e1abbb9f38048c1052
+AUX paraview-3.3_pre20080514-hdf5.patch 631 RMD160 d6832c1faac44cf6844c9fca7583fe546526b160 SHA1 49ac4b398cd56d766491843ad8e8310992b9a17d SHA256 be0097fb23d7c600f1642586dbd18c5fd0e9db50ee3539ce4fe637e066ce2721
 AUX paraview-3.3_pre20080514-qt4.4.patch 3750 RMD160 1115e784a8e9dbafc65f2be11e277350ab0f4760 SHA1 a813195455b97c83d6b0ea50753c0003d0a955eb SHA256 34fdc79f8f52669a7285b5d0b12d6567b8b5489397f739571f1ef6094e0fda92
 DIST ParaView-2.6.2.tar.gz 75658768 RMD160 068f3fbfea17166d34c488b4e6bd8d8fb07d3cd9 SHA1 ac5efb1c850e89b76dda4f28ecfa4575e45aa22e SHA256 de7cbd808e1ab1730ad87436d30c0a752096a65fe9aa6b82f35a39fc3b67d7c7
 DIST paraview-3.2.1-OpenFOAM.patch.bz2 35956 RMD160 b4f6d3f64e6a0cc952b73d70b59168d33f09b7d5 SHA1 4b63ca09cae3b9197b840319e3bbb7b6594a66d3 SHA256 16bf34d126c65966de20644cb44685bf90cd81f97f9ddb8b6d1749ed97918c7e
@@ -13,6 +14,6 @@ DIST paraview-3.3_pre20080514-OpenFOAM-1.5.patch.bz2 55771 RMD160 4b40990c518015
 DIST paraview-3.3_pre20080514.tar.bz2 19931958 RMD160 bcca09c71c84deaa721261fcb514897af052f360 SHA1 fcd8061d7a7679f635c06a1940a34d62acb77c23 SHA256 a1e75e5342bb95c18033ba2906514ba34693515b81a94d157a5928719fb9e4de
 EBUILD paraview-2.6.2.ebuild 3613 RMD160 937e650413d5fa4638b056ad88087986e59feacf SHA1 a8bc36ff2e02204585281ee7d095799eba462bbc SHA256 ce22dfad39ecc56f6618231e1771596bcef87f36cbf500b70192b6fd05b1c136
 EBUILD paraview-3.2.1.ebuild 5489 RMD160 92432a048cb9328fe9bed7c824cb8e8d16b97552 SHA1 169ac55063b2fddd349f7270b67f7871a5e499da SHA256 4536ed64e25666c4fbd68ead783d4fbb5b4c3939390413f3a17fad0425ac03af
-EBUILD paraview-3.3_pre20080514.ebuild 5753 RMD160 5e26f08187047672c629ddfb66d304cbee2781ab SHA1 2b673758381a99e34fa2740b0dbe5490fc7586c3 SHA256 457a33b09c90a74598b6e44c4eb3aa902e688389cbb5a0d0a47edfb44c1dde9c
-MISC ChangeLog 4852 RMD160 66c760fe5f4e18eeb757d141ffb8a681a26f55f0 SHA1 879c32754298860c1ffa91a6b6ff121c4d297ba0 SHA256 e90adb62188a3c8820c20153e65cfd5f10f10412199216b8b9821ea3ed609dee
+EBUILD paraview-3.3_pre20080514.ebuild 5799 RMD160 7503a3e346f7021390dc2983291529e381a9f17e SHA1 f22cf73c3a7ed02012520a778f7afd75cad82502 SHA256 fca2c2133df1bbcd331e75faeede084863596175e987362aec5338c209a8f3bd
+MISC ChangeLog 5147 RMD160 af23c3caffdbaecf01b25a61481c62724a396b2e SHA1 ea5ec72333cc95d8bd3971826cd3d9159a57e889 SHA256 7537ab91c3bff9b19d273b92d0596ec55056e7a5d2e2d00f518d01c644088bac
 MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701
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