[PR PATCH] SuiteSparse: update to 7.0.1.

[PR PATCH] SuiteSparse: update to 7.0.1.

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 1358 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/42050

SuiteSparse: update to 7.0.1.
Also rebuild octave (with a patch) for a minor abi/api change. The patch is taken from upstream octave.

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

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

<!--
#### 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/42050.patch is attached

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

From d02ea2bb638cd235b452dacaa9bf2df0c68d5a61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 2 Feb 2023 20:37:19 -0300
Subject: [PATCH 1/2] SuiteSparse: update to 7.0.1.

---
 common/shlibs                | 2 +-
 srcpkgs/SuiteSparse/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..039476ff5845 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4071,7 +4071,7 @@ libcholmod.so.4 SuiteSparse-6.0.1_1
 libcolamd.so.3 SuiteSparse-6.0.1_1
 libcxsparse.so.4 SuiteSparse-6.0.1_1
 libspqr.so.3 SuiteSparse-6.0.1_1
-libsuitesparseconfig.so.6 SuiteSparse-6.0.1_1
+libsuitesparseconfig.so.7 SuiteSparse-7.0.1_1
 libumfpack.so.6 SuiteSparse-6.0.1_1
 libecl.so.21.2 ecl-21.2.1_1
 libecm.so.1 ecm-7.0.4_3
diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index 869237dc9f85..7fee8aef4841 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,6 +1,6 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
-version=6.0.1
+version=7.0.1
 revision=1
 hostmakedepends="cmake gcc-fortran"
 makedepends="libgomp-devel mpfr-devel
@@ -11,7 +11,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=06f55a0449775d1f43d8a33ba8c8417ea8cf76c27833b465c49825baa8741d0c
+checksum=dc2f8d5c2657c120b30cce942f634ec08fc3a4b0b10e19d3eef7790b2bec8d1e
 
 build_options="openblas"
 

From de29257f435b05862046d1c3ba2c092218e93aaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 2 Feb 2023 21:41:05 -0300
Subject: [PATCH 2/2] octave: revbump for SuiteSparse

 - needs a patch taken from upstream
---
 srcpkgs/octave/patches/aaffac4fbe30.patch | 52 +++++++++++++++++++++++
 srcpkgs/octave/template                   |  2 +-
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/octave/patches/aaffac4fbe30.patch

diff --git a/srcpkgs/octave/patches/aaffac4fbe30.patch b/srcpkgs/octave/patches/aaffac4fbe30.patch
new file mode 100644
index 000000000000..e4c0e5cd72b6
--- /dev/null
+++ b/srcpkgs/octave/patches/aaffac4fbe30.patch
@@ -0,0 +1,52 @@
+Source: https://hg.octave.org/octave/raw-rev/aaffac4fbe30
+See: https://savannah.gnu.org/bugs/index.php?63684
+
+# HG changeset patch
+# User Markus Mützel <markus.muetzel@gmx.de>
+# Date 1674223637 -3600
+# Node ID aaffac4fbe30833c07ac7e267da19c2ff569085f
+# Parent  084bbdabb969d502c964b046129b82adec2caeba
+Adapt for API changes in SuiteSparse 7.0.0 or newer (bug #63684).
+
+* liboctave/util/oct-sparse.h (SUITESPARSE_ASSIGN_FPTR,
+SUITESPARSE_ASSIGN_FPTR2): Adapt macro for changes in API of SuiteSparse 7.0.0
+or newer.
+
+diff -r 084bbdabb969 -r aaffac4fbe30 liboctave/util/oct-sparse.h
+--- a/liboctave/util/oct-sparse.h	Sun Jan 08 15:12:27 2023 +0100
++++ b/liboctave/util/oct-sparse.h	Fri Jan 20 15:07:17 2023 +0100
+@@ -89,16 +89,27 @@
+ #  include <SuiteSparseQR.hpp>
+ #endif
+ 
+-// Cope with new SuiteSparse versions
++// Cope with API differences between SuiteSparse versions
+ 
+ #if defined (SUITESPARSE_VERSION)
+-#  if (SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3))
++#  if (SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (7, 0))
++#    define SUITESPARSE_NAME(name) SuiteSparse_ ## name
++#    define SUITESPARSE_SET_FCN(name) SuiteSparse_config_ ## name ## _set
++#    define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) \
++       SUITESPARSE_SET_FCN(f_name) (f_assign)
++#    define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) \
++       SUITESPARSE_SET_FCN(f_name) (SUITESPARSE_NAME (f_assign))
++#  elif (SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3))
+ #    define SUITESPARSE_NAME(name) SuiteSparse_ ## name
+-#    define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (SuiteSparse_config.f_name = f_assign)
+-#    define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (SuiteSparse_config.f_name = SUITESPARSE_NAME (f_assign))
++#    define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) \
++       (SuiteSparse_config.f_name = f_assign)
++#    define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) \
++       (SuiteSparse_config.f_name = SUITESPARSE_NAME (f_assign))
+ #  else
+-#    define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (f_var = f_assign)
+-#    define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (f_var = CHOLMOD_NAME (f_assign))
++#    define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) \
++       (f_var = f_assign)
++#    define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) \
++       (f_var = CHOLMOD_NAME (f_assign))
+ #  endif
+ #endif
+ 
+
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 164c9309347e..471190a8fcb2 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,7 +1,7 @@
 # Template file for 'octave'
 pkgname=octave
 version=7.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-docs"
 hostmakedepends="perl gcc-fortran pkg-config"

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

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 1363 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/42050

SuiteSparse: update to 7.0.1.
Also rebuild octave (with a patch) for a minor abi/api change. The patch is taken from upstream octave.

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

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

<!--
#### 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/42050.patch is attached

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

From c67995af721e8683ece53948d7e2725185c5b627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 2 Feb 2023 20:37:19 -0300
Subject: [PATCH 1/2] SuiteSparse: update to 7.0.1.

 - use libatomic-devel when needed (armv6l-musl)
---
 common/shlibs                | 2 +-
 srcpkgs/SuiteSparse/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..039476ff5845 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4071,7 +4071,7 @@ libcholmod.so.4 SuiteSparse-6.0.1_1
 libcolamd.so.3 SuiteSparse-6.0.1_1
 libcxsparse.so.4 SuiteSparse-6.0.1_1
 libspqr.so.3 SuiteSparse-6.0.1_1
-libsuitesparseconfig.so.6 SuiteSparse-6.0.1_1
+libsuitesparseconfig.so.7 SuiteSparse-7.0.1_1
 libumfpack.so.6 SuiteSparse-6.0.1_1
 libecl.so.21.2 ecl-21.2.1_1
 libecm.so.1 ecm-7.0.4_3
diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index 869237dc9f85..6cc6b0a232d5 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,6 +1,6 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
-version=6.0.1
+version=7.0.1
 revision=1
 hostmakedepends="cmake gcc-fortran"
 makedepends="libgomp-devel mpfr-devel
@@ -11,7 +11,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=06f55a0449775d1f43d8a33ba8c8417ea8cf76c27833b465c49825baa8741d0c
+checksum=dc2f8d5c2657c120b30cce942f634ec08fc3a4b0b10e19d3eef7790b2bec8d1e
 
 build_options="openblas"
 
@@ -23,6 +23,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*) ;;
 esac
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
 do_build() {
 	make library \
 		JOBS=$XBPS_MAKEJOBS \

From a8ad5556c8fdf86ed7b7f58ccf5245048d571c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 2 Feb 2023 21:41:05 -0300
Subject: [PATCH 2/2] octave: revbump for SuiteSparse

 - needs a patch taken from upstream
---
 srcpkgs/octave/patches/aaffac4fbe30.patch | 52 +++++++++++++++++++++++
 srcpkgs/octave/template                   |  2 +-
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/octave/patches/aaffac4fbe30.patch

diff --git a/srcpkgs/octave/patches/aaffac4fbe30.patch b/srcpkgs/octave/patches/aaffac4fbe30.patch
new file mode 100644
index 000000000000..e4c0e5cd72b6
--- /dev/null
+++ b/srcpkgs/octave/patches/aaffac4fbe30.patch
@@ -0,0 +1,52 @@
+Source: https://hg.octave.org/octave/raw-rev/aaffac4fbe30
+See: https://savannah.gnu.org/bugs/index.php?63684
+
+# HG changeset patch
+# User Markus Mützel <markus.muetzel@gmx.de>
+# Date 1674223637 -3600
+# Node ID aaffac4fbe30833c07ac7e267da19c2ff569085f
+# Parent  084bbdabb969d502c964b046129b82adec2caeba
+Adapt for API changes in SuiteSparse 7.0.0 or newer (bug #63684).
+
+* liboctave/util/oct-sparse.h (SUITESPARSE_ASSIGN_FPTR,
+SUITESPARSE_ASSIGN_FPTR2): Adapt macro for changes in API of SuiteSparse 7.0.0
+or newer.
+
+diff -r 084bbdabb969 -r aaffac4fbe30 liboctave/util/oct-sparse.h
+--- a/liboctave/util/oct-sparse.h	Sun Jan 08 15:12:27 2023 +0100
++++ b/liboctave/util/oct-sparse.h	Fri Jan 20 15:07:17 2023 +0100
+@@ -89,16 +89,27 @@
+ #  include <SuiteSparseQR.hpp>
+ #endif
+ 
+-// Cope with new SuiteSparse versions
++// Cope with API differences between SuiteSparse versions
+ 
+ #if defined (SUITESPARSE_VERSION)
+-#  if (SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3))
++#  if (SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (7, 0))
++#    define SUITESPARSE_NAME(name) SuiteSparse_ ## name
++#    define SUITESPARSE_SET_FCN(name) SuiteSparse_config_ ## name ## _set
++#    define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) \
++       SUITESPARSE_SET_FCN(f_name) (f_assign)
++#    define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) \
++       SUITESPARSE_SET_FCN(f_name) (SUITESPARSE_NAME (f_assign))
++#  elif (SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3))
+ #    define SUITESPARSE_NAME(name) SuiteSparse_ ## name
+-#    define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (SuiteSparse_config.f_name = f_assign)
+-#    define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (SuiteSparse_config.f_name = SUITESPARSE_NAME (f_assign))
++#    define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) \
++       (SuiteSparse_config.f_name = f_assign)
++#    define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) \
++       (SuiteSparse_config.f_name = SUITESPARSE_NAME (f_assign))
+ #  else
+-#    define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (f_var = f_assign)
+-#    define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (f_var = CHOLMOD_NAME (f_assign))
++#    define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) \
++       (f_var = f_assign)
++#    define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) \
++       (f_var = CHOLMOD_NAME (f_assign))
+ #  endif
+ #endif
+ 
+
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 164c9309347e..471190a8fcb2 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,7 +1,7 @@
 # Template file for 'octave'
 pkgname=octave
 version=7.3.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-docs"
 hostmakedepends="perl gcc-fortran pkg-config"

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

[leahneukirchen]

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

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

SuiteSparse: update to 7.0.1.
https://github.com/void-linux/void-packages/pull/42050

Description:
Also rebuild octave (with a patch) for a minor abi/api change. The patch is taken from upstream octave.

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

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

<!--
#### 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
-->