[PR PATCH] SuiteSparse: update to 7.5.1.

[PR PATCH] SuiteSparse: update to 7.5.1.

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 1705 bytes --]

There is a new pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages SuiteSparse
https://github.com/void-linux/void-packages/pull/48223

SuiteSparse: update to 7.5.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

I built and checked `octave` and `python3-cvxopt` on top of this (#47887 would be nice to do this on CI as well).

While doing this I discovered building cvxopt is broken on i686, so I fixed it. It just happens that suitesparse moved header files in 7.4.0 to `/usr/include/suitesparse` and cvxopt figures this out for 64 bit but not for 32 bit). No need to rebuild cvxopt since our current binary is fine (it was last built with suitesparse 7.3.1).

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/48223.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-SuiteSparse-48223.patch --]
[-- Type: text/x-diff, Size: 2008 bytes --]

From 0d89aa65aed48dc938edd2543f6022ca3a68198c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 12 Jan 2024 18:41:24 -0300
Subject: [PATCH 1/2] SuiteSparse: update to 7.5.1.

---
 srcpkgs/SuiteSparse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index 4bc3f41d0f7ac..32520a2edfb40 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,6 +1,6 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
-version=7.4.0
+version=7.5.1
 revision=1
 build_style=cmake
 hostmakedepends="cmake gcc-fortran"
@@ -12,7 +12,7 @@ license="custom:multiple"
 homepage="https://people.engr.tamu.edu/davis/suitesparse.html"
 changelog="https://raw.githubusercontent.com/DrTimothyAldenDavis/SuiteSparse/master/ChangeLog"
 distfiles="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${version}.tar.gz"
-checksum=f9a5cc2316a967198463198f7bf10fb8c4332de6189b0e405419a7092bc921b7
+checksum=dccfb5f75aa83fe2edb4eb2462fc984a086c82bad8433f63c31048d84b565d74
 
 build_options="openblas"
 

From d407c871d1722fd9d79e5d966e596bb04402771d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 15 Jan 2024 14:12:19 -0300
Subject: [PATCH 2/2] python3-cvxopt: fix building on i686

---
 srcpkgs/python3-cvxopt/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/python3-cvxopt/template b/srcpkgs/python3-cvxopt/template
index 772426a59e6d3..cc961568f9db0 100644
--- a/srcpkgs/python3-cvxopt/template
+++ b/srcpkgs/python3-cvxopt/template
@@ -32,4 +32,6 @@ pre_build() {
 	export CVXOPT_BUILD_FFTW=1
 	export CVXOPT_BLAS_LIB=$(vopt_if openblas 'openblas' 'blas;gslcblas')
 	export CVXOPT_LAPACK_LIB=$(vopt_if openblas 'openblas' 'lapack')
+	# setup.py gets this wrong for i686 (and other 32 bit?)
+	export CVXOPT_SUITESPARSE_INC_DIR=${XBPS_CROSS_BASE}/usr/include/suitesparse
 }

Re: [PR PATCH] [Updated] SuiteSparse: update to 7.5.1.

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 1710 bytes --]

There is an updated pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages SuiteSparse
https://github.com/void-linux/void-packages/pull/48223

SuiteSparse: update to 7.5.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

I built and checked `octave` and `python3-cvxopt` on top of this (#47887 would be nice to do this on CI as well).

While doing this I discovered building cvxopt is broken on i686, so I fixed it. It just happens that suitesparse moved header files in 7.4.0 to `/usr/include/suitesparse` and cvxopt figures this out for 64 bit but not for 32 bit). No need to rebuild cvxopt since our current binary is fine (it was last built with suitesparse 7.3.1).

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/48223.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-SuiteSparse-48223.patch --]
[-- Type: text/x-diff, Size: 2008 bytes --]

From 1ebf5032a5fb3e6d418e1222c2872af825e9496e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 12 Jan 2024 18:41:24 -0300
Subject: [PATCH 1/2] SuiteSparse: update to 7.6.0.

---
 srcpkgs/SuiteSparse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index 4bc3f41d0f7ac..9f25f7bd1fba8 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,6 +1,6 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
-version=7.4.0
+version=7.6.0
 revision=1
 build_style=cmake
 hostmakedepends="cmake gcc-fortran"
@@ -12,7 +12,7 @@ license="custom:multiple"
 homepage="https://people.engr.tamu.edu/davis/suitesparse.html"
 changelog="https://raw.githubusercontent.com/DrTimothyAldenDavis/SuiteSparse/master/ChangeLog"
 distfiles="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${version}.tar.gz"
-checksum=f9a5cc2316a967198463198f7bf10fb8c4332de6189b0e405419a7092bc921b7
+checksum=19cbeb9964ebe439413dd66d82ace1f904adc5f25d8a823c1b48c34bd0d29ea5
 
 build_options="openblas"
 

From 5a3f39edfaa5d34ed61ca36cb7e36733bdc33ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 15 Jan 2024 14:12:19 -0300
Subject: [PATCH 2/2] python3-cvxopt: fix building on i686

---
 srcpkgs/python3-cvxopt/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/python3-cvxopt/template b/srcpkgs/python3-cvxopt/template
index 772426a59e6d3..cc961568f9db0 100644
--- a/srcpkgs/python3-cvxopt/template
+++ b/srcpkgs/python3-cvxopt/template
@@ -32,4 +32,6 @@ pre_build() {
 	export CVXOPT_BUILD_FFTW=1
 	export CVXOPT_BLAS_LIB=$(vopt_if openblas 'openblas' 'blas;gslcblas')
 	export CVXOPT_LAPACK_LIB=$(vopt_if openblas 'openblas' 'lapack')
+	# setup.py gets this wrong for i686 (and other 32 bit?)
+	export CVXOPT_SUITESPARSE_INC_DIR=${XBPS_CROSS_BASE}/usr/include/suitesparse
 }

Re: [PR PATCH] [Merged]: SuiteSparse: update to 7.6.0.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 1548 bytes --]

There's a merged pull request on the void-packages repository

SuiteSparse: update to 7.6.0.
https://github.com/void-linux/void-packages/pull/48223

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

I built and checked `octave` and `python3-cvxopt` on top of this (#47887 would be nice to do this on CI as well).

While doing this I discovered building cvxopt is broken on i686, so I fixed it. It just happens that suitesparse moved header files in 7.4.0 to `/usr/include/suitesparse` and cvxopt figures this out for 64 bit but not for 32 bit). No need to rebuild cvxopt since our current binary is fine (it was last built with suitesparse 7.3.1).

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->