Date: Thursday, January 19, 2023 @ 19:06:09
Author: arojas
Revision: 1387019
upgpkg: octave 7.3.0-5: suitesparse 7.0 rebuild
Added:
octave/trunk/suitesparse-7.patch
Modified:
octave/trunk/PKGBUILD
---------------------+
PKGBUILD | 12 +++++++++---
suitesparse-7.patch | 18 ++++++++++++++++++
2 files changed, 27 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-19 18:57:50 UTC (rev 1387018)
+++ PKGBUILD 2023-01-19 19:06:09 UTC (rev 1387019)
@@ -4,7 +4,7 @@
pkgname=octave
pkgver=7.3.0
-pkgrel=4
+pkgrel=5
pkgdesc="A high-level language, primarily intended for numerical computations"
arch=('x86_64')
url="https://www.gnu.org/software/octave/";
@@ -18,12 +18,18 @@
'java-runtime: java support'
'fltk: FLTK GUI'
'texlive-bin: for the publish command')
-source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
+source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
+ suitesparse-7.patch)
options=('!emptydirs')
validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton
sha512sums=('1289d22582f3b23d3cc843d2fc73e401371802ac6eab837026fd51170e78a2ae1cbaa856b9aad84e47d8e177345e8053b673280db411da5ab1164c6efa17b58c'
- 'SKIP')
+ 'SKIP'
+
'0312bfa9662d6c0eafa60fde29d37ef9f6e3e095e2cbb7846dc5b4b4b989a67534068f17db854813cc0b1b5e25b0013e70dcd8c899380714a73122fa33011714')
+prepare() {
+ patch -d $pkgname-$pkgver -p1 < suitesparse-7.patch # Fix build with
suitesparse 7
+}
+
build() {
cd ${pkgname}-${pkgver}
Added: suitesparse-7.patch
===================================================================
--- suitesparse-7.patch (rev 0)
+++ suitesparse-7.patch 2023-01-19 19:06:09 UTC (rev 1387019)
@@ -0,0 +1,18 @@
+diff --git a/liboctave/util/oct-sparse.h b/liboctave/util/oct-sparse.h
+index 0f631797b6..703238cacd 100644
+--- a/liboctave/util/oct-sparse.h
++++ b/liboctave/util/oct-sparse.h
+@@ -92,7 +92,12 @@
+ // Cope with new 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_CONFIG_SET(name) SuiteSparse_config_ ## name ## _set
++# define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign)
(SUITESPARSE_CONFIG_SET(f_name)(f_assign))
++# define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign)
(SUITESPARSE_CONFIG_SET(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))
