Attachment 249153 Details for Bug 277689 – Update to 1.26.4

Update to 1.26.4

numpy-1.26.4.diff.txt (text/plain), 4.77 KB, created by wen on 2024-03-14 11:58:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: wen

Created: 2024-03-14 11:58:40 UTC

Size: 4.77 KB

patch

obsolete

>diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
>index dad34dac322e..958148d0b656 100644
>--- a/Mk/Uses/python.mk
>+++ b/Mk/Uses/python.mk
>@@ -819,7 +819,7 @@ CMAKE_ARGS+=	-DPython${PYTHON_MAJOR_VER}_EXECUTABLE:FILEPATH="${PYTHON_CMD}"
> 
> # Python 3rd-party modules
> PYGAME=		${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR}
>-PYNUMPY=	${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.26,1:math/py-numpy@${PY_FLAVOR}
>+PYNUMPY=	${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.27,1:math/py-numpy@${PY_FLAVOR}
> 
> .  if defined(_PYTHON_FEATURE_DISTUTILS)
> .    if ${PYTHON_MAJOR_VER} < 3
>diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
>index 1c38114fc0b8..e990e061ec82 100644
>--- a/math/py-numpy/Makefile
>+++ b/math/py-numpy/Makefile
>@@ -1,14 +1,12 @@
> PORTNAME=	numpy
>-PORTVERSION=	1.25.0
>-PORTREVISION=	6
>+PORTVERSION=	1.26.4
> PORTEPOCH=	1
> CATEGORIES=	math python
> MASTER_SITES=	PYPI \
>-		https://numpy.org/doc/1.23/:doc
>+		https://numpy.org/doc/1.26/:doc
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>-		${PORTNAME}-ref.pdf:doc \
>-		${PORTNAME}-user.pdf:doc
>+		${PORTNAME}-html.zip:doc
> DIST_SUBDIR=	${PORTNAME}-${PORTVERSION:R}
> EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
> 
>@@ -71,8 +69,8 @@ post-install:
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}-ref.pdf ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}-user.pdf ${STAGEDIR}${DOCSDIR}
>+	${UNZIP_NATIVE_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/numpy-html.zip -d ${STAGEDIR}${DOCSDIR}
>+	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo
> 
> do-test:
> 	@cd ${WRKSRC} && ${PYTHON_CMD} runtests.py
>diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
>index 2de2617b8244..16d45e1f1d12 100644
>--- a/math/py-numpy/distinfo
>+++ b/math/py-numpy/distinfo
>@@ -1,7 +1,5 @@
>-TIMESTAMP = 1688388955
>-SHA256 (numpy-1.25/numpy-1.25.0.tar.gz) = f1accae9a28dc3cda46a91de86acf69de0d1b5f4edd44a9b0c3ceb8036dfff19
>-SIZE (numpy-1.25/numpy-1.25.0.tar.gz) = 10426700
>-SHA256 (numpy-1.25/numpy-ref.pdf) = f493c1cae879a4e0038bec400d349fc34aafa164e1462118bdf18b25a3a07daf
>-SIZE (numpy-1.25/numpy-ref.pdf) = 7715485
>-SHA256 (numpy-1.25/numpy-user.pdf) = 3978da15c6a1b00f2737c75458db0cc0fe636ae90b72723a8ff609d40e9b7599
>-SIZE (numpy-1.25/numpy-user.pdf) = 4123384
>+TIMESTAMP = 1710383404
>+SHA256 (numpy-1.26/numpy-1.26.4.tar.gz) = 2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010
>+SIZE (numpy-1.26/numpy-1.26.4.tar.gz) = 15786129
>+SHA256 (numpy-1.26/numpy-html.zip) = 1dc88fc45a7709143b7b917e8e807e4985c41fe3fb7ee5fc55c3aeec5f369fdd
>+SIZE (numpy-1.26/numpy-html.zip) = 25538887
>diff --git a/math/py-numpy/files/patch-numpy-f2py-f2py2e.py b/math/py-numpy/files/patch-numpy-f2py-f2py2e.py
>deleted file mode 100644
>index 762edb7c74c7..000000000000
>--- a/math/py-numpy/files/patch-numpy-f2py-f2py2e.py
>+++ /dev/null
>@@ -1,18 +0,0 @@
>---- numpy/f2py/f2py2e.py.orig	2019-01-31 02:31:08 UTC
>-+++ numpy/f2py/f2py2e.py
>-@@ -599,6 +599,7 @@ def run_compile():
>-     include_dirs, sources = filter_files('-I', '', sources, remove_prefix=1)
>-     library_dirs, sources = filter_files('-L', '', sources, remove_prefix=1)
>-     libraries, sources = filter_files('-l', '', sources, remove_prefix=1)
>-+    extra_link_args, sources = filter_files('-Wl,|-B|-f','',sources,remove_prefix=0)
>-     undef_macros, sources = filter_files('-U', '', sources, remove_prefix=1)
>-     define_macros, sources = filter_files('-D', '', sources, remove_prefix=1)
>-     for i in range(len(define_macros)):
>-@@ -625,6 +626,7 @@ def run_compile():
>-                 'undef_macros': undef_macros,
>-                 'extra_objects': extra_objects,
>-                 'f2py_options': f2py_flags,
>-+                'extra_link_args': extra_link_args,
>-                 }
>- 
>-     if sysinfo_flags:
>diff --git a/math/py-numpy/files/patch-numpy_f2py_f2py2e.py b/math/py-numpy/files/patch-numpy_f2py_f2py2e.py
>new file mode 100644
>index 000000000000..ce536b834c5c
>--- /dev/null
>+++ b/math/py-numpy/files/patch-numpy_f2py_f2py2e.py
>@@ -0,0 +1,18 @@
>+--- numpy/f2py/f2py2e.py.orig	2024-03-14 06:02:34 UTC
>++++ numpy/f2py/f2py2e.py
>+@@ -693,6 +693,7 @@ def run_compile():
>+     extra_objects, sources = filter_files('', '[.](o|a|so|dylib)', sources)
>+     library_dirs, sources = filter_files('-L', '', sources, remove_prefix=1)
>+     libraries, sources = filter_files('-l', '', sources, remove_prefix=1)
>++    extra_link_args, sources = filter_files('-Wl,|-B|-f','',sources,remove_prefix=0)
>+     undef_macros, sources = filter_files('-U', '', sources, remove_prefix=1)
>+     define_macros, sources = filter_files('-D', '', sources, remove_prefix=1)
>+     for i in range(len(define_macros)):
>+@@ -727,6 +728,7 @@ def run_compile():
>+         define_macros,
>+         undef_macros,
>+         f2py_flags,
>++	extra_link_args,
>+         sysinfo_flags,
>+         fc_flags,
>+         flib_flags,

Actions: View

Attachments on bug 277689: 249153 | 251407