[packages/octave] - updated suitesparse patch - fixed texinfo6 patch - updated files - rel 1
baggins
baggins at pld-linux.org
Sun Nov 22 18:42:51 CET 2015
commit f78a5c3ef891e08983a0717e0959326c4ef1deea
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Nov 22 18:42:24 2015 +0100
- updated suitesparse patch
- fixed texinfo6 patch
- updated files
- rel 1
octave-suitesparse.patch | 265 ++++++++++++++++++++++++-----------------------
octave-texinfo6.patch | 28 +++--
octave.spec | 24 +++--
3 files changed, 170 insertions(+), 147 deletions(-)
---
diff --git a/octave.spec b/octave.spec
index 3e21897..55ce625 100644
--- a/octave.spec
+++ b/octave.spec
@@ -23,7 +23,7 @@ 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.0.0
-Release: 0.1
+Release: 1
Epoch: 2
License: GPL v3+
Group: Applications/Math
@@ -64,8 +64,8 @@ BuildRequires: gl2ps-devel
BuildRequires: glpk-devel >= 4.14
BuildRequires: gnuplot
#BuildRequires: gperf >= 3.0.1
-%{?with_java:BuildRequires: jdk >= 1.5}
BuildRequires: hdf5-devel >= 1.6.0
+%{?with_java:BuildRequires: jdk >= 1.5}
BuildRequires: lapack-devel >= 3.1.1-3
%{?with_gomp:BuildRequires: libgomp-devel}
BuildRequires: libstdc++-devel >= 6:4.0
@@ -94,7 +94,7 @@ Requires: gnuplot
Suggests: GraphicsMagick
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define api_dir api-v49+
+%define api_dir api-v50+
%description
GNU Octave is a high-level language, primarily intended for numerical
@@ -325,7 +325,7 @@ Pliki nagłówkowe i dodatkowa dokumentacja Octave.
%setup -q
%patch0 -p1
%patch1 -p1
-#%patch2 -p1
+%patch2 -p1
%patch3 -p1
%build
@@ -371,7 +371,7 @@ rm -rf $RPM_BUILD_ROOT
octlibdir=%{_libdir}
install -d $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
# Create directory for add-on packages
install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/packages
@@ -411,9 +411,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.2
+%attr(755,root,root) %ghost %{_libdir}/liboctave.so.3
%attr(755,root,root) %{_libdir}/liboctinterp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liboctinterp.so.2
+%attr(755,root,root) %ghost %{_libdir}/liboctinterp.so.3
%dir %{_libdir}/octave
%dir %{_libdir}/octave/%{version}
%dir %{_libdir}/octave/%{version}/exec
@@ -445,11 +445,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/octave-cli.1*
%dir %{_datadir}/octave
%dir %{_datadir}/octave/%{version}
+%dir %{_datadir}/octave/%{version}/data
+%{_datadir}/octave/%{version}/data/penny.mat
%dir %{_datadir}/octave/%{version}/etc
%{_datadir}/octave/%{version}/etc/CITATION
%{_datadir}/octave/%{version}/etc/NEWS
%{_datadir}/octave/%{version}/etc/built-in-docstrings
-%{_datadir}/octave/%{version}/etc/config.log
%{_datadir}/octave/%{version}/etc/doc-cache
%{_datadir}/octave/%{version}/etc/macros.texi
%{_datadir}/octave/%{version}/etc/tests
@@ -499,7 +500,7 @@ 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.0
+%attr(755,root,root) %ghost %{_libdir}/liboctgui.so.1
%attr(755,root,root) %{_libdir}/octave/%{version}/exec/*-pld-linux-gnu*/octave-gui
%{_datadir}/octave/%{version}/etc/default-qt-settings
%dir %{_datadir}/octave/%{version}/locale
@@ -508,12 +509,17 @@ rm -rf $RPM_BUILD_ROOT
%lang(en) %{_datadir}/octave/%{version}/locale/en_US.qm
%lang(es) %{_datadir}/octave/%{version}/locale/es_ES.qm
%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(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
%lang(ru) %{_datadir}/octave/%{version}/locale/ru_RU.qm
%lang(uk) %{_datadir}/octave/%{version}/locale/uk_UA.qm
%lang(zh_CN) %{_datadir}/octave/%{version}/locale/zh_CN.qm
+%{_datadir}/appdata/www.octave.org-octave.appdata.xml
+%{_iconsdir}/hicolor/*x*/apps/octave.png
+%{_iconsdir}/hicolor/scalable/apps/octave.svg
%endif
%if %{with java}
diff --git a/octave-suitesparse.patch b/octave-suitesparse.patch
index 723b25b..4aa84d9 100644
--- a/octave-suitesparse.patch
+++ b/octave-suitesparse.patch
@@ -1,247 +1,252 @@
---- octave-3.8.2/liboctave/array/CSparse.cc.orig 2014-08-06 19:57:55.000000000 +0200
-+++ octave-3.8.2/liboctave/array/CSparse.cc 2014-11-21 15:47:48.347974219 +0100
-@@ -5664,17 +5664,17 @@ SparseComplexMatrix::fsolve (MatrixType
+diff -ur octave-4.0.0/libinterp/dldfcn/amd.cc octave-4.0.0.ssparse/libinterp/dldfcn/amd.cc
+--- octave-4.0.0/libinterp/dldfcn/amd.cc 2015-05-23 16:21:53.000000000 +0200
++++ octave-4.0.0.ssparse/libinterp/dldfcn/amd.cc 2015-11-22 14:31:27.695828112 +0100
+@@ -165,11 +165,11 @@
+
+ // 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);
+diff -ur octave-4.0.0/libinterp/dldfcn/symbfact.cc octave-4.0.0.ssparse/libinterp/dldfcn/symbfact.cc
+--- octave-4.0.0/libinterp/dldfcn/symbfact.cc 2015-05-23 16:21:53.000000000 +0200
++++ octave-4.0.0.ssparse/libinterp/dldfcn/symbfact.cc 2015-11-22 14:32:06.492220138 +0100
+@@ -115,17 +115,17 @@
+ if (spu == 0.)
+ {
+ cm->print = -1;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, 0);
+ }
+ 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);
+
+ double dummy;
+ cholmod_sparse Astore;
+diff -ur octave-4.0.0/liboctave/array/CSparse.cc octave-4.0.0.ssparse/liboctave/array/CSparse.cc
+--- octave-4.0.0/liboctave/array/CSparse.cc 2015-05-23 16:21:53.000000000 +0200
++++ octave-4.0.0.ssparse/liboctave/array/CSparse.cc 2015-11-22 14:27:35.072036034 +0100
+@@ -5597,17 +5597,17 @@
if (spu == 0.)
{
cm->print = -1;
-- cm->print_function = 0;
-+ SuiteSparse_config.printf_func = 0;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, 0);
}
else
{
cm->print = static_cast<int> (spu) + 2;
-- cm->print_function =&SparseCholPrint;
-+ SuiteSparse_config.printf_func =&SparseCholPrint;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
}
cm->error_handler = &SparseCholError;
-- cm->complex_divide = CHOLMOD_NAME(divcomplex);
-- cm->hypotenuse = CHOLMOD_NAME(hypot);
-+ SuiteSparse_config.divcomplex_func = CHOLMOD_NAME(divcomplex);
-+ SuiteSparse_config.hypot_func = CHOLMOD_NAME(hypot);
+- 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;
-@@ -5907,17 +5907,17 @@ SparseComplexMatrix::fsolve (MatrixType
+@@ -5838,17 +5838,17 @@
if (spu == 0.)
{
cm->print = -1;
-- cm->print_function = 0;
-+ SuiteSparse_config.printf_func = 0;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, 0);
}
else
{
cm->print = static_cast<int> (spu) + 2;
-- cm->print_function =&SparseCholPrint;
-+ SuiteSparse_config.printf_func =&SparseCholPrint;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
}
cm->error_handler = &SparseCholError;
-- cm->complex_divide = CHOLMOD_NAME(divcomplex);
-- cm->hypotenuse = CHOLMOD_NAME(hypot);
-+ SuiteSparse_config.divcomplex_func = CHOLMOD_NAME(divcomplex);
-+ SuiteSparse_config.hypot_func = CHOLMOD_NAME(hypot);
+- 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;
-@@ -6198,17 +6198,17 @@ SparseComplexMatrix::fsolve (MatrixType
+@@ -6127,17 +6127,17 @@
if (spu == 0.)
{
cm->print = -1;
-- cm->print_function = 0;
-+ SuiteSparse_config.printf_func = 0;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, 0);
}
else
{
cm->print = static_cast<int> (spu) + 2;
-- cm->print_function =&SparseCholPrint;
-+ SuiteSparse_config.printf_func =&SparseCholPrint;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
}
cm->error_handler = &SparseCholError;
-- cm->complex_divide = CHOLMOD_NAME(divcomplex);
-- cm->hypotenuse = CHOLMOD_NAME(hypot);
-+ SuiteSparse_config.divcomplex_func = CHOLMOD_NAME(divcomplex);
-+ SuiteSparse_config.hypot_func = CHOLMOD_NAME(hypot);
+- 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;
-@@ -6420,17 +6420,17 @@ SparseComplexMatrix::fsolve (MatrixType
+@@ -6347,17 +6347,17 @@
if (spu == 0.)
{
cm->print = -1;
-- cm->print_function = 0;
-+ SuiteSparse_config.printf_func = 0;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, 0);
}
else
{
cm->print = static_cast<int> (spu) + 2;
-- cm->print_function =&SparseCholPrint;
-+ SuiteSparse_config.printf_func =&SparseCholPrint;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
}
cm->error_handler = &SparseCholError;
-- cm->complex_divide = CHOLMOD_NAME(divcomplex);
-- cm->hypotenuse = CHOLMOD_NAME(hypot);
-+ SuiteSparse_config.divcomplex_func = CHOLMOD_NAME(divcomplex);
-+ SuiteSparse_config.hypot_func = CHOLMOD_NAME(hypot);
+- 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-3.8.2/liboctave/array/dSparse.cc.orig 2014-08-06 19:57:55.000000000 +0200
-+++ octave-3.8.2/liboctave/array/dSparse.cc 2014-11-21 15:55:05.871289187 +0100
-@@ -5866,17 +5866,17 @@ SparseMatrix::fsolve (MatrixType &mattyp
+diff -ur octave-4.0.0/liboctave/array/dSparse.cc octave-4.0.0.ssparse/liboctave/array/dSparse.cc
+--- octave-4.0.0/liboctave/array/dSparse.cc 2015-05-23 16:21:53.000000000 +0200
++++ octave-4.0.0.ssparse/liboctave/array/dSparse.cc 2015-11-22 14:29:20.700410560 +0100
+@@ -5791,17 +5791,17 @@
if (spu == 0.)
{
cm->print = -1;
-- cm->print_function = 0;
-+ SuiteSparse_config.printf_func = 0;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, 0);
}
else
{
cm->print = static_cast<int> (spu) + 2;
-- cm->print_function =&SparseCholPrint;
-+ SuiteSparse_config.printf_func =&SparseCholPrint;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
}
cm->error_handler = &SparseCholError;
-- cm->complex_divide = CHOLMOD_NAME(divcomplex);
-- cm->hypotenuse = CHOLMOD_NAME(hypot);
-+ SuiteSparse_config.divcomplex_func = CHOLMOD_NAME(divcomplex);
-+ SuiteSparse_config.hypot_func = CHOLMOD_NAME(hypot);
+- 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;
-@@ -6083,17 +6083,17 @@ SparseMatrix::fsolve (MatrixType &mattyp
+@@ -6006,17 +6006,17 @@
if (spu == 0.)
{
cm->print = -1;
-- cm->print_function = 0;
-+ SuiteSparse_config.printf_func = 0;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, 0);
}
else
{
cm->print = static_cast<int> (spu) + 2;
-- cm->print_function =&SparseCholPrint;
-+ SuiteSparse_config.printf_func =&SparseCholPrint;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
}
cm->error_handler = &SparseCholError;
-- cm->complex_divide = CHOLMOD_NAME(divcomplex);
-- cm->hypotenuse = CHOLMOD_NAME(hypot);
-+ SuiteSparse_config.divcomplex_func = CHOLMOD_NAME(divcomplex);
-+ SuiteSparse_config.hypot_func = CHOLMOD_NAME(hypot);
+- 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;
-@@ -6345,17 +6345,17 @@ SparseMatrix::fsolve (MatrixType &mattyp
+@@ -6266,17 +6266,17 @@
if (spu == 0.)
{
cm->print = -1;
-- cm->print_function = 0;
-+ SuiteSparse_config.printf_func = 0;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, 0);
}
else
{
cm->print = static_cast<int> (spu) + 2;
-- cm->print_function =&SparseCholPrint;
-+ SuiteSparse_config.printf_func =&SparseCholPrint;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
}
cm->error_handler = &SparseCholError;
-- cm->complex_divide = CHOLMOD_NAME(divcomplex);
-- cm->hypotenuse = CHOLMOD_NAME(hypot);
-+ SuiteSparse_config.divcomplex_func = CHOLMOD_NAME(divcomplex);
-+ SuiteSparse_config.hypot_func = CHOLMOD_NAME(hypot);
+- 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;
-@@ -6579,17 +6579,17 @@ SparseMatrix::fsolve (MatrixType &mattyp
+@@ -6498,17 +6498,17 @@
if (spu == 0.)
{
cm->print = -1;
-- cm->print_function = 0;
-+ SuiteSparse_config.printf_func = 0;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, 0);
}
else
{
cm->print = static_cast<int> (spu) + 2;
-- cm->print_function =&SparseCholPrint;
-+ SuiteSparse_config.printf_func =&SparseCholPrint;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
}
cm->error_handler = &SparseCholError;
-- cm->complex_divide = CHOLMOD_NAME(divcomplex);
-- cm->hypotenuse = CHOLMOD_NAME(hypot);
-+ SuiteSparse_config.divcomplex_func = CHOLMOD_NAME(divcomplex);
-+ SuiteSparse_config.hypot_func = CHOLMOD_NAME(hypot);
+- 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-3.8.2/liboctave/numeric/sparse-base-chol.cc.orig 2014-08-06 19:54:14.000000000 +0200
-+++ octave-3.8.2/liboctave/numeric/sparse-base-chol.cc 2014-11-21 16:03:57.417933578 +0100
-@@ -105,17 +105,17 @@ sparse_base_chol<chol_type, chol_elt, p_
+diff -ur octave-4.0.0/liboctave/numeric/sparse-base-chol.cc octave-4.0.0.ssparse/liboctave/numeric/sparse-base-chol.cc
+--- octave-4.0.0/liboctave/numeric/sparse-base-chol.cc 2015-05-23 16:21:53.000000000 +0200
++++ octave-4.0.0.ssparse/liboctave/numeric/sparse-base-chol.cc 2015-11-22 14:30:33.539620409 +0100
+@@ -105,17 +105,17 @@
if (spu == 0.)
{
cm->print = -1;
-- cm->print_function = 0;
-+ SuiteSparse_config.printf_func = 0;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, 0);
}
else
{
cm->print = static_cast<int> (spu) + 2;
-- cm->print_function =&SparseCholPrint;
-+ SuiteSparse_config.printf_func =&SparseCholPrint;
+- SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint);
++ SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, &SparseCholPrint);
}
cm->error_handler = &SparseCholError;
-- cm->complex_divide = CHOLMOD_NAME(divcomplex);
-- cm->hypotenuse = CHOLMOD_NAME(hypot);
-+ SuiteSparse_config.divcomplex_func = CHOLMOD_NAME(divcomplex);
-+ SuiteSparse_config.hypot_func = CHOLMOD_NAME(hypot);
+- 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_asis = false;
cm->final_super = false;
---- octave-3.8.2/libinterp/dldfcn/amd.cc.orig 2014-08-06 19:57:55.000000000 +0200
-+++ octave-3.8.2/libinterp/dldfcn/amd.cc 2014-11-21 22:38:29.540273455 +0100
-@@ -164,11 +164,11 @@ The author of the code itself is Timothy
-
- // FIXME: how can we manage the memory allocation of amd
- // in a cleaner manner?
-- amd_malloc = malloc;
-- amd_free = free;
-- amd_calloc = calloc;
-- amd_realloc = realloc;
-- amd_printf = printf;
-+ SuiteSparse_config.malloc_func = malloc;
-+ SuiteSparse_config.free_func = free;
-+ SuiteSparse_config.calloc_func = calloc;
-+ SuiteSparse_config.realloc_func = realloc;
-+ SuiteSparse_config.printf_func = printf;
-
- octave_idx_type result = AMD_NAME (_order) (n_col, cidx, ridx, P,
- Control, Info);
---- octave-3.8.2/libinterp/dldfcn/symbfact.cc.orig 2014-08-06 19:54:15.000000000 +0200
-+++ octave-3.8.2/libinterp/dldfcn/symbfact.cc 2014-11-21 22:46:15.546920474 +0100
-@@ -114,17 +114,17 @@ factorization as determined by @var{typ}
- if (spu == 0.)
- {
- cm->print = -1;
-- cm->print_function = 0;
-+ SuiteSparse_config.printf_func = 0;
- }
- else
- {
- cm->print = static_cast<int> (spu) + 2;
-- cm->print_function =&SparseCholPrint;
-+ SuiteSparse_config.printf_func =&SparseCholPrint;
- }
-
- cm->error_handler = &SparseCholError;
-- cm->complex_divide = CHOLMOD_NAME(divcomplex);
-- cm->hypotenuse = CHOLMOD_NAME(hypot);
-+ SuiteSparse_config.divcomplex_func = CHOLMOD_NAME(divcomplex);
-+ SuiteSparse_config.hypot_func = CHOLMOD_NAME(hypot);
-
- double dummy;
- cholmod_sparse Astore;
diff --git a/octave-texinfo6.patch b/octave-texinfo6.patch
index 5e3961f..fbdb8ac 100644
--- a/octave-texinfo6.patch
+++ b/octave-texinfo6.patch
@@ -1,14 +1,15 @@
-diff -up octave-4.0.0/doc/liboctave/Makefile.in.texinfo6 octave-4.0.0/doc/liboctave/Makefile.in
---- octave-4.0.0/doc/liboctave/Makefile.in.texinfo6 2015-05-26 10:21:42.000000000 -0600
-+++ octave-4.0.0/doc/liboctave/Makefile.in 2015-07-14 10:40:50.131788830 -0600
-@@ -1854,7 +1854,6 @@ localstartupfiledir = ${localfcnfiledir}
- # The separator used for elements of the LD_PRELOAD variable (might be
- # a space, so protect with $(null))
- null =
+diff -up octave-4.0.0/doc/liboctave/Makefile.am.texinfo6 octave-4.0.0/doc/liboctave/Makefile.am
+--- octave-4.0.0/doc/liboctave/Makefile.am.texinfo6 2015-05-26 10:21:42.000000000 -0600
++++ octave-4.0.0/doc/liboctave/Makefile.am 2015-07-14 10:40:50.131788830 -0600
+@@ -20,8 +20,6 @@
+
+ include $(top_srcdir)/build-aux/common.mk
+
-TEXINFO_TEX = ../texinfo.tex
+-
info_TEXINFOS = liboctave.texi
+
liboctave_TEXINFOS = \
- array.texi \
diff -up octave-4.0.0/libinterp/corefcn/utils.cc.texinfo6 octave-4.0.0/libinterp/corefcn/utils.cc
--- octave-4.0.0/libinterp/corefcn/utils.cc.texinfo6 2015-05-23 08:21:53.000000000 -0600
+++ octave-4.0.0/libinterp/corefcn/utils.cc 2015-07-14 09:46:17.300468145 -0600
@@ -46,3 +47,14 @@ diff -up octave-4.0.0/scripts/io/beep.m.texinfo6 octave-4.0.0/scripts/io/beep.m
## @seealso{puts, fputs, printf, fprintf}
## @end deftypefn
+--- octave-4.0.0/doc/interpreter/Makefile.am~ 2015-05-23 16:21:53.000000000 +0200
++++ octave-4.0.0/doc/interpreter/Makefile.am 2015-11-22 18:16:02.273958880 +0100
+@@ -20,8 +20,6 @@
+
+ include $(top_srcdir)/build-aux/common.mk
+
+-TEXINFO_TEX = ../texinfo.tex
+-
+ ## Leading PATH_SEPARATOR required due to weak parsing by dvips (12/04/09)
+ TEXINPUTS := "$(PATH_SEPARATOR)$(srcdir)$(PATH_SEPARATOR)$(TEXINPUTS)$(PATH_SEPARATOR)"
+ export TEXINPUTS
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/octave.git/commitdiff/f78a5c3ef891e08983a0717e0959326c4ef1deea
More information about the pld-cvs-commit
mailing list