1 --- octave-4.4.1/libinterp/dldfcn/amd.cc.orig 2022-12-13 17:04:01.004166646 +0100
2 +++ octave-4.4.1/libinterp/dldfcn/amd.cc 2022-12-13 17:08:34.869349658 +0100
3 @@ -145,11 +145,11 @@ The author of the code itself is Timothy
5 // FIXME: how can we manage the memory allocation of amd
6 // in a cleaner manner?
7 - SUITESPARSE_ASSIGN_FPTR (malloc_func, amd_malloc, malloc);
8 - SUITESPARSE_ASSIGN_FPTR (free_func, amd_free, free);
9 - SUITESPARSE_ASSIGN_FPTR (calloc_func, amd_calloc, calloc);
10 - SUITESPARSE_ASSIGN_FPTR (realloc_func, amd_realloc, realloc);
11 - SUITESPARSE_ASSIGN_FPTR (printf_func, amd_printf, printf);
12 + SUITESPARSE_ASSIGN_FPTR (malloc_func, SuiteSparse_config.malloc_func, malloc);
13 + SUITESPARSE_ASSIGN_FPTR (free_func, SuiteSparse_config.free_func, free);
14 + SUITESPARSE_ASSIGN_FPTR (calloc_func, SuiteSparse_config.calloc_func, calloc);
15 + SUITESPARSE_ASSIGN_FPTR (realloc_func, SuiteSparse_config.realloc_func, realloc);
16 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, printf);
18 octave_idx_type result = AMD_NAME (_order) (n_col, cidx, ridx, P, Control,
20 --- octave-4.4.1/libinterp/dldfcn/symbfact.cc.orig 2022-12-13 17:04:01.004166646 +0100
21 +++ octave-4.4.1/libinterp/dldfcn/symbfact.cc 2022-12-13 18:01:57.182001243 +0100
22 @@ -213,17 +213,17 @@ Cholesky@tie{}factorization as determine
26 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
27 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
31 cm->print = static_cast<int> (spu) + 2;
32 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
33 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
36 cm->error_handler = &SparseCholError;
37 - SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
38 - SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
39 + SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
40 + SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
42 cholmod_sparse *F = CHOLMOD_NAME(transpose) (A, 0, cm);
43 cholmod_sparse *Aup, *Alo;
44 --- octave-4.4.1/liboctave/array/CSparse.cc.orig 2022-12-13 17:04:01.057499691 +0100
45 +++ octave-4.4.1/liboctave/array/CSparse.cc 2022-12-13 18:36:30.070771441 +0100
46 @@ -5690,17 +5690,17 @@ SparseComplexMatrix::fsolve (MatrixType&
50 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
51 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
55 cm->print = static_cast<int> (spu) + 2;
56 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
57 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
60 cm->error_handler = &SparseCholError;
61 - SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
62 - SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
63 + SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
64 + SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
68 @@ -5942,17 +5942,17 @@ SparseComplexMatrix::fsolve (MatrixType&
72 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
73 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
77 cm->print = static_cast<int> (spu) + 2;
78 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
79 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
82 cm->error_handler = &SparseCholError;
83 - SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
84 - SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
85 + SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
86 + SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
90 @@ -6245,17 +6245,17 @@ SparseComplexMatrix::fsolve (MatrixType&
94 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
95 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
99 cm->print = static_cast<int> (spu) + 2;
100 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
101 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
104 cm->error_handler = &SparseCholError;
105 - SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
106 - SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
107 + SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
108 + SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
112 @@ -6476,17 +6476,17 @@ SparseComplexMatrix::fsolve (MatrixType&
116 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
117 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
121 cm->print = static_cast<int> (spu) + 2;
122 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
123 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
126 cm->error_handler = &SparseCholError;
127 - SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
128 - SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
129 + SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
130 + SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
134 --- octave-4.4.1/liboctave/array/dSparse.cc.orig 2022-12-13 17:04:01.147499203 +0100
135 +++ octave-4.4.1/liboctave/array/dSparse.cc 2022-12-13 19:11:04.622865962 +0100
136 @@ -5731,17 +5731,17 @@ SparseMatrix::fsolve (MatrixType& mattyp
140 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
141 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
145 cm->print = static_cast<int> (spu) + 2;
146 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
147 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
150 cm->error_handler = &SparseCholError;
151 - SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
152 - SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
153 + SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
154 + SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
158 @@ -5956,17 +5956,17 @@ SparseMatrix::fsolve (MatrixType& mattyp
162 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
163 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
167 cm->print = static_cast<int> (spu) + 2;
168 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
169 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
172 cm->error_handler = &SparseCholError;
173 - SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
174 - SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
175 + SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
176 + SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
180 @@ -6229,17 +6229,17 @@ SparseMatrix::fsolve (MatrixType& mattyp
184 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
185 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
189 cm->print = static_cast<int> (spu) + 2;
190 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
191 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
194 cm->error_handler = &SparseCholError;
195 - SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
196 - SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
197 + SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
198 + SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
202 @@ -6474,17 +6474,17 @@ SparseMatrix::fsolve (MatrixType& mattyp
206 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
207 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
211 cm->print = static_cast<int> (spu) + 2;
212 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
213 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
216 cm->error_handler = &SparseCholError;
217 - SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex);
218 - SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
219 + SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
220 + SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
224 --- octave-4.4.1/liboctave/numeric/sparse-chol.cc.orig 2022-12-13 17:04:01.190832302 +0100
225 +++ octave-4.4.1/liboctave/numeric/sparse-chol.cc 2022-12-13 19:12:31.662394428 +0100
226 @@ -234,21 +234,21 @@ namespace octave
230 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
231 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
235 cm->print = static_cast<int> (spu) + 2;
236 - SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function,
237 + SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func,
241 cm->error_handler = &SparseCholError;
243 - SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide,
244 + SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, SuiteSparse_config.divcomplex_func,
247 - SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot);
248 + SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
250 cm->final_asis = false;
251 cm->final_super = false;