From c97e0dcba4c601ea330aabb2f7eaa51eb72a3a93 Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Wed, 10 Jul 2024 23:36:29 -0500 Subject: academic/octave: Updated for version 9.2.0 Signed-off-by: Kyle Guinn Signed-off-by: Willy Sudiarto Raharjo --- academic/octave/octave.SlackBuild | 3 +- academic/octave/octave.info | 6 +- .../patches/suitesparse-old-pkgconfig-names.diff | 102 +++++++++++++++++++++ 3 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 academic/octave/patches/suitesparse-old-pkgconfig-names.diff diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild index 7fba88f533..34d41bef89 100644 --- a/academic/octave/octave.SlackBuild +++ b/academic/octave/octave.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=octave -VERSION=${VERSION:-8.4.0} +VERSION=${VERSION:-9.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -94,6 +94,7 @@ chown -R root:root . chmod -R u+w,go-w,a+rX-st . patch -p1 < $CWD/patches/atlas-lib-rename.diff +patch -p1 < $CWD/patches/suitesparse-old-pkgconfig-names.diff autoreconf -vif # Avoid rebuilding the documentation by making stamp-vti newer than its diff --git a/academic/octave/octave.info b/academic/octave/octave.info index 13eccf569d..21367176d9 100644 --- a/academic/octave/octave.info +++ b/academic/octave/octave.info @@ -1,8 +1,8 @@ PRGNAM="octave" -VERSION="8.4.0" +VERSION="9.2.0" HOMEPAGE="https://www.gnu.org/software/octave/" -DOWNLOAD="https://ftpmirror.gnu.org/gnu/octave/octave-8.4.0.tar.lz" -MD5SUM="c7146cef6666200c5c835ecacf950804" +DOWNLOAD="https://ftpmirror.gnu.org/gnu/octave/octave-9.2.0.tar.lz" +MD5SUM="0afc72f9bb5f6e8d13d8e1ed745e71b5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README% lapack" diff --git a/academic/octave/patches/suitesparse-old-pkgconfig-names.diff b/academic/octave/patches/suitesparse-old-pkgconfig-names.diff new file mode 100644 index 0000000000..3ffaeba429 --- /dev/null +++ b/academic/octave/patches/suitesparse-old-pkgconfig-names.diff @@ -0,0 +1,102 @@ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -2164,7 +2164,7 @@ + [], [], [SuiteSparse_time], [], + [don't link directly with suitesparseconfig library], + [], +- SuiteSparse_config) ++ suitesparseconfig) + LIBS="$save_LIBS" + + if test -n "$SUITESPARSECONFIG_LIBS" && test -n "$LIB_CLOCK_GETTIME"; then +@@ -2183,7 +2183,7 @@ + [amd_postorder], + [], [don't use AMD library, disable some sparse matrix functionality], + [], +- AMD) ++ amd) + + ### Check for CAMD library. + +@@ -2193,7 +2193,7 @@ + [camd_postorder], + [], [don't use CAMD library, disable some sparse matrix functionality], + [], +- CAMD) ++ camd) + + ### Check for COLAMD library. + +@@ -2203,7 +2203,7 @@ + [colamd], + [], [don't use COLAMD library, disable some sparse matrix functionality], + [], +- COLAMD) ++ colamd) + + ### Check for CCOLAMD library. + +@@ -2213,7 +2213,7 @@ + [ccolamd], + [], [don't use CCOLAMD library, disable some sparse matrix functionality], + [], +- CCOLAMD) ++ ccolamd) + + ### Check for CHOLMOD library. + dnl If your cholmod library requires cblas, then you will need to configure +@@ -2227,7 +2227,7 @@ + [cholmod${CHOLMOD_TAG}start], + [], [don't use CHOLMOD library, disable some sparse matrix functionality], + [], +- CHOLMOD) ++ cholmod) + LIBS="$save_LIBS" + + ### Check for SPQR library. +@@ -2240,7 +2240,7 @@ + [SuiteSparseQR_C], + [C++], [don't use SPQR library, disable some sparse matrix functionality], + [], +- SPQR) ++ spqr) + LIBS="$save_LIBS" + + ### Check for CXSparse library. +@@ -2251,7 +2251,7 @@ + [cs${CXSPARSE_TAG}sqr], + [C++], [don't use CXSparse library, disable some sparse matrix functionality], + [], +- CXSparse) ++ cxsparse) + + if test -n "$CXSPARSE_LIBS"; then + ## Additional check for CXSparse version >= 2.2 +@@ -2275,7 +2275,7 @@ + [umfpack${UMFPACK_TAG}get_determinant], + [], [don't use UMFPACK, disable some sparse matrix functionality], + [], +- UMFPACK) ++ umfpack) + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" + +@@ -2291,7 +2291,7 @@ + [umfpack${UMFPACK_TAG}get_determinant], + [], [don't use UMFPACK, disable some sparse matrix functionality], + [], +- UMFPACK) ++ umfpack) + if test -n "$UMFPACK_LIBS"; then + UMFPACK_LIBS="$UMFPACK_LIBS -lcblas" + fi +@@ -2305,7 +2305,7 @@ + [klu.h suitesparse/klu.h klu/klu.h], [klu_solve], + [], [don't use KLU library, disable some sparse matrix functionality], + [], +- KLU) ++ klu) + + ## Restore LIBS after all suitesparse configuration tests + LIBS="$suitesparse_save_LIBS" -- cgit v1.2.3-79-gdb01