[PR PATCH] octave: fix qt5 in cross-build

[PR PATCH] octave: fix qt5 in cross-build

[tornaria]

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

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

https://github.com/tornaria/void-packages octave
https://github.com/void-linux/void-packages/pull/51607

octave: fix qt5 in cross-build
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I cross built the package for aarch64 before and after and the log shows clearly that qt5 was broken before and claims to be working now. But I don't have an aarch64 box to actually test if this fixes #51602.

Closes: #51602 (hopefully)

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

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

From d13f9650049a2b61d221e6021fb7358242b99d40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 2 Aug 2024 11:45:34 -0300
Subject: [PATCH] octave: fix qt5 in cross-build

---
 srcpkgs/octave/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index b8f92fd8a6336d..73bbace0dc8b88 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,7 +1,7 @@
 # Template file for 'octave'
 pkgname=octave
 version=9.2.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-docs"
 hostmakedepends="perl gcc-fortran pkg-config"
@@ -88,6 +88,9 @@ if [ -n "$CROSS_BUILD" ];then
 	configure_args+=" ax_blas_integer_size=4"
 fi
 
+hostmakedepends+="
+ $(vopt_if gui qt5-host-tools)"
+
 makedepends+="
  $(vopt_if arpack arpack-ng-devel)
  $(vopt_if audio 'libsndfile-devel portaudio-devel')

Re: [PR REVIEW] octave: fix qt5 in cross-build

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51607#discussion_r1702048839

Comment:
```suggestion
 hostmakedepends="perl gcc-fortran pkg-config  $(vopt_if gui qt5-host-tools)"
```

Re: [PR REVIEW] octave: fix qt5 in cross-build

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51607#discussion_r1702048839

Comment:
```suggestion
hostmakedepends="perl gcc-fortran pkg-config  $(vopt_if gui qt5-host-tools)"
```

Re: [PR REVIEW] octave: fix qt5 in cross-build

[tornaria]

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

New review comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/51607#discussion_r1702240731

Comment:
Sure, it's the same. I'm just following the style of the existing template (which I did not originally write).

Re: [PR PATCH] [Updated] octave: fix qt5 in cross-build

[tornaria]

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

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

https://github.com/tornaria/void-packages octave
https://github.com/void-linux/void-packages/pull/51607

octave: fix qt5 in cross-build
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I cross built the package for aarch64 before and after and the log shows clearly that qt5 was broken before and claims to be working now. But I don't have an aarch64 box to actually test if this fixes #51602.

Closes: #51602 (hopefully)

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

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

From 0159dd2343c503e99553841ddc93af029fd2e39f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 2 Aug 2024 11:45:34 -0300
Subject: [PATCH] octave: fix qt5 in cross-build

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

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index b8f92fd8a6336d..0684158997fa5d 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,10 +1,10 @@
 # Template file for 'octave'
 pkgname=octave
 version=9.2.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-docs"
-hostmakedepends="perl gcc-fortran pkg-config"
+hostmakedepends="perl gcc-fortran pkg-config $(vopt_if gui qt5-host-tools)"
 makedepends="pcre2-devel readline-devel libSM-devel libltdl-devel lcms2-devel
  glpk-devel SuiteSparse-devel rapidjson"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"

Re: [PR REVIEW] octave: fix qt5 in cross-build

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51607#discussion_r1702243842

Comment:
would rather follow what most templates do than what one person did like 10 years ago

Re: [PR REVIEW] octave: fix qt5 in cross-build

[tornaria]

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

New review comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/51607#discussion_r1702250703

Comment:
It's done. Still waiting for someone with aarch64 to confirm this fixes #51602.

Re: octave: fix qt5 in cross-build

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/51607#issuecomment-2266371590

Comment:
I would move this to Qt6, too!

Re: [PR PATCH] [Updated] octave: fix qt5 in cross-build

[tornaria]

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

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

https://github.com/tornaria/void-packages octave
https://github.com/void-linux/void-packages/pull/51607

octave: fix qt5 in cross-build
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I cross built the package for aarch64 before and after and the log shows clearly that qt5 was broken before and claims to be working now. But I don't have an aarch64 box to actually test if this fixes #51602.

Closes: #51602 (hopefully)

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

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

From a72b649aef944c4fd625889ecfc562493efc1683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 6 Aug 2024 23:57:58 -0300
Subject: [PATCH 1/3] SuiteSparse: update to 7.8.0.

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

diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index b9b144e343bb40..4849b9a421ad71 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,6 +1,6 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
-version=7.7.0
+version=7.8.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=529b067f5d80981f45ddf6766627b8fc5af619822f068f342aab776e683df4f3
+checksum=8ea989f36be3646d0b0eecb06218698766ca06256c0de15a64350e993bf5c5f9
 
 build_options="openblas"
 

From f2f7fd85889634b827ec69683ca693dcd85dbee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 2 Aug 2024 11:45:34 -0300
Subject: [PATCH 2/3] octave: fix qt5 in cross-build

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

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index b8f92fd8a6336d..0684158997fa5d 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,10 +1,10 @@
 # Template file for 'octave'
 pkgname=octave
 version=9.2.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-docs"
-hostmakedepends="perl gcc-fortran pkg-config"
+hostmakedepends="perl gcc-fortran pkg-config $(vopt_if gui qt5-host-tools)"
 makedepends="pcre2-devel readline-devel libSM-devel libltdl-devel lcms2-devel
  glpk-devel SuiteSparse-devel rapidjson"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"

From 844cf17a9bdc5935d6460efcd7286374b7ec7950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 7 Aug 2024 21:21:20 -0300
Subject: [PATCH 3/3] octave: switch to qt6

---
 srcpkgs/octave/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 0684158997fa5d..6027367ad9a088 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -4,10 +4,10 @@ version=9.2.0
 revision=2
 build_style=gnu-configure
 configure_args="--disable-docs"
-hostmakedepends="perl gcc-fortran pkg-config $(vopt_if gui qt5-host-tools)"
+hostmakedepends="perl gcc-fortran pkg-config $(vopt_if gui 'qt6-base qt6-tools')"
 makedepends="pcre2-devel readline-devel libSM-devel libltdl-devel lcms2-devel
  glpk-devel SuiteSparse-devel rapidjson"
-depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+depends="$(vopt_if gui qt6-plugin-sqlite) texinfo"
 checkdepends="zip unzip ghostscript gnuplot tar texinfo"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
@@ -94,7 +94,7 @@ makedepends+="
  $(vopt_if curl libcurl-devel)
  $(vopt_if fftw3 fftw-devel)
  $(vopt_if graphicsmagick libgraphicsmagick-devel)
- $(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
+ $(vopt_if gui 'qt6-base-devel qt6-tools-devel qt6-plugin-sqlite qscintilla-qt6-devel')
  $(vopt_if hdf5 hdf5-devel)
  $(vopt_if imagemagick libmagick-devel)
  $(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")

Re: [PR PATCH] [Updated] [WIP] octave: switch to qt6, fix cross-build

[tornaria]

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

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

https://github.com/tornaria/void-packages octave
https://github.com/void-linux/void-packages/pull/51607

[WIP] octave: switch to qt6, fix cross-build
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I cross built the package for aarch64 before and after and the log shows clearly that qt5 was broken before and claims to be working now. But I don't have an aarch64 box to actually test if this fixes #51602.

Closes: #51602 (hopefully)

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

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

From a72b649aef944c4fd625889ecfc562493efc1683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 6 Aug 2024 23:57:58 -0300
Subject: [PATCH 1/4] SuiteSparse: update to 7.8.0.

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

diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index b9b144e343bb40..4849b9a421ad71 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,6 +1,6 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
-version=7.7.0
+version=7.8.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=529b067f5d80981f45ddf6766627b8fc5af619822f068f342aab776e683df4f3
+checksum=8ea989f36be3646d0b0eecb06218698766ca06256c0de15a64350e993bf5c5f9
 
 build_options="openblas"
 

From f2f7fd85889634b827ec69683ca693dcd85dbee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 2 Aug 2024 11:45:34 -0300
Subject: [PATCH 2/4] octave: fix qt5 in cross-build

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

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index b8f92fd8a6336d..0684158997fa5d 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,10 +1,10 @@
 # Template file for 'octave'
 pkgname=octave
 version=9.2.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-docs"
-hostmakedepends="perl gcc-fortran pkg-config"
+hostmakedepends="perl gcc-fortran pkg-config $(vopt_if gui qt5-host-tools)"
 makedepends="pcre2-devel readline-devel libSM-devel libltdl-devel lcms2-devel
  glpk-devel SuiteSparse-devel rapidjson"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"

From 844cf17a9bdc5935d6460efcd7286374b7ec7950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 7 Aug 2024 21:21:20 -0300
Subject: [PATCH 3/4] octave: switch to qt6

---
 srcpkgs/octave/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 0684158997fa5d..6027367ad9a088 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -4,10 +4,10 @@ version=9.2.0
 revision=2
 build_style=gnu-configure
 configure_args="--disable-docs"
-hostmakedepends="perl gcc-fortran pkg-config $(vopt_if gui qt5-host-tools)"
+hostmakedepends="perl gcc-fortran pkg-config $(vopt_if gui 'qt6-base qt6-tools')"
 makedepends="pcre2-devel readline-devel libSM-devel libltdl-devel lcms2-devel
  glpk-devel SuiteSparse-devel rapidjson"
-depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+depends="$(vopt_if gui qt6-plugin-sqlite) texinfo"
 checkdepends="zip unzip ghostscript gnuplot tar texinfo"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
@@ -94,7 +94,7 @@ makedepends+="
  $(vopt_if curl libcurl-devel)
  $(vopt_if fftw3 fftw-devel)
  $(vopt_if graphicsmagick libgraphicsmagick-devel)
- $(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
+ $(vopt_if gui 'qt6-base-devel qt6-tools-devel qt6-plugin-sqlite qscintilla-qt6-devel')
  $(vopt_if hdf5 hdf5-devel)
  $(vopt_if imagemagick libmagick-devel)
  $(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")

From 82af0553a7bad01f8b3cdfccdb2571c9c3595098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 8 Aug 2024 09:19:13 -0300
Subject: [PATCH 4/4] octave: add missing qt5compat, remove build options

---
 srcpkgs/octave/template | 73 +++++------------------------------------
 1 file changed, 9 insertions(+), 64 deletions(-)

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 6027367ad9a088..d49364bb9d0d05 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -3,11 +3,16 @@ pkgname=octave
 version=9.2.0
 revision=2
 build_style=gnu-configure
+build_helper=qmake6
 configure_args="--disable-docs"
-hostmakedepends="perl gcc-fortran pkg-config $(vopt_if gui 'qt6-base qt6-tools')"
+hostmakedepends="perl gcc-fortran pkg-config qt6-base qt6-tools"
 makedepends="pcre2-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel SuiteSparse-devel rapidjson"
-depends="$(vopt_if gui qt6-plugin-sqlite) texinfo"
+ glpk-devel SuiteSparse-devel rapidjson arpack-ng-devel libsndfile-devel
+ portaudio-devel libcurl-devel fftw-devel libgraphicsmagick-devel
+ qt6-base-devel qt6-tools-devel qt6-qt5compat-devel qt6-plugin-sqlite
+ qscintilla-qt6-devel glu-devel fltk-devel fontconfig-devel freetype-devel
+ gl2ps-devel libgomp-devel libqhull-devel zlib-devel"
+depends="qt6-plugin-sqlite texinfo"
 checkdepends="zip unzip ghostscript gnuplot tar texinfo"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
@@ -17,9 +22,6 @@ changelog="http://hg.savannah.gnu.org/hgweb/octave/raw-file/default/etc/NEWS.${v
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
 checksum=0636554b05996997e431caad4422c00386d2d7c68900472700fecf5ffeb7c991
 
-# avoid warnings due to egrep deprecation
-export EGREP="grep -E"
-
 # Use OpenBLAS on platforms where it is available and fallback to regular BLAS
 # on all others.
 case "$XBPS_TARGET_MACHINE" in
@@ -33,52 +35,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-
-# Package build options
-# TODO: some options are still missing, such as java, qrupdate
-build_options="
- arpack
- audio
- curl
- fftw3
- graphicsmagick
- gui
- hdf5
- imagemagick
- opengl
- openmp
- qhull
- zlib"
-
-vopt_conflict graphicsmagick imagemagick
-
-desc_option_arpack="Provides 'eigs' and 'svds' functions."
-desc_option_audio="Provides audiofile related functionality."
-desc_option_curl="Provides 'urlread' and 'urlwrite' functions and the 'ftp' class."
-desc_option_fftw3="Improves performance on discrete Fourier transforms."
-desc_option_gui="Graphical User Interface."
-desc_option_graphicsmagick="Provides 'imread' and 'imwrite' functions."
-desc_option_hdf5="Support for HDF data files."
-desc_option_imagemagick="Provides 'imread' and 'imwrite' functions."
-desc_option_qhull="Provides 'convhull{,n}', 'delaunay{,n}' and 'voronoi{,n}' functions."
-desc_option_openmp="Enable support for OpenMP SMP multi-threading"
-desc_option_zlib="Support for compressed data."
-
-build_options_default="
- arpack
- audio
- curl
- fftw3
- graphicsmagick
- gui
- opengl
- openmp
- qhull
- zlib"
-
 if [ -z "$CROSS_BUILD" ]; then
 	# hdf5 is nocross
-	build_options_default+=" hdf5"
+	makedepends+=" hdf5-devel"
 fi
 
 if [ -n "$CROSS_BUILD" ];then
@@ -88,20 +47,6 @@ if [ -n "$CROSS_BUILD" ];then
 	configure_args+=" ax_blas_integer_size=4"
 fi
 
-makedepends+="
- $(vopt_if arpack arpack-ng-devel)
- $(vopt_if audio 'libsndfile-devel portaudio-devel')
- $(vopt_if curl libcurl-devel)
- $(vopt_if fftw3 fftw-devel)
- $(vopt_if graphicsmagick libgraphicsmagick-devel)
- $(vopt_if gui 'qt6-base-devel qt6-tools-devel qt6-plugin-sqlite qscintilla-qt6-devel')
- $(vopt_if hdf5 hdf5-devel)
- $(vopt_if imagemagick libmagick-devel)
- $(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
- $(vopt_if openmp libgomp-devel)
- $(vopt_if qhull libqhull-devel)
- $(vopt_if zlib zlib-devel)"
-
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
 	ppc*) broken="fails to configure";;

Re: [WIP] octave: switch to qt6, fix cross-build

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/51607#issuecomment-2278459461

Comment:
This seems to be working fine now, with qt6. Can someone test the cross built pkg on aarch64?

@dkwo @a44881212


I will squash later. I'm trying to update hdf5 and see if it can be cross compiled.

Re: [WIP] octave: switch to qt6, fix cross-build

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51607#issuecomment-2280878286

Comment:
If the warnings on crosscompile are gone, I'd suggest to proceed: It will most likely be better than present (broken) situation.
I won't have access to aarch64 for a few more weeks, but I'll test it (and sage) later on.

Re: [PR PATCH] [Updated] [WIP] octave: switch to qt6, fix cross-build

[tornaria]

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

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

https://github.com/tornaria/void-packages octave
https://github.com/void-linux/void-packages/pull/51607

[WIP] octave: switch to qt6, fix cross-build
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I cross built the package for aarch64 before and after and the log shows clearly that qt5 was broken before and claims to be working now. But I don't have an aarch64 box to actually test if this fixes #51602.

Closes: #51602 (hopefully)

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

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

From 678989ca0d544ec10eea704535d81983f55fe80d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 6 Aug 2024 23:57:58 -0300
Subject: [PATCH 1/7] SuiteSparse: update to 7.8.1.

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

diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index b9b144e343bb40..db8e702cd98c13 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,6 +1,6 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
-version=7.7.0
+version=7.8.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=529b067f5d80981f45ddf6766627b8fc5af619822f068f342aab776e683df4f3
+checksum=b645488ec0d9b02ebdbf27d9ae307f705de2b6133edb64617a72c7b4c6c3ff44
 
 build_options="openblas"
 

From 7e6ca2d6beedff945355ab47267cf0d7509aa611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 15 Aug 2024 13:08:22 -0300
Subject: [PATCH 2/7] GraphicsMagick: update to 1.3.43, adopt.

---
 srcpkgs/GraphicsMagick/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index 4d87c91fd7e006..b8b9a113579f1c 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,6 +1,6 @@
 # Template file for 'GraphicsMagick'
 pkgname=GraphicsMagick
-version=1.3.40
+version=1.3.43
 revision=1
 build_style=gnu-configure
 configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
@@ -14,12 +14,12 @@ makedepends="perl libjpeg-turbo-devel libpng-devel tiff-devel libwebp-devel
  ${_develdepends}"
 depends="ghostscript"
 short_desc="GraphicsMagick Image Processing System"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="MIT"
 homepage="http://www.graphicsmagick.org/"
 changelog="https://sourceforge.net/p/graphicsmagick/code/ci/default/tree/NEWS.txt?format=raw"
-distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz"
-checksum=88ddbf76e1ced2ab6bcd743207ee308865de1afb4b645d460924dcc8bfc0ee85
+distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.xz"
+checksum=2b88580732cd7e409d9e22c6116238bef4ae06fcda11451bf33d259f9cbf399f
 keep_libtool_archives=yes
 
 post_install() {
@@ -45,7 +45,7 @@ libgraphicsmagick-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.la"
 		vmove "usr/share/man/man1/*-config.1"
-		vcopy ${wrksrc}/PerlMagick usr/share/doc/GraphicsMagick*/
+		vcopy ${wrksrc}/PerlMagick usr/share/doc/GraphicsMagick/
 		vdoc "${FILESDIR}/README.voidlinux"
 	}
 }

From c83ebf27aff223e76cc48de7d136037c2f3cf1f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 15 Aug 2024 22:53:50 -0300
Subject: [PATCH 3/7] hdf5: update to 1.14.4.3, fix cross.

---
 common/shlibs         | 12 ++++++------
 srcpkgs/hdf5/template | 22 +++++++++++++---------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4b2660a025f11f..850ba926bff4b5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2646,12 +2646,12 @@ libpjsip-ua.so.2 pjproject-2.8_5
 libpjsip.so.2 pjproject-2.8_5
 libpjsua.so.2 pjproject-2.8_5
 libpjsua2.so.2 pjproject-2.8_5
-libhdf5_hl.so.100 hdf5-1.10.1_2
-libhdf5.so.103 hdf5-1.10.4_1
-libhdf5_hl_cpp.so.100 hdf5-1.10.1_2
-libhdf5_cpp.so.103 hdf5-1.10.4_1
-libhdf5hl_fortran.so.100 hdf5-1.10.1_2
-libhdf5_fortran.so.102 hdf5-1.10.5_1
+libhdf5_hl.so.310 hdf5-1.14.4.3_1
+libhdf5.so.310 hdf5-1.14.4.3_1
+libhdf5_hl_cpp.so.310 hdf5-1.14.4.3_1
+libhdf5_cpp.so.310 hdf5-1.14.4.3_1
+libhdf5hl_fortran.so.310 hdf5-1.14.4.3_1
+libhdf5_fortran.so.310 hdf5-1.14.4.3_1
 libcryptmount.so.0 libpam-mount-2.15_1
 libglob.so.0 libglob-1.0_1
 libepub.so.0 ebook-tools-0.2.2_1
diff --git a/srcpkgs/hdf5/template b/srcpkgs/hdf5/template
index 915d287cd32f71..ce7521482ab418 100644
--- a/srcpkgs/hdf5/template
+++ b/srcpkgs/hdf5/template
@@ -1,22 +1,26 @@
 # Template file for 'hdf5'
 pkgname=hdf5
-version=1.10.5
-revision=2
+version=1.14.4.3
+revision=1
 build_style=gnu-configure
-configure_args="--enable-cxx --enable-fortran"
-hostmakedepends="gcc-fortran"
+configure_args="--enable-cxx"
+hostmakedepends="perl"
 makedepends="zlib-devel"
 short_desc="Data model, library, and file format for storing and managing data"
 maintainer="pulux <pulux@pf4sh.de>"
 license="custom:BSD-3-Clause-LBNL-alike"
-homepage="https://hdfgroup.org"
-distfiles="https://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-${version}.tar.gz"
-checksum=6d4ce8bf902a97b050f6f491f4268634e252a63dadd6656a1a9be5b7b7726fa8
-nocross="https://portal.hdfgroup.org/pages/viewpage.action?pageId=48808266"
+homepage="https://www.hdfgroup.org/solutions/hdf5/"
+distfiles="https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5_${version}.tar.gz"
+checksum=690c1db7ba0fed4ffac61709236675ffd99d95d191e8920ee79c58d7e7ea3361
+
+if [ -z "$CROSS_BUILD" ]; then
+	# fortran support needs to run programs to configure
+	configure_args+=" --enable-fortran"
+	hostmakedepends+=" gcc-fortran"
+fi
 
 post_install() {
 	vlicense COPYING
-	rm -rf ${DESTDIR}/usr/lib/libdynlib*.so
 }
 
 hdf5-devel_package() {

From 86ad76e01b91d264184d34d503f2db6eab1fabde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 2 Aug 2024 11:45:34 -0300
Subject: [PATCH 4/7] octave: fix qt5 in cross-build

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

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index b8f92fd8a6336d..0684158997fa5d 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,10 +1,10 @@
 # Template file for 'octave'
 pkgname=octave
 version=9.2.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-docs"
-hostmakedepends="perl gcc-fortran pkg-config"
+hostmakedepends="perl gcc-fortran pkg-config $(vopt_if gui qt5-host-tools)"
 makedepends="pcre2-devel readline-devel libSM-devel libltdl-devel lcms2-devel
  glpk-devel SuiteSparse-devel rapidjson"
 depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"

From e7d4a77acddc3163b5d8fa34223ed4c1e86d8407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 7 Aug 2024 21:21:20 -0300
Subject: [PATCH 5/7] octave: switch to qt6

---
 srcpkgs/octave/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 0684158997fa5d..6027367ad9a088 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -4,10 +4,10 @@ version=9.2.0
 revision=2
 build_style=gnu-configure
 configure_args="--disable-docs"
-hostmakedepends="perl gcc-fortran pkg-config $(vopt_if gui qt5-host-tools)"
+hostmakedepends="perl gcc-fortran pkg-config $(vopt_if gui 'qt6-base qt6-tools')"
 makedepends="pcre2-devel readline-devel libSM-devel libltdl-devel lcms2-devel
  glpk-devel SuiteSparse-devel rapidjson"
-depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+depends="$(vopt_if gui qt6-plugin-sqlite) texinfo"
 checkdepends="zip unzip ghostscript gnuplot tar texinfo"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
@@ -94,7 +94,7 @@ makedepends+="
  $(vopt_if curl libcurl-devel)
  $(vopt_if fftw3 fftw-devel)
  $(vopt_if graphicsmagick libgraphicsmagick-devel)
- $(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
+ $(vopt_if gui 'qt6-base-devel qt6-tools-devel qt6-plugin-sqlite qscintilla-qt6-devel')
  $(vopt_if hdf5 hdf5-devel)
  $(vopt_if imagemagick libmagick-devel)
  $(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")

From ad8c5cdc3fe197a544f788993a427aabf0112362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 8 Aug 2024 09:19:13 -0300
Subject: [PATCH 6/7] octave: add missing qt5compat, remove build options

---
 srcpkgs/octave/template | 73 +++++------------------------------------
 1 file changed, 9 insertions(+), 64 deletions(-)

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 6027367ad9a088..d49364bb9d0d05 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -3,11 +3,16 @@ pkgname=octave
 version=9.2.0
 revision=2
 build_style=gnu-configure
+build_helper=qmake6
 configure_args="--disable-docs"
-hostmakedepends="perl gcc-fortran pkg-config $(vopt_if gui 'qt6-base qt6-tools')"
+hostmakedepends="perl gcc-fortran pkg-config qt6-base qt6-tools"
 makedepends="pcre2-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel SuiteSparse-devel rapidjson"
-depends="$(vopt_if gui qt6-plugin-sqlite) texinfo"
+ glpk-devel SuiteSparse-devel rapidjson arpack-ng-devel libsndfile-devel
+ portaudio-devel libcurl-devel fftw-devel libgraphicsmagick-devel
+ qt6-base-devel qt6-tools-devel qt6-qt5compat-devel qt6-plugin-sqlite
+ qscintilla-qt6-devel glu-devel fltk-devel fontconfig-devel freetype-devel
+ gl2ps-devel libgomp-devel libqhull-devel zlib-devel"
+depends="qt6-plugin-sqlite texinfo"
 checkdepends="zip unzip ghostscript gnuplot tar texinfo"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
@@ -17,9 +22,6 @@ changelog="http://hg.savannah.gnu.org/hgweb/octave/raw-file/default/etc/NEWS.${v
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
 checksum=0636554b05996997e431caad4422c00386d2d7c68900472700fecf5ffeb7c991
 
-# avoid warnings due to egrep deprecation
-export EGREP="grep -E"
-
 # Use OpenBLAS on platforms where it is available and fallback to regular BLAS
 # on all others.
 case "$XBPS_TARGET_MACHINE" in
@@ -33,52 +35,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-
-# Package build options
-# TODO: some options are still missing, such as java, qrupdate
-build_options="
- arpack
- audio
- curl
- fftw3
- graphicsmagick
- gui
- hdf5
- imagemagick
- opengl
- openmp
- qhull
- zlib"
-
-vopt_conflict graphicsmagick imagemagick
-
-desc_option_arpack="Provides 'eigs' and 'svds' functions."
-desc_option_audio="Provides audiofile related functionality."
-desc_option_curl="Provides 'urlread' and 'urlwrite' functions and the 'ftp' class."
-desc_option_fftw3="Improves performance on discrete Fourier transforms."
-desc_option_gui="Graphical User Interface."
-desc_option_graphicsmagick="Provides 'imread' and 'imwrite' functions."
-desc_option_hdf5="Support for HDF data files."
-desc_option_imagemagick="Provides 'imread' and 'imwrite' functions."
-desc_option_qhull="Provides 'convhull{,n}', 'delaunay{,n}' and 'voronoi{,n}' functions."
-desc_option_openmp="Enable support for OpenMP SMP multi-threading"
-desc_option_zlib="Support for compressed data."
-
-build_options_default="
- arpack
- audio
- curl
- fftw3
- graphicsmagick
- gui
- opengl
- openmp
- qhull
- zlib"
-
 if [ -z "$CROSS_BUILD" ]; then
 	# hdf5 is nocross
-	build_options_default+=" hdf5"
+	makedepends+=" hdf5-devel"
 fi
 
 if [ -n "$CROSS_BUILD" ];then
@@ -88,20 +47,6 @@ if [ -n "$CROSS_BUILD" ];then
 	configure_args+=" ax_blas_integer_size=4"
 fi
 
-makedepends+="
- $(vopt_if arpack arpack-ng-devel)
- $(vopt_if audio 'libsndfile-devel portaudio-devel')
- $(vopt_if curl libcurl-devel)
- $(vopt_if fftw3 fftw-devel)
- $(vopt_if graphicsmagick libgraphicsmagick-devel)
- $(vopt_if gui 'qt6-base-devel qt6-tools-devel qt6-plugin-sqlite qscintilla-qt6-devel')
- $(vopt_if hdf5 hdf5-devel)
- $(vopt_if imagemagick libmagick-devel)
- $(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
- $(vopt_if openmp libgomp-devel)
- $(vopt_if qhull libqhull-devel)
- $(vopt_if zlib zlib-devel)"
-
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
 	ppc*) broken="fails to configure";;

From 65d3c613d1e032f67b352637b9a5ab2fa995e14b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 15 Aug 2024 23:15:42 -0300
Subject: [PATCH 7/7] octave: use hdf5 unconditionally

---
 srcpkgs/octave/template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index d49364bb9d0d05..c692d873dfaae3 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -11,7 +11,7 @@ makedepends="pcre2-devel readline-devel libSM-devel libltdl-devel lcms2-devel
  portaudio-devel libcurl-devel fftw-devel libgraphicsmagick-devel
  qt6-base-devel qt6-tools-devel qt6-qt5compat-devel qt6-plugin-sqlite
  qscintilla-qt6-devel glu-devel fltk-devel fontconfig-devel freetype-devel
- gl2ps-devel libgomp-devel libqhull-devel zlib-devel"
+ gl2ps-devel libgomp-devel libqhull-devel zlib-devel hdf5-devel"
 depends="qt6-plugin-sqlite texinfo"
 checkdepends="zip unzip ghostscript gnuplot tar texinfo"
 short_desc="High-level language, primarily intended for numerical computations"
@@ -35,11 +35,6 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-if [ -z "$CROSS_BUILD" ]; then
-	# hdf5 is nocross
-	makedepends+=" hdf5-devel"
-fi
-
 if [ -n "$CROSS_BUILD" ];then
 	# cross build cannot determine integer size for BLAS
 	# our BLAS (lapack and openblas) are built with 32 bit ints

Re: [WIP] octave: switch to qt6, fix cross-build

[tornaria]

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/51607#issuecomment-2294933813

Comment:
The failures are because the `hdf5` update requires a bunch of packages to be rebuilt. Not so easy it seems...

Re: [PR PATCH] [Updated] [WIP] octave: switch to qt6, fix cross-build

[tornaria]

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

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

https://github.com/tornaria/void-packages octave
https://github.com/void-linux/void-packages/pull/51607

[WIP] octave: switch to qt6, fix cross-build
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I cross built the package for aarch64 before and after and the log shows clearly that qt5 was broken before and claims to be working now. But I don't have an aarch64 box to actually test if this fixes #51602.

Closes: #51602 (hopefully)

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

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

From 451659506d4aa4c69883732dcc6185fcf1915205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 6 Aug 2024 23:57:58 -0300
Subject: [PATCH 1/3] SuiteSparse: update to 7.8.1.

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

diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index b9b144e343bb40..db8e702cd98c13 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,6 +1,6 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
-version=7.7.0
+version=7.8.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=529b067f5d80981f45ddf6766627b8fc5af619822f068f342aab776e683df4f3
+checksum=b645488ec0d9b02ebdbf27d9ae307f705de2b6133edb64617a72c7b4c6c3ff44
 
 build_options="openblas"
 

From 0fb857a6549883c465e949a292e6f086c5654edb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 15 Aug 2024 13:08:22 -0300
Subject: [PATCH 2/3] GraphicsMagick: update to 1.3.43, adopt.

---
 srcpkgs/GraphicsMagick/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index 4d87c91fd7e006..b8b9a113579f1c 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,6 +1,6 @@
 # Template file for 'GraphicsMagick'
 pkgname=GraphicsMagick
-version=1.3.40
+version=1.3.43
 revision=1
 build_style=gnu-configure
 configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
@@ -14,12 +14,12 @@ makedepends="perl libjpeg-turbo-devel libpng-devel tiff-devel libwebp-devel
  ${_develdepends}"
 depends="ghostscript"
 short_desc="GraphicsMagick Image Processing System"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="MIT"
 homepage="http://www.graphicsmagick.org/"
 changelog="https://sourceforge.net/p/graphicsmagick/code/ci/default/tree/NEWS.txt?format=raw"
-distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz"
-checksum=88ddbf76e1ced2ab6bcd743207ee308865de1afb4b645d460924dcc8bfc0ee85
+distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.xz"
+checksum=2b88580732cd7e409d9e22c6116238bef4ae06fcda11451bf33d259f9cbf399f
 keep_libtool_archives=yes
 
 post_install() {
@@ -45,7 +45,7 @@ libgraphicsmagick-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.la"
 		vmove "usr/share/man/man1/*-config.1"
-		vcopy ${wrksrc}/PerlMagick usr/share/doc/GraphicsMagick*/
+		vcopy ${wrksrc}/PerlMagick usr/share/doc/GraphicsMagick/
 		vdoc "${FILESDIR}/README.voidlinux"
 	}
 }

From 8fa5cf9a578fa05009b9552b9cd69e33eded10bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 2 Aug 2024 11:45:34 -0300
Subject: [PATCH 3/3] octave: switch to qt6, fix cross, remove build options

---
 srcpkgs/octave/template | 75 ++++++-----------------------------------
 1 file changed, 10 insertions(+), 65 deletions(-)

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index b8f92fd8a6336d..d49364bb9d0d05 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,13 +1,18 @@
 # Template file for 'octave'
 pkgname=octave
 version=9.2.0
-revision=1
+revision=2
 build_style=gnu-configure
+build_helper=qmake6
 configure_args="--disable-docs"
-hostmakedepends="perl gcc-fortran pkg-config"
+hostmakedepends="perl gcc-fortran pkg-config qt6-base qt6-tools"
 makedepends="pcre2-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel SuiteSparse-devel rapidjson"
-depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+ glpk-devel SuiteSparse-devel rapidjson arpack-ng-devel libsndfile-devel
+ portaudio-devel libcurl-devel fftw-devel libgraphicsmagick-devel
+ qt6-base-devel qt6-tools-devel qt6-qt5compat-devel qt6-plugin-sqlite
+ qscintilla-qt6-devel glu-devel fltk-devel fontconfig-devel freetype-devel
+ gl2ps-devel libgomp-devel libqhull-devel zlib-devel"
+depends="qt6-plugin-sqlite texinfo"
 checkdepends="zip unzip ghostscript gnuplot tar texinfo"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
@@ -17,9 +22,6 @@ changelog="http://hg.savannah.gnu.org/hgweb/octave/raw-file/default/etc/NEWS.${v
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
 checksum=0636554b05996997e431caad4422c00386d2d7c68900472700fecf5ffeb7c991
 
-# avoid warnings due to egrep deprecation
-export EGREP="grep -E"
-
 # Use OpenBLAS on platforms where it is available and fallback to regular BLAS
 # on all others.
 case "$XBPS_TARGET_MACHINE" in
@@ -33,52 +35,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-
-# Package build options
-# TODO: some options are still missing, such as java, qrupdate
-build_options="
- arpack
- audio
- curl
- fftw3
- graphicsmagick
- gui
- hdf5
- imagemagick
- opengl
- openmp
- qhull
- zlib"
-
-vopt_conflict graphicsmagick imagemagick
-
-desc_option_arpack="Provides 'eigs' and 'svds' functions."
-desc_option_audio="Provides audiofile related functionality."
-desc_option_curl="Provides 'urlread' and 'urlwrite' functions and the 'ftp' class."
-desc_option_fftw3="Improves performance on discrete Fourier transforms."
-desc_option_gui="Graphical User Interface."
-desc_option_graphicsmagick="Provides 'imread' and 'imwrite' functions."
-desc_option_hdf5="Support for HDF data files."
-desc_option_imagemagick="Provides 'imread' and 'imwrite' functions."
-desc_option_qhull="Provides 'convhull{,n}', 'delaunay{,n}' and 'voronoi{,n}' functions."
-desc_option_openmp="Enable support for OpenMP SMP multi-threading"
-desc_option_zlib="Support for compressed data."
-
-build_options_default="
- arpack
- audio
- curl
- fftw3
- graphicsmagick
- gui
- opengl
- openmp
- qhull
- zlib"
-
 if [ -z "$CROSS_BUILD" ]; then
 	# hdf5 is nocross
-	build_options_default+=" hdf5"
+	makedepends+=" hdf5-devel"
 fi
 
 if [ -n "$CROSS_BUILD" ];then
@@ -88,20 +47,6 @@ if [ -n "$CROSS_BUILD" ];then
 	configure_args+=" ax_blas_integer_size=4"
 fi
 
-makedepends+="
- $(vopt_if arpack arpack-ng-devel)
- $(vopt_if audio 'libsndfile-devel portaudio-devel')
- $(vopt_if curl libcurl-devel)
- $(vopt_if fftw3 fftw-devel)
- $(vopt_if graphicsmagick libgraphicsmagick-devel)
- $(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
- $(vopt_if hdf5 hdf5-devel)
- $(vopt_if imagemagick libmagick-devel)
- $(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
- $(vopt_if openmp libgomp-devel)
- $(vopt_if qhull libqhull-devel)
- $(vopt_if zlib zlib-devel)"
-
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
 	ppc*) broken="fails to configure";;

Re: [PR REVIEW] octave: switch to qt6, fix cross-build

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51607#discussion_r1721078481

Comment:
```suggestion
		vcopy PerlMagick usr/share/doc/GraphicsMagick/
```
PWD should be $wrksrc already

Re: [PR PATCH] [Updated] octave: switch to qt6, fix cross-build

[tornaria]

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

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

https://github.com/tornaria/void-packages octave
https://github.com/void-linux/void-packages/pull/51607

octave: switch to qt6, fix cross-build
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

I cross built the package for aarch64 before and after and the log shows clearly that qt5 was broken before and claims to be working now. But I don't have an aarch64 box to actually test if this fixes #51602.

Closes: #51602 (hopefully)

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

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

From 451659506d4aa4c69883732dcc6185fcf1915205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 6 Aug 2024 23:57:58 -0300
Subject: [PATCH 1/3] SuiteSparse: update to 7.8.1.

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

diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index b9b144e343bb40..db8e702cd98c13 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,6 +1,6 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
-version=7.7.0
+version=7.8.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=529b067f5d80981f45ddf6766627b8fc5af619822f068f342aab776e683df4f3
+checksum=b645488ec0d9b02ebdbf27d9ae307f705de2b6133edb64617a72c7b4c6c3ff44
 
 build_options="openblas"
 

From 512f206e175b89ef3b00c07aba812b3c5286a487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 15 Aug 2024 13:08:22 -0300
Subject: [PATCH 2/3] GraphicsMagick: update to 1.3.43, adopt.

---
 srcpkgs/GraphicsMagick/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index 4d87c91fd7e006..1c2c3a6e9ec8ca 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,6 +1,6 @@
 # Template file for 'GraphicsMagick'
 pkgname=GraphicsMagick
-version=1.3.40
+version=1.3.43
 revision=1
 build_style=gnu-configure
 configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
@@ -14,12 +14,12 @@ makedepends="perl libjpeg-turbo-devel libpng-devel tiff-devel libwebp-devel
  ${_develdepends}"
 depends="ghostscript"
 short_desc="GraphicsMagick Image Processing System"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="MIT"
 homepage="http://www.graphicsmagick.org/"
 changelog="https://sourceforge.net/p/graphicsmagick/code/ci/default/tree/NEWS.txt?format=raw"
-distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz"
-checksum=88ddbf76e1ced2ab6bcd743207ee308865de1afb4b645d460924dcc8bfc0ee85
+distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.xz"
+checksum=2b88580732cd7e409d9e22c6116238bef4ae06fcda11451bf33d259f9cbf399f
 keep_libtool_archives=yes
 
 post_install() {
@@ -45,7 +45,7 @@ libgraphicsmagick-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.la"
 		vmove "usr/share/man/man1/*-config.1"
-		vcopy ${wrksrc}/PerlMagick usr/share/doc/GraphicsMagick*/
+		vcopy PerlMagick usr/share/doc/GraphicsMagick/
 		vdoc "${FILESDIR}/README.voidlinux"
 	}
 }

From d40fc3781dd3ebfc50fd0cee129081e98805f4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 2 Aug 2024 11:45:34 -0300
Subject: [PATCH 3/3] octave: switch to qt6, fix cross, remove build options

---
 srcpkgs/octave/template | 75 ++++++-----------------------------------
 1 file changed, 10 insertions(+), 65 deletions(-)

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index b8f92fd8a6336d..d49364bb9d0d05 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,13 +1,18 @@
 # Template file for 'octave'
 pkgname=octave
 version=9.2.0
-revision=1
+revision=2
 build_style=gnu-configure
+build_helper=qmake6
 configure_args="--disable-docs"
-hostmakedepends="perl gcc-fortran pkg-config"
+hostmakedepends="perl gcc-fortran pkg-config qt6-base qt6-tools"
 makedepends="pcre2-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel SuiteSparse-devel rapidjson"
-depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+ glpk-devel SuiteSparse-devel rapidjson arpack-ng-devel libsndfile-devel
+ portaudio-devel libcurl-devel fftw-devel libgraphicsmagick-devel
+ qt6-base-devel qt6-tools-devel qt6-qt5compat-devel qt6-plugin-sqlite
+ qscintilla-qt6-devel glu-devel fltk-devel fontconfig-devel freetype-devel
+ gl2ps-devel libgomp-devel libqhull-devel zlib-devel"
+depends="qt6-plugin-sqlite texinfo"
 checkdepends="zip unzip ghostscript gnuplot tar texinfo"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
@@ -17,9 +22,6 @@ changelog="http://hg.savannah.gnu.org/hgweb/octave/raw-file/default/etc/NEWS.${v
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
 checksum=0636554b05996997e431caad4422c00386d2d7c68900472700fecf5ffeb7c991
 
-# avoid warnings due to egrep deprecation
-export EGREP="grep -E"
-
 # Use OpenBLAS on platforms where it is available and fallback to regular BLAS
 # on all others.
 case "$XBPS_TARGET_MACHINE" in
@@ -33,52 +35,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-
-# Package build options
-# TODO: some options are still missing, such as java, qrupdate
-build_options="
- arpack
- audio
- curl
- fftw3
- graphicsmagick
- gui
- hdf5
- imagemagick
- opengl
- openmp
- qhull
- zlib"
-
-vopt_conflict graphicsmagick imagemagick
-
-desc_option_arpack="Provides 'eigs' and 'svds' functions."
-desc_option_audio="Provides audiofile related functionality."
-desc_option_curl="Provides 'urlread' and 'urlwrite' functions and the 'ftp' class."
-desc_option_fftw3="Improves performance on discrete Fourier transforms."
-desc_option_gui="Graphical User Interface."
-desc_option_graphicsmagick="Provides 'imread' and 'imwrite' functions."
-desc_option_hdf5="Support for HDF data files."
-desc_option_imagemagick="Provides 'imread' and 'imwrite' functions."
-desc_option_qhull="Provides 'convhull{,n}', 'delaunay{,n}' and 'voronoi{,n}' functions."
-desc_option_openmp="Enable support for OpenMP SMP multi-threading"
-desc_option_zlib="Support for compressed data."
-
-build_options_default="
- arpack
- audio
- curl
- fftw3
- graphicsmagick
- gui
- opengl
- openmp
- qhull
- zlib"
-
 if [ -z "$CROSS_BUILD" ]; then
 	# hdf5 is nocross
-	build_options_default+=" hdf5"
+	makedepends+=" hdf5-devel"
 fi
 
 if [ -n "$CROSS_BUILD" ];then
@@ -88,20 +47,6 @@ if [ -n "$CROSS_BUILD" ];then
 	configure_args+=" ax_blas_integer_size=4"
 fi
 
-makedepends+="
- $(vopt_if arpack arpack-ng-devel)
- $(vopt_if audio 'libsndfile-devel portaudio-devel')
- $(vopt_if curl libcurl-devel)
- $(vopt_if fftw3 fftw-devel)
- $(vopt_if graphicsmagick libgraphicsmagick-devel)
- $(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
- $(vopt_if hdf5 hdf5-devel)
- $(vopt_if imagemagick libmagick-devel)
- $(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
- $(vopt_if openmp libgomp-devel)
- $(vopt_if qhull libqhull-devel)
- $(vopt_if zlib zlib-devel)"
-
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
 	ppc*) broken="fails to configure";;

Re: [PR REVIEW] octave: switch to qt6, fix cross-build

[tornaria]

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

New review comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/51607#discussion_r1721104534

Comment:
Good catch, done. Only change in the force-push.

Re: octave: switch to qt6, fix cross-build

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/51607#issuecomment-2308936826

Comment:
@tornaria The crosscompiled octave has a working gui, as expected. Thanks!

Re: [PR PATCH] [Merged]: octave: switch to qt6, fix cross-build

[classabbyamp]

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

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

octave: switch to qt6, fix cross-build
https://github.com/void-linux/void-packages/pull/51607

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

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

I cross built the package for aarch64 before and after and the log shows clearly that qt5 was broken before and claims to be working now. But I don't have an aarch64 box to actually test if this fixes #51602.

Closes: #51602 (hopefully)

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