[packages/octave/DEVEL-4.4] - added c++ patch (namespace fix) - added no-tex-docs patch (disable tex-generated docs, fails with

[qboosh]

commit 23702b6dffb68a6b9ba771ce982c892387a2f1d3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Dec 21 06:40:09 2022 +0100

    - added c++ patch (namespace fix)
    - added no-tex-docs patch (disable tex-generated docs, fails with our texlive)

 octave-c++.patch         | 11 +++++++++++
 octave-no-tex-docs.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
 octave.spec              |  4 ++++
 3 files changed, 65 insertions(+)
---
diff --git a/octave.spec b/octave.spec
index 9220e51..edfc765 100644
--- a/octave.spec
+++ b/octave.spec
@@ -34,6 +34,8 @@ Patch0:		%{name}-info.patch
 Patch1:		%{name}-build.patch
 Patch2:		%{name}-suitesparse.patch
 Patch3:		octdirs.patch
+Patch4:		%{name}-c++.patch
+Patch5:		%{name}-no-tex-docs.patch
 URL:		http://www.octave.org/
 BuildRequires:	AMD-devel >= 2.4.0
 BuildRequires:	CAMD-devel
@@ -336,6 +338,8 @@ Pliki nagłówkowe i dodatkowa dokumentacja Octave.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}
diff --git a/octave-c++.patch b/octave-c++.patch
new file mode 100644
index 0000000..0995729
--- /dev/null
+++ b/octave-c++.patch
@@ -0,0 +1,11 @@
+--- octave-4.4.1/liboctave/util/lo-utils.cc.orig	2018-08-09 20:20:32.000000000 +0200
++++ octave-4.4.1/liboctave/util/lo-utils.cc	2022-12-16 19:29:49.495296270 +0100
+@@ -261,7 +261,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 = ' ';
+ 
diff --git a/octave-no-tex-docs.patch b/octave-no-tex-docs.patch
new file mode 100644
index 0000000..4ee4048
--- /dev/null
+++ b/octave-no-tex-docs.patch
@@ -0,0 +1,50 @@
+--- octave-4.4.1/doc/interpreter/module.mk.orig	2022-12-17 16:52:56.480904895 +0100
++++ octave-4.4.1/doc/interpreter/module.mk	2022-12-19 20:27:29.924079565 +0100
+@@ -311,8 +311,6 @@ $(HTMLDIR_IMAGES) $(HTMLDIR_CSS) : %reld
+ DOC_TARGETS += \
+   $(srcdir)/%reldir%/octave.info \
+   %reldir%/doc-cache \
+-  %reldir%/octave.ps \
+-  %reldir%/octave.pdf \
+   $(OCTAVE_HTML_STAMP) \
+   $(HTMLDIR_IMAGES) \
+   $(HTMLDIR_CSS)
+--- octave-4.4.1/doc/liboctave/module.mk.orig	2022-12-17 16:52:56.480904895 +0100
++++ octave-4.4.1/doc/liboctave/module.mk	2022-12-19 20:28:01.644243224 +0100
+@@ -51,16 +51,11 @@ HTMLS += %reldir%/liboctave.html
+ 
+ DOC_TARGETS += \
+   $(srcdir)/%reldir%/liboctave.info \
+-  %reldir%/liboctave.ps \
+-  %reldir%/liboctave.pdf \
+   %reldir%/liboctave.html
+ 
+ doc_EXTRA_DIST += \
+   $(liboctave_TEXINFOS) \
+   $(srcdir)/%reldir%/liboctave.info \
+-  %reldir%/liboctave.dvi \
+-  %reldir%/liboctave.ps \
+-  %reldir%/liboctave.pdf \
+   %reldir%/liboctave.html
+ 
+ ## The TeX software suite is used to create both PDF and PS output formats.
+--- octave-4.4.1/doc/refcard/module.mk.orig	2022-12-17 16:52:56.480904895 +0100
++++ octave-4.4.1/doc/refcard/module.mk	2022-12-19 20:28:46.114472668 +0100
+@@ -26,8 +26,7 @@ refcard_FORMATTED = \
+   $(refcard_PDF) \
+   $(refcard_PS)
+ 
+-DOC_TARGETS += \
+-  $(refcard_FORMATTED)
++DOC_TARGETS +=
+ 
+ %reldir%/refcard-a4.pdf: %reldir%/refcard.tex
+ %reldir%/refcard-a4.dvi: %reldir%/refcard.tex
+@@ -58,7 +57,6 @@ $(refcard_PDF) : %.pdf : %.tex | %reldir
+ 	$(PDFTEX) $(<F) $(AM_V_texidevnull)
+ 
+ doc_EXTRA_DIST += \
+-  $(refcard_FORMATTED) \
+   $(refcard_TEX_SRC)
+ 
+ doc_CLEANFILES += \
================================================================

---- gitweb:

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