From a86baa31f472b685d4e3ee84e321e28492633059 Mon Sep 17 00:00:00 2001 From: lilong Date: Fri, 26 Apr 2024 01:30:14 +0800 Subject: [PATCH] Fix type error: incorrect namespace used --- ...-type-error-incorrect-namespace-used.patch | 25 +++++++++++++++++++ octave.spec | 7 +++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-type-error-incorrect-namespace-used.patch diff --git a/0001-Fix-type-error-incorrect-namespace-used.patch b/0001-Fix-type-error-incorrect-namespace-used.patch new file mode 100644 index 0000000..0677b59 --- /dev/null +++ b/0001-Fix-type-error-incorrect-namespace-used.patch @@ -0,0 +1,25 @@ +From e8e1a2b17ebc435ed6b4805e5bc26955b9f522c2 Mon Sep 17 00:00:00 2001 +From: lilong +Date: Wed, 24 Apr 2024 16:29:21 +0800 +Subject: [PATCH] Fix type error: incorrect namespace used + +--- + liboctave/util/lo-utils.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/liboctave/util/lo-utils.cc b/liboctave/util/lo-utils.cc +index 0807fed..b287f77 100644 +--- a/liboctave/util/lo-utils.cc ++++ b/liboctave/util/lo-utils.cc +@@ -250,7 +250,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 = ' '; + +-- +2.43.0 + diff --git a/octave.spec b/octave.spec index 4a3f74b..f56556a 100644 --- a/octave.spec +++ b/octave.spec @@ -5,7 +5,7 @@ Name: octave Epoch: 6 Version: 5.1.0 -Release: 1 +Release: 2 Summary: A high-level language for numerical computations License: GPLv3+ URL: http://www.octave.org @@ -13,6 +13,7 @@ Source0: https://ftp.gnu.org/gnu/octave/octave-%{version}.tar.lz Source2: xorg.conf Source3: octave-5.1.0-docs.tar.lz Patch0: octave-clear-the-eof-condition.patch +Patch1: 0001-Fix-type-error-incorrect-namespace-used.patch Provides: octave(api) = %{octave_api} Provides: bundled(gnulib) Provides: bundled(qterminal) @@ -41,6 +42,7 @@ BuildRequires: readline-devel suitesparse-devel sundials-devel tex(dvips) BuildRequires: texlive-collection-fontsrecommended texlive-ec texlive-metapost zlib-devel BuildRequires: mesa-dri-drivers xorg-x11-apps BuildRequires: zip +BuildRequires: libXcursor-devel libXfixes-devel libXext-devel libXinerama-devel Requires: epstool gnuplot gnuplot-common hdf5 hicolor-icon-theme java-headless less info Requires: texinfo tex(amssymb.sty) tex(fontenc.sty) tex(graphicx.sty) tex(hyperref.sty) Requires: tex(inputenc.sty) tex(listings.sty) tex(lmodern.sty) tex(mathtools.sty) @@ -232,5 +234,8 @@ make check %{_pkgdocdir}/refcard*.pdf %changelog +* Wed Apr 24 2024 lilong - 5.1.0-2 +- Fix type error:incorrect namespace used + * Fri Jul 16 2021 huanghaitao - 5.1.0-1 - package init -- Gitee