CVS commit: pkgsrc/math/py-scipy

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jun 14 14:29:16 UTC 2018

Modified Files:
        pkgsrc/math/py-scipy: distinfo
        pkgsrc/math/py-scipy/patches: patch-scipy_special___round.h
Added Files:
        pkgsrc/math/py-scipy/patches: patch-scipy___lib_src_messagestream.h

Log Message:
py-scipy: Apply a couple of patches to fix SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/math/py-scipy/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/math/py-scipy/patches/patch-scipy___lib_src_messagestream.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/math/py-scipy/patches/patch-scipy_special___round.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-scipy/distinfo
diff -u pkgsrc/math/py-scipy/distinfo:1.16 pkgsrc/math/py-scipy/distinfo:1.17
--- pkgsrc/math/py-scipy/distinfo:1.16  Mon May 14 06:39:32 2018
+++ pkgsrc/math/py-scipy/distinfo       Thu Jun 14 14:29:16 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.16 2018/05/14 06:39:32 adam Exp $
+$NetBSD: distinfo,v 1.17 2018/06/14 14:29:16 jperkin Exp $
 
 SHA1 (scipy-1.1.0.tar.gz) = 965e7ac23ac1bc2809a1fa13d429aea352bdd124
 RMD160 (scipy-1.1.0.tar.gz) = 960b360b8499728a6d10a2421594ab5a81739b3a
 SHA512 (scipy-1.1.0.tar.gz) = 72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973
 Size (scipy-1.1.0.tar.gz) = 15583560 bytes
-SHA1 (patch-scipy_special___round.h) = 30799ea2c824dc9cc0b399e7450ec10ec7137d2b
+SHA1 (patch-scipy___lib_src_messagestream.h) = 83305b780379eafcd5063b757de6b8c3f224b4f0
+SHA1 (patch-scipy_special___round.h) = 1575cf7068fe52b78a039e437b6841c0e570ceb9

Index: pkgsrc/math/py-scipy/patches/patch-scipy_special___round.h
diff -u pkgsrc/math/py-scipy/patches/patch-scipy_special___round.h:1.1 pkgsrc/math/py-scipy/patches/patch-scipy_special___round.h:1.2
--- pkgsrc/math/py-scipy/patches/patch-scipy_special___round.h:1.1      Tue Aug 22 21:37:27 2017
+++ pkgsrc/math/py-scipy/patches/patch-scipy_special___round.h  Thu Jun 14 14:29:16 2018
@@ -1,12 +1,23 @@
-$NetBSD: patch-scipy_special___round.h,v 1.1 2017/08/22 21:37:27 he Exp $
+$NetBSD: patch-scipy_special___round.h,v 1.2 2018/06/14 14:29:16 jperkin Exp $
 
 This conditional is just wrong, when built with c++, __STDC_VERSION__
 is not defined.  Make a cheezy fix which insists on <fenv.h> when
 built with C++.
 
---- scipy/special/_round.h.orig        2017-01-09 07:17:38.000000000 +0000
+--- scipy/special/_round.h.orig        2018-05-05 17:10:11.000000000 +0000
 +++ scipy/special/_round.h
-@@ -49,7 +49,7 @@ double add_round_down(double a, double b
+@@ -9,6 +9,10 @@
+ #include "_c99compat.h"
+ #include "cephes/dd_idefs.h"
+ 
++#if defined(__cplusplus)
++using std::isinf;
++using std::isnan;
++#endif
+ 
+ double add_round_up(double a, double b)
+ {
+@@ -49,7 +53,7 @@ double add_round_down(double a, double b
  
  
  /* Helper code for testing _round.h. */

Added files:

Index: pkgsrc/math/py-scipy/patches/patch-scipy___lib_src_messagestream.h
diff -u /dev/null pkgsrc/math/py-scipy/patches/patch-scipy___lib_src_messagestream.h:1.1
--- /dev/null   Thu Jun 14 14:29:16 2018
+++ pkgsrc/math/py-scipy/patches/patch-scipy___lib_src_messagestream.h  Thu Jun 14 14:29:16 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-scipy___lib_src_messagestream.h,v 1.1 2018/06/14 14:29:16 jperkin Exp $
+
+HAVE_OPEN_MEMSTREAM is defined/not defined, not 0/1.
+
+--- scipy/_lib/src/messagestream.h.orig        2018-05-05 17:10:05.000000000 +0000
++++ scipy/_lib/src/messagestream.h
+@@ -5,7 +5,7 @@
+ 
+ #include "messagestream_config.h"
+ 
+-#if HAVE_OPEN_MEMSTREAM
++#ifdef HAVE_OPEN_MEMSTREAM
+ FILE *messagestream_open_memstream(char **ptr, size_t *sizeloc)
+ {
+     return open_memstream(ptr, sizeloc);