- updated to 4.4.1

- updated build,info,suitesparse,octdirs patches

diff --git a/octave-build.patch b/octave-build.patch
index 5bef22a976fdd59fd56fe6a1fabafe91e66e034f..a5f8f28677a17105d3293246a2f31abda103b428 100644 (file)
--- a/octave-build.patch
+++ b/octave-build.patch
@@ -9,13 +9,13 @@
                   [], [])
    LIBS="$ac_octave_save_LIBS"
    case "$ac_cv_search_tputs" in
---- octave-3.4.2/m4/ax_pthread.m4.orig 2011-04-11 16:57:08.000000000 +0200
-+++ octave-3.4.2/m4/ax_pthread.m4      2011-07-07 21:24:27.544492621 +0200
-@@ -169,6 +169,7 @@
+--- octave-4.4.1/m4/ax_pthread.m4.orig 2022-12-13 16:59:28.522309474 +0100
++++ octave-4.4.1/m4/ax_pthread.m4      2022-12-13 17:03:38.324289514 +0100
+@@ -189,6 +189,7 @@ for flag in $ax_pthread_flags; do
                  -*)
                  AC_MSG_CHECKING([whether pthreads work with $flag])
                  PTHREAD_CFLAGS="$flag"
 +                PTHREAD_LIBS="$flag"
                  ;;
  
-               pthread-config)
+                 pthread-config)

diff --git a/octave-info.patch b/octave-info.patch
index e40db97fc05be1e9dfc0994ca27bfe4917dcbc7e..154d0b9827f41fd55b576ccac07b49d10fcf887a 100644 (file)
--- a/octave-info.patch
+++ b/octave-info.patch
@@ -1,34 +1,28 @@
-diff -Nur octave-2.1.36.orig/doc/interpreter/octave.texi octave-2.1.36/doc/interpreter/octave.texi
---- octave-2.1.36.orig/doc/interpreter/octave.texi     Wed Jan  2 20:35:23 2002
-+++ octave-2.1.36/doc/interpreter/octave.texi  Sat Nov  2 11:49:49 2002
-@@ -15,10 +15,10 @@
+--- 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
+@@ -24,9 +24,9 @@
  
- @ifinfo
- @format
--START-INFO-DIR-ENTRY
--* Octave: (octave).           Interactive language for numerical computations.
--
--END-INFO-DIR-ENTRY
+ @include macros.texi
+ 
+-@dircategory Math
 +@dircategory Programming Languages:
-+@direntry
+ @direntry
+-* Octave: (octave).             Interactive language for numerical computations.
 +* Octave: (octave).                   Interactive language for numerical computations
-+@end direntry
- @end format
- @end ifinfo
+ @end direntry
  
---- octave-2.1.70/doc/liboctave/liboctave.texi.orig    2005-02-24 05:56:08.000000000 +0100
-+++ octave-2.1.70/doc/liboctave/liboctave.texi 2005-05-18 00:01:02.814740008 +0200
-@@ -4,9 +4,10 @@
+ @c Settings for printing on 8-1/2 by 11 inch paper (default):
+--- 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 @@
+ \input texinfo
+ @setfilename liboctave.info
  
- @ifinfo
- @format
--START-INFO-DIR-ENTRY
--* liboctave: (liboctave). Octave C++ Classes
--END-INFO-DIR-ENTRY
+-@dircategory Math
 +@dircategory Libraries:
-+@direntry
+ @direntry
+-* liboctave: (liboctave).       Octave C++ Classes
 +* liboctave: (liboctave).             Octave C++ Classes
-+@end direntry
- @end format
- @end ifinfo
+ @end direntry
  
+ @c @smallbook

diff --git a/octave-suitesparse.patch b/octave-suitesparse.patch
index c992dbe532222fb41da60d327d84c618832eafd6..b1b1e93fe2361333b3e969147d4065be8a08868e 100644 (file)
--- a/octave-suitesparse.patch
+++ b/octave-suitesparse.patch
@@ -1,7 +1,6 @@
-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 @@
+--- 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?
@@ -16,17 +15,16 @@ diff -ur octave-4.0.0/libinterp/dldfcn/amd.cc octave-4.0.0.ssparse/libinterp/dld
 +  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 @@
+   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@tie{}factorization as determine
    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);
+-      SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
++      SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
      }
    else
      {
@@ -41,17 +39,16 @@ diff -ur octave-4.0.0/libinterp/dldfcn/symbfact.cc octave-4.0.0.ssparse/libinter
 +  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 @@
+   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, 0);
-+              SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, 0);
+-              SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
++              SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
              }
            else
              {
@@ -68,12 +65,12 @@ diff -ur octave-4.0.0/liboctave/array/CSparse.cc octave-4.0.0.ssparse/liboctave/
  
            cm->final_ll = true;
  
-@@ -5838,17 +5838,17 @@
+@@ -5942,17 +5942,17 @@ SparseComplexMatrix::fsolve (MatrixType&
            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);
+-              SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
++              SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
              }
            else
              {
@@ -90,12 +87,12 @@ diff -ur octave-4.0.0/liboctave/array/CSparse.cc octave-4.0.0.ssparse/liboctave/
  
            cm->final_ll = true;
  
-@@ -6127,17 +6127,17 @@
+@@ -6245,17 +6245,17 @@ SparseComplexMatrix::fsolve (MatrixType&
            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);
+-              SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
++              SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
              }
            else
              {
@@ -112,12 +109,12 @@ diff -ur octave-4.0.0/liboctave/array/CSparse.cc octave-4.0.0.ssparse/liboctave/
  
            cm->final_ll = true;
  
-@@ -6347,17 +6347,17 @@
+@@ -6476,17 +6476,17 @@ SparseComplexMatrix::fsolve (MatrixType&
            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);
+-              SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
++              SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
              }
            else
              {
@@ -134,15 +131,14 @@ diff -ur octave-4.0.0/liboctave/array/CSparse.cc octave-4.0.0.ssparse/liboctave/
  
            cm->final_ll = true;
  
-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 @@
+--- 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, 0);
-+              SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, 0);
+-              SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
++              SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
              }
            else
              {
@@ -159,12 +155,12 @@ diff -ur octave-4.0.0/liboctave/array/dSparse.cc octave-4.0.0.ssparse/liboctave/
  
            cm->final_ll = true;
  
-@@ -6006,17 +6006,17 @@
+@@ -5956,17 +5956,17 @@ SparseMatrix::fsolve (MatrixType& mattyp
            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);
+-              SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
++              SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
              }
            else
              {
@@ -181,12 +177,12 @@ diff -ur octave-4.0.0/liboctave/array/dSparse.cc octave-4.0.0.ssparse/liboctave/
  
            cm->final_ll = true;
  
-@@ -6266,17 +6266,17 @@
+@@ -6229,17 +6229,17 @@ SparseMatrix::fsolve (MatrixType& mattyp
            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);
+-              SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
++              SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
              }
            else
              {
@@ -203,12 +199,12 @@ diff -ur octave-4.0.0/liboctave/array/dSparse.cc octave-4.0.0.ssparse/liboctave/
  
            cm->final_ll = true;
  
-@@ -6498,17 +6498,17 @@
+@@ -6474,17 +6474,17 @@ SparseMatrix::fsolve (MatrixType& mattyp
            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);
+-              SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, nullptr);
++              SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, nullptr);
              }
            else
              {
@@ -225,28 +221,30 @@ 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-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 @@
+--- 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, 0);
-+          SUITESPARSE_ASSIGN_FPTR (printf_func, SuiteSparse_config.printf_func, 0);
+-          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);
+-          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, divcomplex);
+-      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 (divcomplex_func, SuiteSparse_config.divcomplex_func, divcomplex);
 +      SUITESPARSE_ASSIGN_FPTR2 (hypot_func, SuiteSparse_config.hypot_func, hypot);
  
        cm->final_asis = false;

diff --git a/octave.spec b/octave.spec
index 39c9ead6677bef594eae5b9acaf37cdbffb5a343..9220e5190794c1dc1b8a95fcf96bf7eb632557df 100644 (file)
--- a/octave.spec
+++ b/octave.spec
@@ -22,13 +22,13 @@ 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.2.1
-Release:       8
+Version:       4.4.1
+Release:       1
 Epoch:         2
 License:       GPL v3+
 Group:         Applications/Math
-Source0:       http://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.gz
-# Source0-md5: b7b95cc595c706b77fca544f6682b596
+Source0:       https://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.lz
+# Source0-md5: e0d9556caafd83e4276af49b06c5c994
 Source1:       %{name}.desktop
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-build.patch
@@ -76,6 +76,7 @@ BuildRequires:        libsndfile-devel
 BuildRequires: libstdc++-devel >= 6:4.1
 BuildRequires: libtool >= 2:2.2.2
 %{?with_llvm:BuildRequires:    llvm-devel}
+BuildRequires: lzip
 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: pcre-devel
 BuildRequires: perl-base
@@ -88,6 +89,7 @@ BuildRequires:        qrupdate-devel
 %{?with_gui:BuildRequires:     qt4-linguist >= 4}
 BuildRequires: readline-devel
 BuildRequires: sed >= 4.0
+BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo
 BuildRequires: texinfo-texi2dvi
 BuildRequires: xorg-lib-libX11-devel

diff --git a/octdirs.patch b/octdirs.patch
index 23808fe623a1fde660b18b9f4b386bcd215ea408..2444330b16d9ff0d38a784ecd19bbf9ea474e166 100644 (file)
--- a/octdirs.patch
+++ b/octdirs.patch
@@ -1,20 +1,20 @@
---- octave-4.2.1/configure.ac.orig     2017-02-22 19:03:04.000000000 +0100
-+++ octave-4.2.1/configure.ac  2017-05-26 20:32:53.218210980 +0200
-@@ -87,7 +87,7 @@
+--- octave-4.4.1/configure.ac.orig     2022-12-13 19:12:53.565609102 +0100
++++ octave-4.4.1/configure.ac  2022-12-13 19:58:22.644157748 +0100
+@@ -91,7 +91,7 @@ AC_SUBST(config_opts)
  
- ## Where to install and expect libraries like liboctave.a, liboctinterp.a,
- ## and other architecture-dependent data.
+ ## Where to install libraries like liboctave.a, liboctinterp.a, and other
+ ## architecture-dependent binaries.
 -OCTAVE_SET_DEFAULT([octlibdir], '${libdir}/octave/${version}')
 +OCTAVE_SET_DEFAULT([octlibdir], '${libdir}')
  
- ## Where to put executables to be run by Octave rather than
- ## the user.  This path usually includes the Octave version
-@@ -128,7 +128,7 @@
+ ## Where to put executables to be run by Octave, rather than the user.
+ ## This path usually includes the Octave version and configuration name, so
+@@ -130,7 +130,7 @@ OCTAVE_SET_DEFAULT([localveroctfiledir],
    '${libdir}/octave/${version}/site/oct/${canonical_host_type}')
  
  ## Where to install Octave's include files.
 -OCTAVE_SET_DEFAULT([octincludedir], '${includedir}/octave-${version}/octave')
 +OCTAVE_SET_DEFAULT([octincludedir], '${includedir}/octave')
  
- ## Where to install the function file distributed with
- ## Octave.  This includes the Octave version, so that the
+ ## Where to install the function files distributed with Octave.
+ ## This includes the Octave version, so that the function files for different