[gentoo-commits] gentoo-x86 commit in sci-visualization/hippodraw/files: hippodraw-1.21.3-numarray.patch hippodraw-1.21.3-gcc4.3.patch

[Markus Dittrich (markusle)]

markusle    08/06/01 20:14:34

  Added:                hippodraw-1.21.3-numarray.patch
                        hippodraw-1.21.3-gcc4.3.patch
  Log:
  Version bump, masked for a bit more testing.
  (Portage version: 2.1.5.2)

Revision  Changes    Path
1.1                  sci-visualization/hippodraw/files/hippodraw-1.21.3-numarray.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/hippodraw/files/hippodraw-1.21.3-numarray.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/hippodraw/files/hippodraw-1.21.3-numarray.patch?rev=1.1&content-type=text/plain

Index: hippodraw-1.21.3-numarray.patch
===================================================================
diff -Naur HippoDraw-1.21.3/python/PyDataSource.cxx HippoDraw-1.21.3.new/python/PyDataSource.cxx
--- HippoDraw-1.21.3/python/PyDataSource.cxx	2007-08-24 18:19:16.000000000 -0400
+++ HippoDraw-1.21.3.new/python/PyDataSource.cxx	2008-06-01 14:22:46.000000000 -0400
@@ -444,9 +444,14 @@
 copy_direct ( boost::python::numeric::array array,
 	      std::vector<double > & col )
 {
+#ifdef HAVE_NUMARRAY
   T * data = reinterpret_cast < T * > ( num_util::data ( array ) );
   int size = num_util::size ( array );
   std::copy ( data, data+ size, back_inserter( col ) );
+#else
+  throw std::runtime_error ("HippoDraw was not built with "
+			     "numeric Python support" );
+#endif
 }
 
 void 
@@ -454,6 +459,7 @@
 extractVector ( boost::python::numeric::array array,
 		std::vector<double> & col )
 {
+#ifdef HAVE_NUMARRAY
   PyArray_TYPES type = num_util::type ( array );
 
   if ( num_util::iscontiguous ( array ) &&
@@ -515,7 +521,11 @@
 	  col.push_back ( boost::python::extract < double > ( result ) );
 	}
       }
-  } 
+  }
+#else
+  throw std::runtime_error ("HippoDraw was not built with "
+			     "numeric Python support" );
+#endif
 }
 
 PyDataSource *



1.1                  sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc4.3.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc4.3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/hippodraw/files/hippodraw-1.21.3-gcc4.3.patch?rev=1.1&content-type=text/plain

Index: hippodraw-1.21.3-gcc4.3.patch
===================================================================
diff -Naur HippoDraw-1.21.3/axes/Range.cxx HippoDraw-1.21.3.new/axes/Range.cxx
--- HippoDraw-1.21.3/axes/Range.cxx	2007-05-08 14:47:27.000000000 -0400
+++ HippoDraw-1.21.3.new/axes/Range.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -16,6 +16,7 @@
 
 #include "Range.h"
 
+#include <ostream>
 #include <algorithm>
 
 #include <cassert>
diff -Naur HippoDraw-1.21.3/fits/FitsFile.cxx HippoDraw-1.21.3.new/fits/FitsFile.cxx
--- HippoDraw-1.21.3/fits/FitsFile.cxx	2007-05-17 13:57:10.000000000 -0400
+++ HippoDraw-1.21.3.new/fits/FitsFile.cxx	2008-06-01 15:28:54.000000000 -0400
@@ -15,7 +15,7 @@
 
 #include <algorithm>
 #include <stdexcept>
-
+#include <cstring>
 #include <cassert>
 
 using std::string;
diff -Naur HippoDraw-1.21.3/minimizers/Fitter.cxx HippoDraw-1.21.3.new/minimizers/Fitter.cxx
--- HippoDraw-1.21.3/minimizers/Fitter.cxx	2006-01-28 17:54:45.000000000 -0500
+++ HippoDraw-1.21.3.new/minimizers/Fitter.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -13,6 +13,8 @@
 
 #include "StatedFCN.h"
 
+#include <cstdlib>
+#include <climits>
 #include <stdexcept>
 
 using std::string;
diff -Naur HippoDraw-1.21.3/minimizers/LMFitter.cxx HippoDraw-1.21.3.new/minimizers/LMFitter.cxx
--- HippoDraw-1.21.3/minimizers/LMFitter.cxx	2007-04-23 17:57:21.000000000 -0400
+++ HippoDraw-1.21.3.new/minimizers/LMFitter.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -18,6 +18,7 @@
 #include "NumLinAlg.h"
 #include "StatedFCN.h"
 
+#include <climits>
 #include <algorithm>
 
 #include <cmath>
diff -Naur HippoDraw-1.21.3/minimizers/NumLinAlg.cxx HippoDraw-1.21.3.new/minimizers/NumLinAlg.cxx
--- HippoDraw-1.21.3/minimizers/NumLinAlg.cxx	2005-05-16 14:39:20.000000000 -0400
+++ HippoDraw-1.21.3.new/minimizers/NumLinAlg.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -19,6 +19,7 @@
 #include <cmath>
 #include <cfloat>
 #include <cassert>
+#include <cstdlib>
 
 using std::ofstream;
 using std::ifstream;
diff -Naur HippoDraw-1.21.3/projectors/DyHist1DProjector.cxx HippoDraw-1.21.3.new/projectors/DyHist1DProjector.cxx
--- HippoDraw-1.21.3/projectors/DyHist1DProjector.cxx	2007-04-23 17:57:21.000000000 -0400
+++ HippoDraw-1.21.3.new/projectors/DyHist1DProjector.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -21,6 +21,7 @@
 #include "datasrcs/DataPointTuple.h"
 #include "datasrcs/NTuple.h"
 
+#include <climits>
 #include <cassert>
 
 using namespace hippodraw;
diff -Naur HippoDraw-1.21.3/projectors/DyHist2DProjector.cxx HippoDraw-1.21.3.new/projectors/DyHist2DProjector.cxx
--- HippoDraw-1.21.3/projectors/DyHist2DProjector.cxx	2005-09-12 12:55:10.000000000 -0400
+++ HippoDraw-1.21.3.new/projectors/DyHist2DProjector.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -24,7 +24,7 @@
 #include "binners/BinnerAxisFactory.h"
 
 #include "datasrcs/NTuple.h"
-
+#include <climits>
 #include <cassert>
 
 using namespace hippodraw;
diff -Naur HippoDraw-1.21.3/projectors/EqualEntriesHist1DProjector.cxx HippoDraw-1.21.3.new/projectors/EqualEntriesHist1DProjector.cxx
--- HippoDraw-1.21.3/projectors/EqualEntriesHist1DProjector.cxx	2007-04-23 17:57:21.000000000 -0400
+++ HippoDraw-1.21.3.new/projectors/EqualEntriesHist1DProjector.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -26,6 +26,7 @@
 #include <numeric>
 
 #include <cfloat>
+#include <climits>
 
 #include <cassert>
 
diff -Naur HippoDraw-1.21.3/projectors/Map1Projector.cxx HippoDraw-1.21.3.new/projectors/Map1Projector.cxx
--- HippoDraw-1.21.3/projectors/Map1Projector.cxx	2007-04-27 14:14:52.000000000 -0400
+++ HippoDraw-1.21.3.new/projectors/Map1Projector.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -25,7 +25,7 @@
 #include <numeric>
 
 #include <cfloat>
-
+#include <climits>
 #include <cassert>
 
 using namespace hippodraw;
diff -Naur HippoDraw-1.21.3/projectors/Map2Projector.cxx HippoDraw-1.21.3.new/projectors/Map2Projector.cxx
--- HippoDraw-1.21.3/projectors/Map2Projector.cxx	2007-04-23 17:57:21.000000000 -0400
+++ HippoDraw-1.21.3.new/projectors/Map2Projector.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -24,7 +24,7 @@
 #include <algorithm>
 
 #include <cfloat>
-
+#include <climits>
 #include <cassert>
 
 using namespace hippodraw;
diff -Naur HippoDraw-1.21.3/projectors/MapMatrixProjector.cxx HippoDraw-1.21.3.new/projectors/MapMatrixProjector.cxx
--- HippoDraw-1.21.3/projectors/MapMatrixProjector.cxx	2007-04-23 17:57:21.000000000 -0400
+++ HippoDraw-1.21.3.new/projectors/MapMatrixProjector.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -23,10 +23,10 @@
 
 #include <algorithm>
 #include <numeric>
-
+#include <climits>
 #include <cfloat>
 #include <cmath>
-
+#include <climits>
 #include <cassert>
 
 using namespace hippodraw;
diff -Naur HippoDraw-1.21.3/projectors/MeshProjector.cxx HippoDraw-1.21.3.new/projectors/MeshProjector.cxx
--- HippoDraw-1.21.3/projectors/MeshProjector.cxx	2007-04-23 17:57:21.000000000 -0400
+++ HippoDraw-1.21.3.new/projectors/MeshProjector.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -24,7 +24,7 @@
 
 #include <algorithm>
 #include <cfloat>
-
+#include <climits>
 #include <cassert>
 
 using namespace hippodraw;
diff -Naur HippoDraw-1.21.3/projectors/NTupleProjector.cxx HippoDraw-1.21.3.new/projectors/NTupleProjector.cxx
--- HippoDraw-1.21.3/projectors/NTupleProjector.cxx	2007-04-23 17:57:21.000000000 -0400
+++ HippoDraw-1.21.3.new/projectors/NTupleProjector.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -23,7 +23,7 @@
 #include <algorithm>
 #include <functional>
 #include <stdexcept>
-
+#include <climits>
 #include <cassert>
 
 #ifdef ITERATOR_MEMBER_DEFECT
diff -Naur HippoDraw-1.21.3/projectors/ProfileProjector.cxx HippoDraw-1.21.3.new/projectors/ProfileProjector.cxx
--- HippoDraw-1.21.3/projectors/ProfileProjector.cxx	2007-04-23 17:57:21.000000000 -0400
+++ HippoDraw-1.21.3.new/projectors/ProfileProjector.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -27,7 +27,7 @@
 #include "datasrcs/NTuple.h"
 
 #include <algorithm>
-
+#include <climits>
 #include <cassert>
 
 using namespace hippodraw;
diff -Naur HippoDraw-1.21.3/projectors/StripChartProjector.cxx HippoDraw-1.21.3.new/projectors/StripChartProjector.cxx
--- HippoDraw-1.21.3/projectors/StripChartProjector.cxx	2005-10-29 20:10:14.000000000 -0400
+++ HippoDraw-1.21.3.new/projectors/StripChartProjector.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -20,7 +20,7 @@
 #include "datasrcs/DataSource.h"
 
 #include <algorithm>
-
+#include <climits>
 #include <cassert>
 
 using std::distance;
diff -Naur HippoDraw-1.21.3/qt/QtApp.cxx HippoDraw-1.21.3.new/qt/QtApp.cxx
--- HippoDraw-1.21.3/qt/QtApp.cxx	2007-03-14 19:28:28.000000000 -0400
+++ HippoDraw-1.21.3.new/qt/QtApp.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -26,6 +26,7 @@
 
 #include "qdir.h"
 #include <cassert>
+#include <cstdlib>
 
 using std::string;
 
diff -Naur HippoDraw-1.21.3/qt/QtViewImp.cxx HippoDraw-1.21.3.new/qt/QtViewImp.cxx
--- HippoDraw-1.21.3/qt/QtViewImp.cxx	2007-06-28 16:03:02.000000000 -0400
+++ HippoDraw-1.21.3.new/qt/QtViewImp.cxx	2008-06-01 15:28:20.000000000 -0400
@@ -42,6 +42,7 @@
 #endif
 
 #include <cassert>
+#include <cstdlib>
 
 using namespace hippodraw;
 



-- 
gentoo-commits@l.g.o mailing list