From 3f5a322ffedea0107364b6dcce61ebd63f230c17 Mon Sep 17 00:00:00 2001
From: zhangxianting <zhangxianting@uniontech.com>
Date: Fri, 16 Aug 2024 17:52:05 +0800
Subject: [PATCH] fix build error

(cherry picked from commit d597cb82ceb30f2c5e1f9ce444a805479f523139)
---
 ...ild-error-streampos-is-member-of-std.patch | 25 +++++++++++++++++++
 octave.spec                                   |  7 +++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 fix-build-error-streampos-is-member-of-std.patch

diff --git a/fix-build-error-streampos-is-member-of-std.patch b/fix-build-error-streampos-is-member-of-std.patch
new file mode 100644
index 0000000..e18dcaa
--- /dev/null
+++ b/fix-build-error-streampos-is-member-of-std.patch
@@ -0,0 +1,25 @@
+From 05a915983f723e26d1c6fb30605b05e60cb62f6c Mon Sep 17 00:00:00 2001
+From: zhangxianting <zhangxianting@uniontech.com>
+Date: Fri, 16 Aug 2024 17:46:58 +0800
+Subject: [PATCH] fix build error, streampos is a member of 'std', not 'std::ios'
+
+---
+ 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..e7f8e8a 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:              fix-build-error-streampos-is-member-of-std.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
+* Fri Aug 16 2024 zhangxianting <zhangxianting@uniontech.com> - 6:5.1.0-2
+- fix build error, streampos is a member of 'std', not 'std::ios'
+
 * Fri Jul 16 2021 huanghaitao <huanghaitao8@huawei.com> - 5.1.0-1
 - package init
-- 
Gitee