Date: Wednesday, March 8, 2023 @ 15:32:40 Author: arojas Revision: 1416839
upgpkg: octave 8.1.0-1: Update to 8.1.0 Modified: octave/trunk/PKGBUILD Deleted: octave/trunk/suitesparse-7.patch ---------------------+ PKGBUILD | 16 +++++----------- suitesparse-7.patch | 18 ------------------ 2 files changed, 5 insertions(+), 29 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-03-08 15:07:29 UTC (rev 1416838) +++ PKGBUILD 2023-03-08 15:32:40 UTC (rev 1416839) @@ -3,8 +3,8 @@ # Contributor : cyberdune <[email protected]> pkgname=octave -pkgver=7.3.0 -pkgrel=5 +pkgver=8.1.0 +pkgrel=1 pkgdesc="A high-level language, primarily intended for numerical computations" arch=('x86_64') url="https://www.gnu.org/software/octave/"; @@ -18,18 +18,12 @@ '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} - suitesparse-7.patch) +source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}) options=('!emptydirs') validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton -sha512sums=('1289d22582f3b23d3cc843d2fc73e401371802ac6eab837026fd51170e78a2ae1cbaa856b9aad84e47d8e177345e8053b673280db411da5ab1164c6efa17b58c' - 'SKIP' - '0312bfa9662d6c0eafa60fde29d37ef9f6e3e095e2cbb7846dc5b4b4b989a67534068f17db854813cc0b1b5e25b0013e70dcd8c899380714a73122fa33011714') +sha512sums=('332489586857f88e95fa7ff87c681ed61e7b6aff32d55fc1723584131e3c220e44c177fb210303743494a9c88e1e0b7ae7a355df52976428e7607f83df402314' + 'SKIP') -prepare() { - patch -d $pkgname-$pkgver -p1 < suitesparse-7.patch # Fix build with suitesparse 7 -} - build() { cd ${pkgname}-${pkgver} Deleted: suitesparse-7.patch =================================================================== --- suitesparse-7.patch 2023-03-08 15:07:29 UTC (rev 1416838) +++ suitesparse-7.patch 2023-03-08 15:32:40 UTC (rev 1416839) @@ -1,18 +0,0 @@ -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))
