From 110e817539166f6d0fd447c16eee0f944060cac9 Mon Sep 17 00:00:00 2001
From: Chongyun Lee <45286352+licy183@users.noreply.github.com>
Date: Sat, 25 May 2024 18:13:12 +0800
Subject: [PATCH] python-scipy: bump to 1.13.1 (#1040)

---
 tur/python-scipy/0001-aligned-alloc.patch          | 11 -----------
 .../0002-fix-the-logging-of-f2pymod-wrapper.patch  | 14 --------------
 tur/python-scipy/build.sh                          |  2 +-
 3 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 tur/python-scipy/0001-aligned-alloc.patch
 delete mode 100644 tur/python-scipy/0002-fix-the-logging-of-f2pymod-wrapper.patch

diff --git a/tur/python-scipy/0001-aligned-alloc.patch b/tur/python-scipy/0001-aligned-alloc.patch
deleted file mode 100644
index c988141d0..000000000
--- a/tur/python-scipy/0001-aligned-alloc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scipy/_lib/pocketfft/pocketfft_hdronly.h
-+++ b/scipy/_lib/pocketfft/pocketfft_hdronly.h
-@@ -156,7 +156,7 @@
- // the standard C++ library on Windows does not provide aligned_alloc() even
- // though the MinGW compiler and MSVC may advertise C++17 compliance.
- // aligned_alloc is only supported from MacOS 10.15.
--#if (__cplusplus >= 201703L) && (!defined(__MINGW32__)) && (!defined(_MSC_VER)) && (__MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_15)
-+#if (__cplusplus >= 201703L) && (!defined(__MINGW32__)) && (!defined(_MSC_VER)) && (__MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_15) && !(defined(__ANDROID__) && __ANDROID_API__ < 26) 
- inline void *aligned_alloc(size_t align, size_t size)
-   {
-   // aligned_alloc() requires that the requested size is a multiple of "align"
diff --git a/tur/python-scipy/0002-fix-the-logging-of-f2pymod-wrapper.patch b/tur/python-scipy/0002-fix-the-logging-of-f2pymod-wrapper.patch
deleted file mode 100644
index 4f362b830..000000000
--- a/tur/python-scipy/0002-fix-the-logging-of-f2pymod-wrapper.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/tools/generate_f2pymod.py
-+++ b/tools/generate_f2pymod.py
-@@ -290,9 +290,9 @@
-                             cwd=os.getcwd())
-         out, err = p.communicate()
-         if not (p.returncode == 0):
--            raise RuntimeError(f"Writing {args.outfile} with f2py failed!\n"
-+            raise RuntimeError(f"Processing {fname_pyf} with f2py failed!\n"
-                             f"{out}\n"
--                            r"{err}")
-+                            f"{err}")
- 
- 
- if __name__ == "__main__":
diff --git a/tur/python-scipy/build.sh b/tur/python-scipy/build.sh
index 0ea532794..035ea7fd0 100644
--- a/tur/python-scipy/build.sh
+++ b/tur/python-scipy/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://scipy.org/
 TERMUX_PKG_DESCRIPTION="Fundamental algorithms for scientific computing in Python"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux-user-repository"
-TERMUX_PKG_VERSION="1:1.13.0"
+TERMUX_PKG_VERSION="1:1.13.1"
 TERMUX_PKG_SRCURL=git+https://github.com/scipy/scipy
 TERMUX_PKG_DEPENDS="libc++, libopenblas, python, python-numpy"
 TERMUX_PKG_BUILD_DEPENDS="python-numpy-static"