[packages/octave] - updated to 5.2.0 (new sonames) - removed obsolete c++ patch - removed suitesparse patch, switched
qboosh
qboosh at pld-linux.org
Fri Jan 13 20:57:39 CET 2023
commit c043dc54e615f78edf70624f6af144d446018b50
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jan 13 20:58:47 2023 +0100
- updated to 5.2.0 (new sonames)
- removed obsolete c++ patch
- removed suitesparse patch, switched to SuiteSparse-* packages
octave-c++.patch | 11 ---
octave-info.patch | 6 +-
octave-suitesparse.patch | 251 -----------------------------------------------
octave.spec | 89 ++++++++++-------
4 files changed, 56 insertions(+), 301 deletions(-)
---
diff --git a/octave.spec b/octave.spec
index 7d172d6..e0dc01c 100644
--- a/octave.spec
+++ b/octave.spec
@@ -23,36 +23,34 @@ Summary(ru.UTF-8): GNU Octave - Язык высокого уровня для в
Summary(sv.UTF-8): GNU Octave - ett högninvåspråk för numeriska beräkningar
Summary(zh_CN.UTF-8): GNU Octave - 用于数字计算的高级语言。
Name: octave
-Version: 4.4.1
+Version: 5.2.0
Release: 1
Epoch: 2
License: GPL v3+
Group: Applications/Math
Source0: https://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.lz
-# Source0-md5: e0d9556caafd83e4276af49b06c5c994
+# Source0-md5: 3c621e85026d4a807f5639901a41ae71
Source1: %{name}.desktop
Patch0: %{name}-info.patch
Patch1: %{name}-build.patch
-Patch2: %{name}-suitesparse.patch
Patch3: octdirs.patch
-Patch4: %{name}-c++.patch
Patch5: %{name}-no-tex-docs.patch
Patch6: %{name}-qthelp-texinfo7.patch
URL: http://www.octave.org/
# TODO: SUNDIALS NVECTOR, IDA libraries
-BuildRequires: AMD-devel >= 2.4.0
-BuildRequires: CAMD-devel
-BuildRequires: CCOLAMD-devel
-BuildRequires: CHOLMOD-devel >= 2.2.0
-BuildRequires: COLAMD-devel
-# CXSparse >= 2.2, but package has version 0
-BuildRequires: CXSparse-devel
BuildRequires: GraphicsMagick-c++-devel
-BuildRequires: KLU-devel
BuildRequires: Mesa-libOSMesa-devel >= 9.0.0
BuildRequires: OpenGL-devel
BuildRequires: OpenGL-GLU-devel
-BuildRequires: UMFPACK-devel
+BuildRequires: SuiteSparse-AMD-devel >= 2.4.0
+BuildRequires: SuiteSparse-CAMD-devel
+BuildRequires: SuiteSparse-CCOLAMD-devel
+BuildRequires: SuiteSparse-CHOLMOD-devel >= 2.2.0
+BuildRequires: SuiteSparse-COLAMD-devel
+BuildRequires: SuiteSparse-CXSparse-devel >= 2.2.0
+BuildRequires: SuiteSparse-KLU-devel
+BuildRequires: SuiteSparse-UMFPACK-devel
+BuildRequires: SuiteSparse-config-devel
# arpack-ng >= 3.3.0
BuildRequires: arpack-devel >= 2.1-8
BuildRequires: autoconf >= 2.63
@@ -103,13 +101,13 @@ BuildRequires: xorg-lib-libXft-devel
BuildRequires: zlib-devel
%if %{with gui}
%if %{with qt4}
-BuildRequires: QtCore-devel >= 4
-BuildRequires: QtGui-devel >= 4
-BuildRequires: QtNetwork-devel >= 4
+BuildRequires: QtCore-devel >= 4.8
+BuildRequires: QtGui-devel >= 4.8
+BuildRequires: QtNetwork-devel >= 4.8
BuildRequires: qscintilla2-qt4-devel >= 2.6.0
-BuildRequires: qt4-assistant >= 4
-BuildRequires: qt4-build >= 4
-BuildRequires: qt4-linguist >= 4
+BuildRequires: qt4-assistant >= 4.8
+BuildRequires: qt4-build >= 4.8
+BuildRequires: qt4-linguist >= 4.8
%else
BuildRequires: Qt5Core-devel >= 5
BuildRequires: Qt5Gui-devel >= 5
@@ -124,14 +122,15 @@ BuildRequires: qt5-linguist >= 5
%endif
%endif
Requires(post,postun): /sbin/ldconfig
-Requires: AMD >= 2.4.0
-Requires: CHOLMOD >= 2.2.0
+Requires: SuiteSparse-AMD >= 2.4.0
+Requires: SuiteSparse-CHOLMOD >= 2.2.0
+Requires: SuiteSparse-CXSparse >= 2.2.0
Requires: freetype >= 2.0.9
Requires: gnuplot
Suggests: GraphicsMagick
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define api_dir api-v52
+%define api_dir api-v53
%description
GNU Octave is a high-level language, primarily intended for numerical
@@ -350,7 +349,27 @@ Summary: Header files and devel docs for Octave
Summary(pl.UTF-8): Pliki nagłówkowe i dodatkowa dokumentacja Octave
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: SuiteSparse-AMD-devel >= 2.4.0
+Requires: SuiteSparse-CAMD-devel
+Requires: SuiteSparse-CCOLAMD-devel
+Requires: SuiteSparse-CHOLMOD-devel >= 2.2.0
+Requires: SuiteSparse-COLAMD-devel
+Requires: SuiteSparse-CXSparse-devel >= 2.2.0
+Requires: SuiteSparse-KLU-devel
+Requires: SuiteSparse-UMFPACK-devel
+Requires: SuiteSparse-config-devel
+Requires: arpack-devel >= 2.1-8
+Requires: blas-devel
+Requires: curl-devel
+Requires: fftw3-devel
+Requires: fftw3-single-devel
+Requires: gcc-fortran >= 6:4.0
Requires: hdf5-devel >= 1.6.0
+Requires: lapack-devel >= 3.1.1-3
+Requires: ncurses-devel >= 5.0
+Requires: pcre-devel
+Requires: qrupdate-devel
+Requires: readline-devel
%description devel
Header files and devel docs for Octave.
@@ -362,9 +381,7 @@ Pliki nagłówkowe i dodatkowa dokumentacja Octave.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
%patch6 -p1
@@ -380,18 +397,12 @@ export CLASSPATH=.
# but gets only qt4 (QtCore, QtGui, QtNetwork) libraries;
# pass qt4 tools for consistency (qt5 tools refer to e.g. Qt5 specific headers)
%configure \
+%if %{with qt4}
MOC=moc-qt4 \
UIC=uic-qt4 \
RCC=rcc \
LRELEASE=lrelease-qt4 \
- --with-amd-includedir=%{_includedir}/amd \
- --with-camd-includedir=%{_includedir}/camd \
- --with-cholmod-includedir=%{_includedir}/cholmod \
- --with-colamd-includedir=%{_includedir}/colamd \
- --with-ccolamd-includedir=%{_includedir}/ccolamd \
- --with-cxsparse-includedir=%{_includedir}/cxsparse \
- --with-umfpack-includedir=%{_includedir}/umfpack \
- --enable-dl \
+%endif
%{?with_gui:--with-qt=%{?with_qt4:4}%{!?with_qt4:5}} \
%{!?with_gui:--disable-gui} \
%{!?with_java:--disable-java} \
@@ -454,9 +465,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/octave-cli
%attr(755,root,root) %{_bindir}/octave-cli-%{version}
%attr(755,root,root) %{_libdir}/liboctave.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liboctave.so.6
+%attr(755,root,root) %ghost %{_libdir}/liboctave.so.7
%attr(755,root,root) %{_libdir}/liboctinterp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liboctinterp.so.6
+%attr(755,root,root) %ghost %{_libdir}/liboctinterp.so.7
%if "%{_libexecdir}" != "%{_libdir}"
%dir %{_libexecdir}/octave
%dir %{_libexecdir}/octave/%{version}
@@ -507,6 +518,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/octave/%{version}/imagelib
%dir %{_datadir}/octave/%{version}/m
%{_datadir}/octave/%{version}/m/+containers
+%{_datadir}/octave/%{version}/m/+matlab
%{_datadir}/octave/%{version}/m/@ftp
%{_datadir}/octave/%{version}/m/audio
%{_datadir}/octave/%{version}/m/deprecated
@@ -517,6 +529,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/octave/%{version}/m/help
%{_datadir}/octave/%{version}/m/image
%{_datadir}/octave/%{version}/m/io
+%{_datadir}/octave/%{version}/m/legacy
%{_datadir}/octave/%{version}/m/linear-algebra
%{_datadir}/octave/%{version}/m/miscellaneous
%{_datadir}/octave/%{version}/m/ode
@@ -553,8 +566,9 @@ rm -rf $RPM_BUILD_ROOT
%files gui
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/liboctgui.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liboctgui.so.4
+%attr(755,root,root) %ghost %{_libdir}/liboctgui.so.5
%attr(755,root,root) %{_libexecdir}/octave/%{version}/exec/*-pld-linux-gnu*/octave-gui
+%attr(755,root,root) %{_libexecdir}/octave/%{version}/exec/*-pld-linux-gnu*/octave-svgconvert
%dir %{_datadir}/octave/%{version}/doc
%{_datadir}/octave/%{version}/doc/octave_interpreter.qch
%{_datadir}/octave/%{version}/doc/octave_interpreter.qhc
@@ -571,6 +585,7 @@ rm -rf $RPM_BUILD_ROOT
%lang(fr) %{_datadir}/octave/%{version}/locale/fr_FR.qm
%lang(it) %{_datadir}/octave/%{version}/locale/it_IT.qm
%lang(ja) %{_datadir}/octave/%{version}/locale/ja_JP.qm
+%lang(lt) %{_datadir}/octave/%{version}/locale/lt_LT.qm
%lang(nl) %{_datadir}/octave/%{version}/locale/nl_NL.qm
%lang(pt_BR) %{_datadir}/octave/%{version}/locale/pt_BR.qm
%lang(pt) %{_datadir}/octave/%{version}/locale/pt_PT.qm
@@ -596,6 +611,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/octave-config-%{version}
%attr(755,root,root) %{_libdir}/liboctave.so
%attr(755,root,root) %{_libdir}/liboctinterp.so
-%{_includedir}/%{name}
+%{_includedir}/octave
+%{_pkgconfigdir}/octave.pc
+%{_pkgconfigdir}/octinterp.pc
%{_mandir}/man1/octave-config.1*
%{_infodir}/liboctave.info*
diff --git a/octave-c++.patch b/octave-c++.patch
deleted file mode 100644
index 0995729..0000000
--- a/octave-c++.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- octave-4.4.1/liboctave/util/lo-utils.cc.orig 2018-08-09 20:20:32.000000000 +0200
-+++ octave-4.4.1/liboctave/util/lo-utils.cc 2022-12-16 19:29:49.495296270 +0100
-@@ -261,7 +261,7 @@ octave_read_fp_value (std::istream& is)
-
- // FIXME: resetting stream position is likely to fail unless we are
- // reading from a file.
-- std::ios::streampos pos = is.tellg ();
-+ std::streampos pos = is.tellg ();
-
- char c1 = ' ';
-
diff --git a/octave-info.patch b/octave-info.patch
index 154d0b9..f14c25a 100644
--- a/octave-info.patch
+++ b/octave-info.patch
@@ -1,5 +1,5 @@
---- octave-4.4.1/doc/interpreter/octave.texi.orig 2022-12-13 16:54:33.093909947 +0100
-+++ octave-4.4.1/doc/interpreter/octave.texi 2022-12-13 16:58:12.622720658 +0100
+--- octave-5.2.0/doc/interpreter/octave.texi.orig 2023-01-13 16:12:46.594017567 +0100
++++ octave-5.2.0/doc/interpreter/octave.texi 2023-01-13 16:18:36.975452722 +0100
@@ -24,9 +24,9 @@
@include macros.texi
@@ -11,7 +11,7 @@
+* Octave: (octave). Interactive language for numerical computations
@end direntry
- @c Settings for printing on 8-1/2 by 11 inch paper (default):
+ @c Settings for appearance of example blocks
--- octave-4.4.1/doc/liboctave/liboctave.texi.orig 2022-12-13 16:54:33.097243262 +0100
+++ octave-4.4.1/doc/liboctave/liboctave.texi 2022-12-13 16:58:39.255909706 +0100
@@ -20,9 +20,9 @@
diff --git a/octave-suitesparse.patch b/octave-suitesparse.patch
deleted file mode 100644
index b1b1e93..0000000
--- a/octave-suitesparse.patch
+++ /dev/null
@@ -1,251 +0,0 @@
---- octave-4.4.1/libinterp/dldfcn/amd.cc.orig 2022-12-13 17:04:01.004166646 +0100
-+++ octave-4.4.1/libinterp/dldfcn/amd.cc 2022-12-13 17:08:34.869349658 +0100
-@@ -145,11 +145,11 @@ The author of the code itself is Timothy
-
- // FIXME: how can we manage the memory allocation of amd
- // in a cleaner manner?
-- SUITESPARSE_ASSIGN_FPTR (malloc_func, amd_malloc, malloc);
-- SUITESPARSE_ASSIGN_FPTR (free_func, amd_free, free);
-- SUITESPARSE_ASSIGN_FPTR (calloc_func, amd_calloc, calloc);
-- SUITESPARSE_ASSIGN_FPTR (realloc_func, amd_realloc, realloc);
-- SUITESPARSE_ASSIGN_FPTR (printf_func, amd_printf, printf);
-+ SUITESPARSE_ASSIGN_FPTR (malloc_func, SuiteSparse_config.malloc_func, malloc);
-+ SUITESPARSE_ASSIGN_FPTR (free_func, SuiteSparse_config.free_func, free);
-+ SUITESPARSE_ASSIGN_FPTR (calloc_func, SuiteSparse_config.calloc_func, calloc);
-+ SUITESPARSE_ASSIGN_FPTR (realloc_func, SuiteSparse_config.realloc_func, realloc);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, printf);
-
- octave_idx_type result = AMD_NAME (_order) (n_col, cidx, ridx, P, Control,
- Info);
---- octave-4.4.1/libinterp/dldfcn/symbfact.cc.orig 2022-12-13 17:04:01.004166646 +0100
-+++ octave-4.4.1/libinterp/dldfcn/symbfact.cc 2022-12-13 18:01:57.182001243 +0100
-@@ -213,17 +213,17 @@ Cholesky at tie{}factorization as determine
- if (spu == 0.)
- {
- cm->print = -1;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
- }
- else
- {
- cm->print = static_cast<int> (spu) + 2;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
- }
-
- cm->error_handler = &SparseCholError;
-- SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
-- SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
-+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
-+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
-
- cholmod_sparse *F = CHOLMOD_NAME(transpose) (A, 0, cm);
- cholmod_sparse *Aup, *Alo;
---- octave-4.4.1/liboctave/array/CSparse.cc.orig 2022-12-13 17:04:01.057499691 +0100
-+++ octave-4.4.1/liboctave/array/CSparse.cc 2022-12-13 18:36:30.070771441 +0100
-@@ -5690,17 +5690,17 @@ SparseComplexMatrix::fsolve (MatrixType&
- if (spu == 0.)
- {
- cm->print = -1;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
- }
- else
- {
- cm->print = static_cast<int> (spu) + 2;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
- }
-
- cm->error_handler = &SparseCholError;
-- SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
-- SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
-+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
-+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
-
- cm->final_ll = true;
-
-@@ -5942,17 +5942,17 @@ SparseComplexMatrix::fsolve (MatrixType&
- if (spu == 0.)
- {
- cm->print = -1;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
- }
- else
- {
- cm->print = static_cast<int> (spu) + 2;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
- }
-
- cm->error_handler = &SparseCholError;
-- SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
-- SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
-+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
-+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
-
- cm->final_ll = true;
-
-@@ -6245,17 +6245,17 @@ SparseComplexMatrix::fsolve (MatrixType&
- if (spu == 0.)
- {
- cm->print = -1;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
- }
- else
- {
- cm->print = static_cast<int> (spu) + 2;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
- }
-
- cm->error_handler = &SparseCholError;
-- SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
-- SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
-+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
-+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
-
- cm->final_ll = true;
-
-@@ -6476,17 +6476,17 @@ SparseComplexMatrix::fsolve (MatrixType&
- if (spu == 0.)
- {
- cm->print = -1;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
- }
- else
- {
- cm->print = static_cast<int> (spu) + 2;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
- }
-
- cm->error_handler = &SparseCholError;
-- SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
-- SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
-+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
-+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
-
- cm->final_ll = true;
-
---- octave-4.4.1/liboctave/array/dSparse.cc.orig 2022-12-13 17:04:01.147499203 +0100
-+++ octave-4.4.1/liboctave/array/dSparse.cc 2022-12-13 19:11:04.622865962 +0100
-@@ -5731,17 +5731,17 @@ SparseMatrix::fsolve (MatrixType& mattyp
- if (spu == 0.)
- {
- cm->print = -1;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
- }
- else
- {
- cm->print = static_cast<int> (spu) + 2;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
- }
-
- cm->error_handler = &SparseCholError;
-- SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
-- SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
-+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
-+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
-
- cm->final_ll = true;
-
-@@ -5956,17 +5956,17 @@ SparseMatrix::fsolve (MatrixType& mattyp
- if (spu == 0.)
- {
- cm->print = -1;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
- }
- else
- {
- cm->print = static_cast<int> (spu) + 2;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
- }
-
- cm->error_handler = &SparseCholError;
-- SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
-- SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
-+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
-+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
-
- cm->final_ll = true;
-
-@@ -6229,17 +6229,17 @@ SparseMatrix::fsolve (MatrixType& mattyp
- if (spu == 0.)
- {
- cm->print = -1;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
- }
- else
- {
- cm->print = static_cast<int> (spu) + 2;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
- }
-
- cm->error_handler = &SparseCholError;
-- SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
-- SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
-+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
-+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
-
- cm->final_ll = true;
-
-@@ -6474,17 +6474,17 @@ SparseMatrix::fsolve (MatrixType& mattyp
- if (spu == 0.)
- {
- cm->print = -1;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
- }
- else
- {
- cm->print = static_cast<int> (spu) + 2;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
- }
-
- cm->error_handler = &SparseCholError;
-- SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
-- SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
-+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
-+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
-
- cm->final_ll = true;
-
---- octave-4.4.1/liboctave/numeric/sparse-chol.cc.orig 2022-12-13 17:04:01.190832302 +0100
-+++ octave-4.4.1/liboctave/numeric/sparse-chol.cc 2022-12-13 19:12:31.662394428 +0100
-@@ -234,21 +234,21 @@ namespace octave
- if (spu == 0.)
- {
- cm->print = -1;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
- }
- else
- {
- cm->print = static_cast<int> (spu) + 2;
-- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function,
-+ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func,
- &SparseCholPrint);
- }
-
- cm->error_handler = &SparseCholError;
-
-- SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide,
-+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func,
- divcomplex);
-
-- SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
-+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
-
- cm->final_asis = false;
- cm->final_super = false;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/octave.git/commitdiff/c043dc54e615f78edf70624f6af144d446018b50
More information about the pld-cvs-commit
mailing list