packages/octave
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!25 Delete requires gnuplot because the package license is not allow

Browse Source 
From: @wk333 
Reviewed-by: @weixizhu94, @sinever 
Signed-off-by: @weixizhu94
This commit is contained in:
openeuler-ci-bot 2024-11-20 09:06:06 +00:00 committed by Gitee
commit 227c8ffc49
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fix-build-error-streampos-is-member-of-std.patch Normal file
View File

@ -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

14
octave.spec
View File

@ -5,7 +5,7 @@
Name: octave
Epoch: 6
Version: 5.1.0
Release: 1
Release: 3
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)
@ -33,7 +34,7 @@ BuildRequires: lzip
BuildRequires: automake libtool desktop-file-utils libappstream-glib
BuildRequires: arpack-devel openblas-devel bison bzip2-devel curl-devel fftw-devel flex
BuildRequires: fltk-devel ftgl-devel gcc-c++ gcc-gfortran ghostscript gl2ps-devel glpk-devel
BuildRequires: gnuplot gperf GraphicsMagick-c++-devel hdf5-devel java-devel less
BuildRequires: gperf GraphicsMagick-c++-devel hdf5-devel java-devel less
BuildRequires: libsndfile-devel libX11-devel llvm-devel mesa-libGL-devel mesa-libGLU-devel
BuildRequires: mesa-libOSMesa-devel ncurses-devel pcre-devel portaudio-devel qhull-devel
BuildRequires: qrupdate-devel qscintilla-qt5-devel qt5-linguist qt5-qttools-devel
@ -41,7 +42,8 @@ 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
Requires: epstool gnuplot gnuplot-common hdf5 hicolor-icon-theme java-headless less info
BuildRequires: libXcursor-devel libXfixes-devel libXext-devel libXinerama-devel
Requires: epstool 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)
Requires: tex(titlesec.sty) tex(xcolor.sty) tex(color.sty) tex(epsfig.sty)
@ -232,5 +234,11 @@ make check
%{_pkgdocdir}/refcard*.pdf
%changelog
* Wed Sep 11 2024 wangkai <13474090681@163.com> - 6:5.1.0-3
- Delete requires gnuplot because the package license is not allow
* 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