<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5b392aad96d2cfab640a4a9eee5c2ab4ebfa4ced">https://github.com/macports/macports-ports/commit/5b392aad96d2cfab640a4a9eee5c2ab4ebfa4ced</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5b392aad96d py-scipy: update to 1.5.4
</span>5b392aad96d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5b392aad96d2cfab640a4a9eee5c2ab4ebfa4ced
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Nov 5 20:33:48 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-scipy: update to 1.5.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove integrated patches
</span>---
python/py-scipy/Portfile | 13 +--
.../patch-fix_implicit_functions_for_Xcode_12.diff | 123 ---------------------
2 files changed, 4 insertions(+), 132 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scipy/Portfile b/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 90f2bd75926..730a02d6c25 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,10 +6,10 @@ PortGroup active_variants 1.1
</span> PortGroup github 1.0
PortGroup compilers 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup scipy scipy 1.5.3 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0a7b5d0632ad62eaea4195ec3c548690f596f26e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0faedbd6e766bbdbdbb75e9f834911fc4af60dc812d1e113d5aaa839150cfeee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 19836566
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup scipy scipy 1.5.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9668f24955efe3e955a462459369162895fff936 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 91366228947f17c97c422fafac4e5e6cc217e3732716ed2e75757d822c427829 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19838989
</span> revision 0
name py-scipy
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,11 +59,6 @@ if {${name} ne ${subport}} {
</span> # require thread_local storage as of 1.4.0
compiler.thread_local_storage yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix implicit function declaration issue under Xcode 12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/macports/macports-ports/pull/8862
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/scipy/scipy/issues/12935
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/scipy/scipy/pull/12957
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-fix_implicit_functions_for_Xcode_12.diff
</span> }
if {${python.version} == 35} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scipy/files/patch-fix_implicit_functions_for_Xcode_12.diff b/python/py-scipy/files/patch-fix_implicit_functions_for_Xcode_12.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 747bbf2ca02..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scipy/files/patch-fix_implicit_functions_for_Xcode_12.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,123 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: implicit declaration of function 'ccopy_' is invalid in C99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: implicit declaration of function 'dcopy_' is invalid in C99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: implicit declaration of function 'idamax_' is invalid in C99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: implicit declaration of function 'input_error' is invalid in C99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: implicit declaration of function 'scopy_' is invalid in C99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: implicit declaration of function 'zcopy_' is invalid in C99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: implicitly declaring library function 'strncmp' with type 'int (const char *, const char *, unsigned long)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/scipy/scipy/pull/12957
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/scipy/scipy/issues/12935
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scipy/sparse/linalg/dsolve/SuperLU/SRC/clacon2.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scipy/sparse/linalg/dsolve/SuperLU/SRC/clacon2.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -106,6 +106,7 @@ clacon2_(int *n, complex *v, complex *x, float *est, int *kase, int isave[3])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern float smach(char *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int icmax1_slu(int *, complex *, int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern double scsum1_slu(int *, complex *, int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern void ccopy_(int *, complex [], int *, complex [], int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- safmin = smach("Safe minimum"); /* lamch_("Safe minimum"); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( *kase == 0 ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scipy/sparse/linalg/dsolve/SuperLU/SRC/dmach.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scipy/sparse/linalg/dsolve/SuperLU/SRC/dmach.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,6 +11,7 @@ at the top-level directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <float.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <math.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double dmach(char *cmach)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scipy/sparse/linalg/dsolve/SuperLU/SRC/ilu_cdrop_row.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scipy/sparse/linalg/dsolve/SuperLU/SRC/ilu_cdrop_row.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +23,7 @@ at the top-level directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "slu_cdefs.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern void scopy_(int *, float [], int *, float [], int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern void cswap_(int *, complex [], int *, complex [], int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern void caxpy_(int *, complex *, complex [], int *, complex [], int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern void ccopy_(int *, complex [], int *, complex [], int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scipy/sparse/linalg/dsolve/SuperLU/SRC/ilu_zdrop_row.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scipy/sparse/linalg/dsolve/SuperLU/SRC/ilu_zdrop_row.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +23,7 @@ at the top-level directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "slu_zdefs.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern void dcopy_(int *, double [], int *, double [], int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern void zswap_(int *, doublecomplex [], int *, doublecomplex [], int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern void zaxpy_(int *, doublecomplex *, doublecomplex [], int *, doublecomplex [], int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern void zcopy_(int *, doublecomplex [], int *, doublecomplex [], int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scipy/sparse/linalg/dsolve/SuperLU/SRC/slacon2.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scipy/sparse/linalg/dsolve/SuperLU/SRC/slacon2.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,10 +100,12 @@ slacon2_(int *n, float *v, float *x, int *isgn, float *est, int *kase, int isave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float temp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _CRAY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int ISAMAX(int *, float *, int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern int IDAMAX(int *, float *, int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern float SASUM(int *, float *, int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int SCOPY(int *, float *, int *, float *, int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int isamax_(int *, float *, int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern int idamax_(int *, float *, int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern float sasum_(int *, float *, int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int scopy_(int *, float *, int *, float *, int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scipy/sparse/linalg/dsolve/SuperLU/SRC/smach.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scipy/sparse/linalg/dsolve/SuperLU/SRC/smach.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,6 +11,7 @@ at the top-level directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <float.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <math.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float smach(char *cmach)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scipy/sparse/linalg/dsolve/SuperLU/SRC/sp_ienv.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scipy/sparse/linalg/dsolve/SuperLU/SRC/sp_ienv.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,6 +68,7 @@ at the top-level directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sp_ienv(int ispec)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern int input_error(char *, int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (ispec) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scipy/sparse/linalg/dsolve/SuperLU/SRC/zlacon2.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scipy/sparse/linalg/dsolve/SuperLU/SRC/zlacon2.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -106,6 +106,7 @@ zlacon2_(int *n, doublecomplex *v, doublecomplex *x, double *est, int *kase, int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern double dmach(char *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int izmax1_slu(int *, doublecomplex *, int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern double dzsum1_slu(int *, doublecomplex *, int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern void zcopy_(int *, doublecomplex [], int *, doublecomplex [], int *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- safmin = dmach("Safe minimum"); /* lamch_("Safe minimum"); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( *kase == 0 ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scipy/spatial/qhull_src/src/libqhull_r.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scipy/spatial/qhull_src/src/libqhull_r.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,6 +37,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <limits.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef __STDC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef __cplusplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1176,6 +1177,7 @@ void qh_initqhull_start2(qhT *qh, FILE *infile, FILE *outfile, FILE *errfile)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void qh_initthresholds(qhT *qh, char *command);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void qh_lib_check(int qhullLibraryType, int qhTsize, int vertexTsize, int ridgeTsize, int facetTsize, int setTsize, int qhmemTsize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void qh_option(qhT *qh, const char *option, int *i, realT *r);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void qh_setfeasible(qhT *qh, int dim);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void qh_zero(qhT *qh, FILE *errfile);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /***** -io_r.c prototypes (duplicated from io_r.h) ***********************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1184,6 +1186,7 @@ void qh_dfacet(qhT *qh, unsigned int id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void qh_dvertex(qhT *qh, unsigned int id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void qh_printneighborhood(qhT *qh, FILE *fp, qh_PRINT format, facetT *facetA, facetT *facetB, boolT printall);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void qh_produce_output(qhT *qh);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void qh_prepare_output(qhT *qh);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- coordT *qh_readpoints(qhT *qh, int *numpoints, int *dimension, boolT *ismalloc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>