[packages/octave] - up to 4.2.1

baggins baggins at pld-linux.org
Thu May 25 23:15:28 CEST 2017


commit c16b58942c2ad03c811ac721ddb4656d3488b752
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu May 25 23:15:19 2017 +0200

    - up to 4.2.1

 octave-suitesparse.patch | 79 ++++++++++++++++++++++++------------------------
 octave.spec              | 22 ++++++++------
 2 files changed, 52 insertions(+), 49 deletions(-)
---
diff --git a/octave.spec b/octave.spec
index 9991e2e..117924f 100644
--- a/octave.spec
+++ b/octave.spec
@@ -22,18 +22,17 @@ 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.0.0
-Release:	5
+Version:	4.2.1
+Release:	1
 Epoch:		2
 License:	GPL v3+
 Group:		Applications/Math
-Source0:	http://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.xz
-# Source0-md5:	f3de0a0d9758e112f13ce1f5eaf791bf
+Source0:	http://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.gz
+# Source0-md5:	b7b95cc595c706b77fca544f6682b596
 Source1:	%{name}.desktop
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-build.patch
 Patch2:		%{name}-suitesparse.patch
-Patch3:		%{name}-texinfo6.patch
 URL:		http://www.octave.org/
 BuildRequires:	AMD-devel >= 2.4.0
 BuildRequires:	CAMD-devel
@@ -101,7 +100,7 @@ Requires:	gnuplot
 Suggests:	GraphicsMagick
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		api_dir		api-v50+
+%define		api_dir		api-v51
 
 %description
 GNU Octave is a high-level language, primarily intended for numerical
@@ -333,7 +332,6 @@ Pliki nagłówkowe i dodatkowa dokumentacja Octave.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -359,6 +357,7 @@ export CLASSPATH=.
 	--with-cxsparse-includedir=%{_includedir}/cxsparse \
 	--with-umfpack-includedir=%{_includedir}/umfpack \
 	--enable-dl \
+	%{?with_gui:--with-qt=4} \
 	%{!?with_gui:--disable-gui} \
 	%{!?with_java:--disable-java} \
 	%{?with_llvm:--enable-jit} \
@@ -425,9 +424,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.3
+%attr(755,root,root) %ghost %{_libdir}/liboctave.so.4
 %attr(755,root,root) %{_libdir}/liboctinterp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liboctinterp.so.3
+%attr(755,root,root) %ghost %{_libdir}/liboctinterp.so.4
 %dir %{_libdir}/octave
 %dir %{_libdir}/octave/%{version}
 %dir %{_libdir}/octave/%{version}/exec
@@ -467,6 +466,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/octave/%{version}/etc/built-in-docstrings
 %{_datadir}/octave/%{version}/etc/doc-cache
 %{_datadir}/octave/%{version}/etc/macros.texi
+%{_datadir}/octave/%{version}/etc/profiler
 %{_datadir}/octave/%{version}/etc/tests
 %{_datadir}/octave/%{version}/imagelib
 %dir %{_datadir}/octave/%{version}/m
@@ -482,12 +482,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/octave/%{version}/m/io
 %{_datadir}/octave/%{version}/m/linear-algebra
 %{_datadir}/octave/%{version}/m/miscellaneous
+%{_datadir}/octave/%{version}/m/ode
 %{_datadir}/octave/%{version}/m/optimization
 %{_datadir}/octave/%{version}/m/path
 %{_datadir}/octave/%{version}/m/pkg
 %{_datadir}/octave/%{version}/m/plot
 %{_datadir}/octave/%{version}/m/polynomial
 %{_datadir}/octave/%{version}/m/prefs
+%{_datadir}/octave/%{version}/m/profiler
 %{_datadir}/octave/%{version}/m/set
 %{_datadir}/octave/%{version}/m/signal
 %{_datadir}/octave/%{version}/m/sparse
@@ -514,7 +516,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.1
+%attr(755,root,root) %ghost %{_libdir}/liboctgui.so.2
 %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
diff --git a/octave-suitesparse.patch b/octave-suitesparse.patch
index 4aa84d9..c992dbe 100644
--- a/octave-suitesparse.patch
+++ b/octave-suitesparse.patch
@@ -3,20 +3,20 @@ diff -ur octave-4.0.0/libinterp/dldfcn/amd.cc octave-4.0.0.ssparse/libinterp/dld
 +++ 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,
+   // 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
@@ -225,28 +225,29 @@ diff -ur octave-4.0.0/liboctave/array/dSparse.cc octave-4.0.0.ssparse/liboctave/
  
            cm->final_ll = true;
  
-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;
--      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);
- 
-   cm->final_asis = false;
-   cm->final_super = false;
+diff -ur octave-4.0.0/liboctave/numeric/sparse-chol.cc octave-4.0.0.ssparse/liboctave/numeric/sparse-chol.cc
+--- octave-4.0.0/liboctave/numeric/sparse-chol.cc	2015-05-23 16:21:53.000000000 +0200
++++ octave-4.0.0.ssparse/liboctave/numeric/sparse-chol.cc	2015-11-22 14:30:33.539620409 +0100
+@@ -105,18 +105,18 @@
+       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);
+ 
+       cm->final_asis = false;
+       cm->final_super = false;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/octave.git/commitdiff/c16b58942c2ad03c811ac721ddb4656d3488b752



More information about the pld-cvs-commit mailing list