On 2024-11-24 19:49, Christian Weisgerber wrote:
+- canonical_host_type=$host
++ canonical_host_type=$host_cpu-$host_vendor-$host_os
Why this part?
configure --host=... should already set this. I removed this part
of the patch, ran configure, and canonical_host_type was set to
"x86_64-unknown-openbsd".
You're right, that was a leftover from an earlier attempt that I forgot to
revert.
New diff attached...
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/octave/Makefile,v
diff -u -p -r1.143 Makefile
--- Makefile 15 Sep 2024 18:15:17 -0000 1.143
+++ Makefile 24 Nov 2024 21:52:05 -0000
@@ -1,16 +1,15 @@
COMMENT = Scientific Programming Language
-VERSION = 7.3.0
+VERSION = 9.2.0
DISTNAME = octave-${VERSION}
-REVISION = 9
EXTRACT_SUFX = .tar.xz
CATEGORIES = math
-SHARED_LIBS += octave 16.0
-SHARED_LIBS += octgui 10.0
-SHARED_LIBS += octinterp 15.0
+SHARED_LIBS += octave 17.0
+SHARED_LIBS += octgui 11.0
+SHARED_LIBS += octinterp 16.0
-HOMEPAGE = https://www.gnu.org/software/octave/
+HOMEPAGE = https://www.octave.org
MAINTAINER = Steven Mestdagh <ste...@openbsd.org>
@@ -18,8 +17,12 @@ MAINTAINER = Steven Mestdagh <steven@ope
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} FLAC GL GLU GraphicsMagick GraphicsMagick++
-WANTLIB += ICE Qt5Core Qt5Gui Qt5Help Qt5Network Qt5OpenGL Qt5PrintSupport
-WANTLIB += Qt5Sql Qt5Widgets Qt5Xml SM X11 X11-xcb Xau Xdmcp Xext
+WANTLIB += EGL Qt6Core Qt6DBus Qt6Gui Qt6Help Qt6Network Qt6OpenGL
+WANTLIB += Qt6OpenGLWidgets Qt6PrintSupport Qt6Sql Qt6Widgets
+WANTLIB += Qt6Xml Qt6Core5Compat b2 brotlicommon brotlidec dbus-1 duktape
+WANTLIB += gbm gio-2.0 gmodule-2.0 gobject-2.0 proxy qscintilla2_qt6
+WANTLIB += ffi xkbcommon
+WANTLIB += ICE SM X11 X11-xcb Xau Xdmcp Xext
WANTLIB += Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm amd arpack
WANTLIB += blas bz2 c camd ccolamd cholmod colamd crypto curl
WANTLIB += curses cxsparse double-conversion drm ereadline execinfo
@@ -27,8 +30,8 @@ WANTLIB += expat fftw3 fftw3_threads fft
WANTLIB += freetype gl2ps glapi glib-2.0 glpk glut gmp graphite2
WANTLIB += gthread-2.0 harfbuzz hdf5 iconv icudata icui18n icuuc
WANTLIB += intl lapack lcms2 ltdl m mp3lame mpg123 nghttp2 nghttp3
-WANTLIB += ngtcp2 ngtcp2_crypto_quictls ogg opus pcre pcre2-16
-WANTLIB += pcre2-8 png portaudio qhull_r qrupdate qscintilla2_qt5
+WANTLIB += ngtcp2 ngtcp2_crypto_quictls ogg opus pcre2-16
+WANTLIB += pcre2-8 png portaudio qhull_r qrupdate
WANTLIB += sndfile sndio spqr ssl suitesparseconfig umfpack util
WANTLIB += vorbis vorbisenc xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present
WANTLIB += xcb-randr xcb-shm xcb-sync xcb-xfixes xshmfence z zstd
@@ -37,12 +40,13 @@ WANTLIB += ${MODFORTRAN_WANTLIB}
SITES = ${SITE_GNU:=octave/}
MODULES = fortran \
- x11/qt5
+ x11/qt6
BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS} \
math/gnuplot \
print/texinfo \
- textproc/gsed
+ textproc/gsed \
+ textproc/rapidjson
MODFORTRAN_COMPILER = gfortran
@@ -58,10 +62,10 @@ LIB_DEPENDS = ${MODFORTRAN_LIB_DEPENDS}
audio/portaudio-svn \
audio/lame \
audio/mpg123 \
+ archivers/brotli \
devel/glpk \
- devel/pcre \
devel/readline \
- editors/qscintilla \
+ editors/qscintilla,qt6 \
graphics/GraphicsMagick \
math/arpack \
math/fftw3 \
@@ -73,32 +77,35 @@ LIB_DEPENDS = ${MODFORTRAN_LIB_DEPENDS}
net/curl \
textproc/icu4c \
print/gl2ps \
- x11/qt5/qttools,-main
+ x11/qt6/qt5compat \
+ x11/qt6/qttools
SEPARATE_BUILD = Yes
USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --disable-java \
- --disable-rapidjson \
- --without-fltk
+ --host=${GNU_HOST} \
+ --without-fltk \
+ --without-libreadline-prefix \
+ --with-libreadline-prefix=${LOCALBASE}
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
-I${LOCALBASE}/include/ereadline" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
- LRELEASE="${MODQT_LRELEASE}" \
- CFLAGS="${CFLAGS} -std=gnu11" \
- CXXFLAGS="${CXXFLAGS} -std=gnu++11" \
-
QCOLLECTIONGENERATOR_QTVER=${LOCALBASE}/lib/qt5/bin/qcollectiongenerator \
- QHELPGENERATOR=${LOCALBASE}/lib/qt5/bin/qhelpgenerator
+ CFLAGS="${CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS}"
+
# Some tests fail when a tilde doesn't expand to a home directory
-PORT_HOME = "${WRKBUILD}"
+PORTHOME = ${WRKBUILD}
+TEST_ENV += HOME=${PORTHOME}
+
+# Construct a host without OSREV
+GCC_ARCH = ${MACHINE_ARCH}-unknown-openbsd
+GNU_HOST = ${GCC_ARCH:S/amd64/x86_64/}
-# needed to build on amd64
-GCC_ARCH = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
-GNU_ARCH = ${GCC_ARCH:S/amd64/x86_64/}
-SUBST_VARS = GNU_ARCH VERSION
+SUBST_VARS += GNU_HOST VERSION
post-extract:
.for i in makeinfo texi2dvi texi2pdf
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/octave/distinfo,v
diff -u -p -r1.26 distinfo
--- distinfo 13 Nov 2022 19:13:38 -0000 1.26
+++ distinfo 24 Nov 2024 21:52:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (octave-7.3.0.tar.xz) = pQjuauvM+miWfJ5+Cgh5PEyo5N2s5yOqvbj3GtNNV/E=
-SIZE (octave-7.3.0.tar.xz) = 26215288
+SHA256 (octave-9.2.0.tar.xz) = IUF6+1eRBbA1ysC+oJIBUi44SJOukKeBuHJ++jJ2WAc=
+SIZE (octave-9.2.0.tar.xz) = 27425184
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
diff -u -p -r1.18 patch-configure
--- patches/patch-configure 24 Aug 2022 19:53:39 -0000 1.18
+++ patches/patch-configure 24 Nov 2024 21:52:05 -0000
@@ -1,9 +1,56 @@
-Use GNU readline as our base readline lacks rl_prefer_env_winsize.
+* Use GNU readline as our base readline lacks rl_prefer_env_winsize
Index: configure
--- configure.orig
+++ configure
-@@ -80591,7 +80591,7 @@ printf "%s\n" "$as_me: WARNING: $warn_rapidjson" >&2;}
+@@ -82150,21 +82150,21 @@ fi
+ case "$found_dir" in
+ */$acl_libdirstem | */$acl_libdirstem/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e
"s,/$acl_libdirstem/"'*$,,'`
+- if test "$name" = 'readline'; then
++ if test "$name" = 'ereadline'; then
+ LIBREADLINE_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
+ */$acl_libdirstem2 | */$acl_libdirstem2/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e
"s,/$acl_libdirstem2/"'*$,,'`
+- if test "$name" = 'readline'; then
++ if test "$name" = 'ereadline'; then
+ LIBREADLINE_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
+ */$acl_libdirstem3 | */$acl_libdirstem3/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e
"s,/$acl_libdirstem3/"'*$,,'`
+- if test "$name" = 'readline'; then
++ if test "$name" = 'ereadline'; then
+ LIBREADLINE_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+@@ -82384,8 +82384,8 @@ fi
+ done
+
+
+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline" >&5
+-printf %s "checking for readline... " >&6; }
++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ereadline" >&5
++printf %s "checking for ereadline... " >&6; }
+ if test ${gl_cv_lib_readline+y}
+ then :
+ printf %s "(cached) " >&6
+@@ -82448,8 +82448,8 @@ printf "%s\n" "#define HAVE_READLINE 1" >>confdefs.h
+ LIBREADLINE="$LIBREADLINE $extra_lib"
+ LTLIBREADLINE="$LTLIBREADLINE $extra_lib"
+ fi
+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with
libreadline" >&5
+-printf %s "checking how to link with libreadline... " >&6; }
++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with
libereadline" >&5
++printf %s "checking how to link with libereadline... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBREADLINE" >&5
+ printf "%s\n" "$LIBREADLINE" >&6; }
+ else
+@@ -92439,7 +92439,7 @@ printf "%s\n" "$as_me: WARNING: $warn_rapidjson" >&2;}
fi
@@ -11,31 +58,13 @@ Index: configure
+### Check for ereadline library.
- TERM_LIBS=
-@@ -80694,14 +80694,14 @@ fi
-
- ac_octave_save_LIBS="$LIBS"
- LIBS="$TERM_LIBS"
-- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for
rl_set_keyboard_input_timeout in -lreadline" >&5
--printf %s "checking for rl_set_keyboard_input_timeout in -lreadline... " >&6;
}
-+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for
rl_set_keyboard_input_timeout in -lereadline" >&5
-+printf %s "checking for rl_set_keyboard_input_timeout in -lereadline... "
>&6; }
- if test ${ac_cv_lib_readline_rl_set_keyboard_input_timeout+y}
- then :
- printf %s "(cached) " >&6
- else $as_nop
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lreadline $LIBS"
-+LIBS="-lereadline $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-@@ -80739,7 +80739,7 @@ fi
- printf "%s\n" "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
- if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes
- then :
-- READLINE_LIBS="-lreadline"
-+ READLINE_LIBS="-lereadline"
-
- printf "%s\n" "#define USE_READLINE 1" >>confdefs.h
-
+ USE_READLINE=yes
+@@ -92525,7 +92525,7 @@ fi
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+- names_next_round='readline '
++ names_next_round='ereadline '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
Index: patches/patch-doc_interpreter_mk-qthelp_pl
===================================================================
RCS file: patches/patch-doc_interpreter_mk-qthelp_pl
diff -N patches/patch-doc_interpreter_mk-qthelp_pl
--- patches/patch-doc_interpreter_mk-qthelp_pl 5 May 2024 18:30:03 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-https://hg.savannah.gnu.org/hgweb/octave/raw-rev/ab6d276f6fcb
-
-Index: doc/interpreter/mk-qthelp.pl
---- doc/interpreter/mk-qthelp.pl.orig
-+++ doc/interpreter/mk-qthelp.pl
-@@ -26,9 +26,12 @@ $htmlfname = File::Spec->catfile ($basedir, $htmldir,
- open (my $HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
-
- # Skip through preamble of file to find start of list
--while (($_ = <$HTML>) !~ /^<div class="contents">/ ) {;}
--while (($_ = <$HTML>) !~ /^<ul class="no-bullet">/ ) {;}
-+while (defined ($_ = <$HTML>) and ! /^<div class="contents">/ ) {;}
-+while (defined ($_ = <$HTML>)
-+ and ! /^<ul class="(?:no-bullet|toc-numbered-mark)">/ ) {;}
-
-+die "index.html: reached EOF without finding data start pattern" if eof
($HTML);
-+
- $level = 0;
- while (<$HTML>)
- {
-@@ -68,7 +71,11 @@ $htmlfname = File::Spec->catfile ($basedir, $htmldir,
- open ($HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
-
- # Skip through preamble of file to find start of list
--while (($_ = <$HTML>) !~ /^<table class="index-fn/ ) {;}
-+while (defined ($_ = <$HTML>)
-+ and ! /^<table class="(?:index-fn|fn-entries)/ ) {;}
-+
-+die "Function-Index.html: reached EOF without finding data start pattern"
-+ if eof ($HTML);
-
- while (<$HTML>)
- {
Index: patches/patch-scripts_miscellaneous_memory_m
===================================================================
RCS file: /cvs/ports/math/octave/patches/patch-scripts_miscellaneous_memory_m,v
diff -u -p -r1.2 patch-scripts_miscellaneous_memory_m
--- patches/patch-scripts_miscellaneous_memory_m 24 Aug 2022 19:53:39
-0000 1.2
+++ patches/patch-scripts_miscellaneous_memory_m 24 Nov 2024 21:52:05
-0000
@@ -4,7 +4,7 @@ Show warning/error and skip test
Index: scripts/miscellaneous/memory.m
--- scripts/miscellaneous/memory.m.orig
+++ scripts/miscellaneous/memory.m
-@@ -151,7 +151,7 @@
+@@ -149,7 +149,7 @@
function [userdata, systemdata] = memory ()
@@ -13,7 +13,7 @@ Index: scripts/miscellaneous/memory.m
if (nargout > 0)
error ("memory: function not yet implemented for this architecture");
else
-@@ -280,14 +280,14 @@ function [status, meminfo] = lmemory ()
+@@ -284,14 +284,14 @@ function [status, meminfo] = lmemory ()
endfunction
Index: patches/patch-scripts_miscellaneous_private_tar_is_bsd_m
===================================================================
RCS file:
/cvs/ports/math/octave/patches/patch-scripts_miscellaneous_private_tar_is_bsd_m,v
diff -u -p -r1.1 patch-scripts_miscellaneous_private_tar_is_bsd_m
--- patches/patch-scripts_miscellaneous_private_tar_is_bsd_m 26 Apr 2022
14:47:40 -0000 1.1
+++ patches/patch-scripts_miscellaneous_private_tar_is_bsd_m 24 Nov 2024
21:52:05 -0000
@@ -3,20 +3,19 @@ Force usage of gtar
Index: scripts/miscellaneous/private/tar_is_bsd.m
--- scripts/miscellaneous/private/tar_is_bsd.m.orig
+++ scripts/miscellaneous/private/tar_is_bsd.m
-@@ -37,15 +37,6 @@
+@@ -39,13 +39,13 @@ function out = tar_is_bsd ()
- function out = tar_is_bsd ()
-
-- ## BSD tar needs to be handled differently from GNU tar
-- persistent cache
+ ## BSD tar needs to be handled differently from GNU tar
+ persistent cache;
- if (isempty (cache))
-- [status, tar_ver_str] = system ("tar --version");
-- if (status)
-- error ("tar: Failed executing tar --version (status = %d)", status);
-- endif
-- cache = ! isempty (regexp (tar_ver_str, "bsdtar"));
-- endif
++ if (0)
+ [status, tar_ver_str] = system ("tar --version");
+ if (status)
+ error ("tar: Failed executing tar --version (status = %d)", status);
+ endif
+ cache = ! isempty (regexp (tar_ver_str, "bsdtar"));
+ endif
- out = cache;
-+ out = 0;
++ out = 0;
endfunction
Index: patches/patch-scripts_miscellaneous_unpack_m
===================================================================
RCS file: /cvs/ports/math/octave/patches/patch-scripts_miscellaneous_unpack_m,v
diff -u -p -r1.5 patch-scripts_miscellaneous_unpack_m
--- patches/patch-scripts_miscellaneous_unpack_m 13 Nov 2022 19:13:38
-0000 1.5
+++ patches/patch-scripts_miscellaneous_unpack_m 24 Nov 2024 21:52:05
-0000
@@ -25,7 +25,7 @@ Index: scripts/miscellaneous/unpack.m
@__parse_tar__, false};
commandlist.tarbz = commandlist.tarbz2;
commandlist.tbz2 = commandlist.tarbz2;
-@@ -332,7 +332,9 @@ function files = __parse_gzip__ (output)
+@@ -333,7 +333,9 @@ function files = __parse_gzip__ (output)
## Parse the output from gzip and gunzip returning the files
## compressed (or decompressed).
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
diff -u -p -r1.30 PLIST
--- pkg/PLIST 13 Nov 2022 19:13:38 -0000 1.30
+++ pkg/PLIST 24 Nov 2024 21:52:05 -0000
@@ -8,7 +8,9 @@ bin/octave-config
@bin bin/octave-config-${VERSION}
include/octave-${VERSION}/
include/octave-${VERSION}/octave/
+include/octave-${VERSION}/octave/Array-base.cc
include/octave-${VERSION}/octave/Array-fwd.h
+include/octave-${VERSION}/octave/Array-oct.cc
include/octave-${VERSION}/octave/Array-util.h
include/octave-${VERSION}/octave/Array.cc
include/octave-${VERSION}/octave/Array.h
@@ -139,6 +141,7 @@ include/octave-${VERSION}/octave/file-st
include/octave-${VERSION}/octave/filepos.h
include/octave-${VERSION}/octave/ft-text-renderer.h
include/octave-${VERSION}/octave/gepbalance.h
+include/octave-${VERSION}/octave/gh-manager.h
include/octave-${VERSION}/octave/gl-render.h
include/octave-${VERSION}/octave/gl2ps-print.h
include/octave-${VERSION}/octave/glob-match.h
@@ -169,7 +172,6 @@ include/octave-${VERSION}/octave/lo-amos
include/octave-${VERSION}/octave/lo-arpack-proto.h
include/octave-${VERSION}/octave/lo-array-errwarn.h
include/octave-${VERSION}/octave/lo-blas-proto.h
-include/octave-${VERSION}/octave/lo-cutils.h
include/octave-${VERSION}/octave/lo-error.h
include/octave-${VERSION}/octave/lo-hash.h
include/octave-${VERSION}/octave/lo-ieee.h
@@ -537,6 +539,7 @@ include/octave-${VERSION}/octave/oct-ato
include/octave-${VERSION}/octave/oct-base64.h
include/octave-${VERSION}/octave/oct-binmap.h
include/octave-${VERSION}/octave/oct-cmplx.h
+include/octave-${VERSION}/octave/oct-conf-post-public.h
include/octave-${VERSION}/octave/oct-convn.h
include/octave-${VERSION}/octave/oct-env.h
include/octave-${VERSION}/octave/oct-errno.h
@@ -581,10 +584,15 @@ include/octave-${VERSION}/octave/octave-
include/octave-${VERSION}/octave/octave-preserve-stream-state.h
include/octave-${VERSION}/octave/octave.h
include/octave-${VERSION}/octave/ops.h
+include/octave-${VERSION}/octave/ov-base-diag.cc
include/octave-${VERSION}/octave/ov-base-diag.h
+include/octave-${VERSION}/octave/ov-base-int.cc
include/octave-${VERSION}/octave/ov-base-int.h
+include/octave-${VERSION}/octave/ov-base-mat.cc
include/octave-${VERSION}/octave/ov-base-mat.h
+include/octave-${VERSION}/octave/ov-base-scalar.cc
include/octave-${VERSION}/octave/ov-base-scalar.h
+include/octave-${VERSION}/octave/ov-base-sparse.cc
include/octave-${VERSION}/octave/ov-base-sparse.h
include/octave-${VERSION}/octave/ov-base.h
include/octave-${VERSION}/octave/ov-bool-mat.h
@@ -610,6 +618,7 @@ include/octave-${VERSION}/octave/ov-flt-
include/octave-${VERSION}/octave/ov-flt-cx-mat.h
include/octave-${VERSION}/octave/ov-flt-re-diag.h
include/octave-${VERSION}/octave/ov-flt-re-mat.h
+include/octave-${VERSION}/octave/ov-inline.h
include/octave-${VERSION}/octave/ov-int-traits.h
include/octave-${VERSION}/octave/ov-int16.h
include/octave-${VERSION}/octave/ov-int32.h
@@ -792,46 +801,46 @@ lib/octave/${VERSION}/liboctgui.la
lib/octave/${VERSION}/liboctinterp.la
@lib lib/octave/${VERSION}/liboctinterp.so.${LIBoctinterp_VERSION}
lib/octave/${VERSION}/oct/
-lib/octave/${VERSION}/oct/${GNU_ARCH}/
-lib/octave/${VERSION}/oct/${GNU_ARCH}/PKG_ADD
-@bin lib/octave/${VERSION}/oct/${GNU_ARCH}/__delaunayn__.oct
-@bin lib/octave/${VERSION}/oct/${GNU_ARCH}/__fltk_uigetfile__.oct
-@bin lib/octave/${VERSION}/oct/${GNU_ARCH}/__glpk__.oct
-@bin lib/octave/${VERSION}/oct/${GNU_ARCH}/__init_fltk__.oct
-@bin lib/octave/${VERSION}/oct/${GNU_ARCH}/__init_gnuplot__.oct
-@bin lib/octave/${VERSION}/oct/${GNU_ARCH}/__ode15__.oct
-@bin lib/octave/${VERSION}/oct/${GNU_ARCH}/__voronoi__.oct
-@bin lib/octave/${VERSION}/oct/${GNU_ARCH}/audiodevinfo.oct
-@bin lib/octave/${VERSION}/oct/${GNU_ARCH}/audioread.oct
-@bin lib/octave/${VERSION}/oct/${GNU_ARCH}/convhulln.oct
-@bin lib/octave/${VERSION}/oct/${GNU_ARCH}/fftw.oct
-@bin lib/octave/${VERSION}/oct/${GNU_ARCH}/gzip.oct
+lib/octave/${VERSION}/oct/${GNU_HOST}/
+lib/octave/${VERSION}/oct/${GNU_HOST}/PKG_ADD
+@bin lib/octave/${VERSION}/oct/${GNU_HOST}/__delaunayn__.oct
+@bin lib/octave/${VERSION}/oct/${GNU_HOST}/__fltk_uigetfile__.oct
+@bin lib/octave/${VERSION}/oct/${GNU_HOST}/__glpk__.oct
+@bin lib/octave/${VERSION}/oct/${GNU_HOST}/__init_fltk__.oct
+@bin lib/octave/${VERSION}/oct/${GNU_HOST}/__init_gnuplot__.oct
+@bin lib/octave/${VERSION}/oct/${GNU_HOST}/__ode15__.oct
+@bin lib/octave/${VERSION}/oct/${GNU_HOST}/__voronoi__.oct
+@bin lib/octave/${VERSION}/oct/${GNU_HOST}/audiodevinfo.oct
+@bin lib/octave/${VERSION}/oct/${GNU_HOST}/audioread.oct
+@bin lib/octave/${VERSION}/oct/${GNU_HOST}/convhulln.oct
+@bin lib/octave/${VERSION}/oct/${GNU_HOST}/fftw.oct
+@bin lib/octave/${VERSION}/oct/${GNU_HOST}/gzip.oct
lib/octave/${VERSION}/site/
lib/octave/${VERSION}/site/oct/
-lib/octave/${VERSION}/site/oct/${GNU_ARCH}/
+lib/octave/${VERSION}/site/oct/${GNU_HOST}/
lib/octave/site/
lib/octave/site/oct/
-lib/octave/site/oct/api-v57/
-lib/octave/site/oct/api-v57/${GNU_ARCH}/
-lib/octave/site/oct/${GNU_ARCH}/
+lib/octave/site/oct/api-v59/
+lib/octave/site/oct/api-v59/${GNU_HOST}/
+lib/octave/site/oct/${GNU_HOST}/
lib/pkgconfig/octave.pc
lib/pkgconfig/octinterp.pc
libexec/octave/
libexec/octave/${VERSION}/
libexec/octave/${VERSION}/exec/
-libexec/octave/${VERSION}/exec/${GNU_ARCH}/
-@bin libexec/octave/${VERSION}/exec/${GNU_ARCH}/octave-gui
-@bin libexec/octave/${VERSION}/exec/${GNU_ARCH}/octave-svgconvert
+libexec/octave/${VERSION}/exec/${GNU_HOST}/
+@bin libexec/octave/${VERSION}/exec/${GNU_HOST}/octave-gui
+@bin libexec/octave/${VERSION}/exec/${GNU_HOST}/octave-svgconvert
libexec/octave/${VERSION}/site/
libexec/octave/${VERSION}/site/exec/
-libexec/octave/${VERSION}/site/exec/${GNU_ARCH}/
-libexec/octave/api-v57/
-libexec/octave/api-v57/site/
-libexec/octave/api-v57/site/exec/
-libexec/octave/api-v57/site/exec/${GNU_ARCH}/
+libexec/octave/${VERSION}/site/exec/${GNU_HOST}/
+libexec/octave/api-v59/
+libexec/octave/api-v59/site/
+libexec/octave/api-v59/site/exec/
+libexec/octave/api-v59/site/exec/${GNU_HOST}/
libexec/octave/site/
libexec/octave/site/exec/
-libexec/octave/site/exec/${GNU_ARCH}/
+libexec/octave/site/exec/${GNU_HOST}/
@man man/man1/mkoctfile.1
@man man/man1/octave-cli.1
@man man/man1/octave-config.1
@@ -851,7 +860,7 @@ share/icons/hicolor/512x512/apps/octave.
share/icons/hicolor/64x64/apps/octave.png
share/icons/hicolor/scalable/apps/octave.svg
share/metainfo/
-share/metainfo/org.octave.Octave.appdata.xml
+share/metainfo/org.octave.Octave.metainfo.xml
share/octave/
share/octave/${VERSION}/
share/octave/${VERSION}/data/
@@ -905,6 +914,7 @@ share/octave/${VERSION}/etc/tests/fixed/
share/octave/${VERSION}/etc/tests/fixed/@uint64/tbcover.m
share/octave/${VERSION}/etc/tests/fixed/@uint8/
share/octave/${VERSION}/etc/tests/fixed/@uint8/tbcover.m
+share/octave/${VERSION}/etc/tests/fixed/anonymous-function.tst
share/octave/${VERSION}/etc/tests/fixed/args.tst
share/octave/${VERSION}/etc/tests/fixed/bc-overloads.tst
share/octave/${VERSION}/etc/tests/fixed/bug-31371.tst
@@ -954,6 +964,9 @@ share/octave/${VERSION}/etc/tests/fixed/
share/octave/${VERSION}/etc/tests/fixed/bug-47680/bug-47680.tst
share/octave/${VERSION}/etc/tests/fixed/bug-47680/sub_bug47680.m
share/octave/${VERSION}/etc/tests/fixed/bug-47680/super_bug47680.m
+share/octave/${VERSION}/etc/tests/fixed/bug-48693/
+share/octave/${VERSION}/etc/tests/fixed/bug-48693/bug-48693.tst
+share/octave/${VERSION}/etc/tests/fixed/bug-48693/bug48693.m
share/octave/${VERSION}/etc/tests/fixed/bug-49379/
share/octave/${VERSION}/etc/tests/fixed/bug-49379/bug-49379.tst
share/octave/${VERSION}/etc/tests/fixed/bug-49379/class_bug49379.m
@@ -1090,11 +1103,30 @@ share/octave/${VERSION}/etc/tests/fixed/
share/octave/${VERSION}/etc/tests/fixed/bug-61191/subdir/
share/octave/${VERSION}/etc/tests/fixed/bug-61191/subdir/bug_61191.m
share/octave/${VERSION}/etc/tests/fixed/bug-61201.tst
+share/octave/${VERSION}/etc/tests/fixed/bug-63841/
+share/octave/${VERSION}/etc/tests/fixed/bug-63841/@cls2_b63841/
+share/octave/${VERSION}/etc/tests/fixed/bug-63841/@cls2_b63841/cls2_b63841.m
+share/octave/${VERSION}/etc/tests/fixed/bug-63841/@cls2_b63841/subsref.m
+share/octave/${VERSION}/etc/tests/fixed/bug-63841/bug-63841.tst
+share/octave/${VERSION}/etc/tests/fixed/bug-63841/cls_b63841.m
+share/octave/${VERSION}/etc/tests/fixed/bug-65037/
+share/octave/${VERSION}/etc/tests/fixed/bug-65037/bug-65037.tst
+share/octave/${VERSION}/etc/tests/fixed/bug-65037/bug65037_base.m
+share/octave/${VERSION}/etc/tests/fixed/bug-65037/bug65037_derived.m
+share/octave/${VERSION}/etc/tests/fixed/bug-65153.tst
+share/octave/${VERSION}/etc/tests/fixed/bug-65220/
+share/octave/${VERSION}/etc/tests/fixed/bug-65220/bug-65220.tst
+share/octave/${VERSION}/etc/tests/fixed/bug-65220/cdefdir/
+share/octave/${VERSION}/etc/tests/fixed/bug-65220/cdefdir/cdef_help1.m
+share/octave/${VERSION}/etc/tests/fixed/bug-65220/cdefdir/cdef_help2.m
share/octave/${VERSION}/etc/tests/fixed/class-concat/
share/octave/${VERSION}/etc/tests/fixed/class-concat/@foo/
share/octave/${VERSION}/etc/tests/fixed/class-concat/@foo/foo.m
share/octave/${VERSION}/etc/tests/fixed/class-concat/class-concat.tst
share/octave/${VERSION}/etc/tests/fixed/classdef/
+share/octave/${VERSION}/etc/tests/fixed/classdef-debug/
+share/octave/${VERSION}/etc/tests/fixed/classdef-debug/classdef_breakpoints.m
+share/octave/${VERSION}/etc/tests/fixed/classdef-debug/test_classdef_breakpoints.tst
share/octave/${VERSION}/etc/tests/fixed/classdef-multiple-inheritance/
share/octave/${VERSION}/etc/tests/fixed/classdef-multiple-inheritance/base_1.m
share/octave/${VERSION}/etc/tests/fixed/classdef-multiple-inheritance/base_2.m
@@ -1295,6 +1327,13 @@ share/octave/${VERSION}/etc/tests/fixed/
share/octave/${VERSION}/etc/tests/fixed/fcn-handle/shared-ctx.tst
share/octave/${VERSION}/etc/tests/fixed/fcn-handle/shared_ctx.m
share/octave/${VERSION}/etc/tests/fixed/fcn-handle/static-method.tst
+share/octave/${VERSION}/etc/tests/fixed/file-encoding/
+share/octave/${VERSION}/etc/tests/fixed/file-encoding/.oct-config
+share/octave/${VERSION}/etc/tests/fixed/file-encoding/CP1251/
+share/octave/${VERSION}/etc/tests/fixed/file-encoding/CP1251/.oct-config
+share/octave/${VERSION}/etc/tests/fixed/file-encoding/CP1251/test_CP1251.m
+share/octave/${VERSION}/etc/tests/fixed/file-encoding/file-encoding.tst
+share/octave/${VERSION}/etc/tests/fixed/file-encoding/test_CP1252.m
share/octave/${VERSION}/etc/tests/fixed/for.tst
share/octave/${VERSION}/etc/tests/fixed/func.tst
share/octave/${VERSION}/etc/tests/fixed/global.tst
@@ -1312,6 +1351,12 @@ share/octave/${VERSION}/etc/tests/fixed/
share/octave/${VERSION}/etc/tests/fixed/jupyter-notebook/plot_magic_and_errors.ipynb
share/octave/${VERSION}/etc/tests/fixed/leftdiv.tst
share/octave/${VERSION}/etc/tests/fixed/line-continue.tst
+share/octave/${VERSION}/etc/tests/fixed/load-path/
+share/octave/${VERSION}/etc/tests/fixed/load-path/in-load-path/
+share/octave/${VERSION}/etc/tests/fixed/load-path/in-load-path/load_path_fcn.m
+share/octave/${VERSION}/etc/tests/fixed/load-path/not-in-load-path/
+share/octave/${VERSION}/etc/tests/fixed/load-path/not-in-load-path/load_path_fcn.m
+share/octave/${VERSION}/etc/tests/fixed/load-path/refresh-load-path.tst
share/octave/${VERSION}/etc/tests/fixed/local-functions/
share/octave/${VERSION}/etc/tests/fixed/local-functions/local_function_eval.m
share/octave/${VERSION}/etc/tests/fixed/local-functions/local_functions.tst
@@ -1437,6 +1482,7 @@ share/octave/${VERSION}/etc/tests/libint
share/octave/${VERSION}/etc/tests/libinterp/corefcn/find.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/gcd.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/getrusage.cc-tst
+share/octave/${VERSION}/etc/tests/libinterp/corefcn/gh-manager.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/givens.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/graphics.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/gsvd.cc-tst
@@ -1462,7 +1508,9 @@ share/octave/${VERSION}/etc/tests/libint
share/octave/${VERSION}/etc/tests/libinterp/corefcn/oct-map.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/ordqz.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/ordschur.cc-tst
+share/octave/${VERSION}/etc/tests/libinterp/corefcn/perms.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/pinv.cc-tst
+share/octave/${VERSION}/etc/tests/libinterp/corefcn/pow2.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/pr-output.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/psi.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/qr.cc-tst
@@ -1484,6 +1532,7 @@ share/octave/${VERSION}/etc/tests/libint
share/octave/${VERSION}/etc/tests/libinterp/corefcn/svd.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/sylvester.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/symbfact.cc-tst
+share/octave/${VERSION}/etc/tests/libinterp/corefcn/symrcm.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/symtab.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/syscalls.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/corefcn/sysdep.cc-tst
@@ -1508,7 +1557,8 @@ share/octave/${VERSION}/etc/tests/libint
share/octave/${VERSION}/etc/tests/libinterp/dldfcn/fftw.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/dldfcn/gzip.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/octave-value/
-share/octave/${VERSION}/etc/tests/libinterp/octave-value/ov-base.cc-tst
+share/octave/${VERSION}/etc/tests/libinterp/octave-value/ov-base-mat.cc-tst
+share/octave/${VERSION}/etc/tests/libinterp/octave-value/ov-base-sparse.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/octave-value/ov-bool-mat.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/octave-value/ov-cell.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/octave-value/ov-class.cc-tst
@@ -1537,7 +1587,7 @@ share/octave/${VERSION}/etc/tests/libint
share/octave/${VERSION}/etc/tests/libinterp/parse-tree/pt-tm-const.cc-tst
share/octave/${VERSION}/etc/tests/liboctave/
share/octave/${VERSION}/etc/tests/liboctave/array/
-share/octave/${VERSION}/etc/tests/liboctave/array/Array.cc-tst
+share/octave/${VERSION}/etc/tests/liboctave/array/Array-base.cc-tst
share/octave/${VERSION}/etc/tests/liboctave/array/CMatrix.cc-tst
share/octave/${VERSION}/etc/tests/liboctave/array/CSparse.cc-tst
share/octave/${VERSION}/etc/tests/liboctave/array/Sparse.cc-tst
@@ -1549,6 +1599,10 @@ share/octave/${VERSION}/etc/tests/liboct
share/octave/${VERSION}/etc/tests/liboctave/util/
share/octave/${VERSION}/etc/tests/liboctave/util/oct-inttypes.cc-tst
share/octave/${VERSION}/fonts/
+share/octave/${VERSION}/fonts/FreeMono.otf
+share/octave/${VERSION}/fonts/FreeMonoBold.otf
+share/octave/${VERSION}/fonts/FreeMonoBoldOblique.otf
+share/octave/${VERSION}/fonts/FreeMonoOblique.otf
share/octave/${VERSION}/fonts/FreeSans.otf
share/octave/${VERSION}/fonts/FreeSansBold.otf
share/octave/${VERSION}/fonts/FreeSansBoldOblique.otf
@@ -1582,6 +1636,7 @@ share/octave/${VERSION}/m/+containers/
share/octave/${VERSION}/m/+containers/Map.m
share/octave/${VERSION}/m/+matlab/
share/octave/${VERSION}/m/+matlab/+lang/
+share/octave/${VERSION}/m/+matlab/+lang/MemoizedFunction.m
share/octave/${VERSION}/m/+matlab/+lang/makeUniqueStrings.m
share/octave/${VERSION}/m/+matlab/+lang/makeValidName.m
share/octave/${VERSION}/m/+matlab/+net/
@@ -1643,10 +1698,8 @@ share/octave/${VERSION}/m/audio/sound.m
share/octave/${VERSION}/m/audio/soundsc.m
share/octave/${VERSION}/m/deprecated/
share/octave/${VERSION}/m/deprecated/.oct-config
-share/octave/${VERSION}/m/deprecated/disable_diagonal_matrix.m
-share/octave/${VERSION}/m/deprecated/disable_permutation_matrix.m
-share/octave/${VERSION}/m/deprecated/disable_range.m
-share/octave/${VERSION}/m/deprecated/runtests.m
+share/octave/${VERSION}/m/deprecated/shift.m
+share/octave/${VERSION}/m/deprecated/sparse_auto_mutate.m
share/octave/${VERSION}/m/elfun/
share/octave/${VERSION}/m/elfun/.oct-config
share/octave/${VERSION}/m/elfun/acosd.m
@@ -1715,9 +1768,12 @@ share/octave/${VERSION}/m/general/interp
share/octave/${VERSION}/m/general/interpn.m
share/octave/${VERSION}/m/general/isequal.m
share/octave/${VERSION}/m/general/isequaln.m
+share/octave/${VERSION}/m/general/isuniform.m
share/octave/${VERSION}/m/general/logspace.m
share/octave/${VERSION}/m/general/nextpow2.m
share/octave/${VERSION}/m/general/num2str.m
+share/octave/${VERSION}/m/general/pagectranspose.m
+share/octave/${VERSION}/m/general/pagetranspose.m
share/octave/${VERSION}/m/general/pol2cart.m
share/octave/${VERSION}/m/general/polyarea.m
share/octave/${VERSION}/m/general/postpad.m
@@ -1737,7 +1793,6 @@ share/octave/${VERSION}/m/general/rescal
share/octave/${VERSION}/m/general/rng.m
share/octave/${VERSION}/m/general/rot90.m
share/octave/${VERSION}/m/general/rotdim.m
-share/octave/${VERSION}/m/general/shift.m
share/octave/${VERSION}/m/general/shiftdim.m
share/octave/${VERSION}/m/general/sortrows.m
share/octave/${VERSION}/m/general/sph2cart.m
@@ -1795,6 +1850,7 @@ share/octave/${VERSION}/m/gui/setappdata
share/octave/${VERSION}/m/gui/uibuttongroup.m
share/octave/${VERSION}/m/gui/uicontextmenu.m
share/octave/${VERSION}/m/gui/uicontrol.m
+share/octave/${VERSION}/m/gui/uifigure.m
share/octave/${VERSION}/m/gui/uigetdir.m
share/octave/${VERSION}/m/gui/uigetfile.m
share/octave/${VERSION}/m/gui/uimenu.m
@@ -1916,12 +1972,20 @@ share/octave/${VERSION}/m/legacy/
share/octave/${VERSION}/m/legacy/.oct-config
share/octave/${VERSION}/m/legacy/@inline/
share/octave/${VERSION}/m/legacy/@inline/argnames.m
+share/octave/${VERSION}/m/legacy/@inline/cat.m
share/octave/${VERSION}/m/legacy/@inline/char.m
+share/octave/${VERSION}/m/legacy/@inline/disp.m
+share/octave/${VERSION}/m/legacy/@inline/exist.m
share/octave/${VERSION}/m/legacy/@inline/feval.m
share/octave/${VERSION}/m/legacy/@inline/formula.m
+share/octave/${VERSION}/m/legacy/@inline/horzcat.m
share/octave/${VERSION}/m/legacy/@inline/inline.m
+share/octave/${VERSION}/m/legacy/@inline/nargin.m
+share/octave/${VERSION}/m/legacy/@inline/nargout.m
share/octave/${VERSION}/m/legacy/@inline/subsref.m
+share/octave/${VERSION}/m/legacy/@inline/symvar.m
share/octave/${VERSION}/m/legacy/@inline/vectorize.m
+share/octave/${VERSION}/m/legacy/@inline/vertcat.m
share/octave/${VERSION}/m/legacy/__vectorize__.m
share/octave/${VERSION}/m/legacy/findstr.m
share/octave/${VERSION}/m/legacy/flipdim.m
@@ -1969,6 +2033,7 @@ share/octave/${VERSION}/m/linear-algebra
share/octave/${VERSION}/m/linear-algebra/rank.m
share/octave/${VERSION}/m/linear-algebra/rref.m
share/octave/${VERSION}/m/linear-algebra/subspace.m
+share/octave/${VERSION}/m/linear-algebra/tensorprod.m
share/octave/${VERSION}/m/linear-algebra/trace.m
share/octave/${VERSION}/m/linear-algebra/vech.m
share/octave/${VERSION}/m/linear-algebra/vecnorm.m
@@ -1978,6 +2043,7 @@ share/octave/${VERSION}/m/miscellaneous/
share/octave/${VERSION}/m/miscellaneous/bunzip2.m
share/octave/${VERSION}/m/miscellaneous/cast.m
share/octave/${VERSION}/m/miscellaneous/citation.m
+share/octave/${VERSION}/m/miscellaneous/clearAllMemoizedCaches.m
share/octave/${VERSION}/m/miscellaneous/clearvars.m
share/octave/${VERSION}/m/miscellaneous/compare_versions.m
share/octave/${VERSION}/m/miscellaneous/computer.m
@@ -2009,6 +2075,7 @@ share/octave/${VERSION}/m/miscellaneous/
share/octave/${VERSION}/m/miscellaneous/loadobj.m
share/octave/${VERSION}/m/miscellaneous/ls.m
share/octave/${VERSION}/m/miscellaneous/ls_command.m
+share/octave/${VERSION}/m/miscellaneous/memoize.m
share/octave/${VERSION}/m/miscellaneous/memory.m
share/octave/${VERSION}/m/miscellaneous/menu.m
share/octave/${VERSION}/m/miscellaneous/methods.m
@@ -2048,6 +2115,7 @@ share/octave/${VERSION}/m/miscellaneous/
share/octave/${VERSION}/m/miscellaneous/parseparams.m
share/octave/${VERSION}/m/miscellaneous/perl.m
share/octave/${VERSION}/m/miscellaneous/private/
+share/octave/${VERSION}/m/miscellaneous/private/__memoize__.m
share/octave/${VERSION}/m/miscellaneous/private/__publish_html_output__.m
share/octave/${VERSION}/m/miscellaneous/private/__publish_latex_output__.m
share/octave/${VERSION}/m/miscellaneous/private/__w2mpth__.m
@@ -2063,7 +2131,6 @@ share/octave/${VERSION}/m/miscellaneous/
share/octave/${VERSION}/m/miscellaneous/swapbytes.m
share/octave/${VERSION}/m/miscellaneous/symvar.m
share/octave/${VERSION}/m/miscellaneous/tar.m
-share/octave/${VERSION}/m/miscellaneous/tempdir.m
share/octave/${VERSION}/m/miscellaneous/unix.m
share/octave/${VERSION}/m/miscellaneous/unpack.m
share/octave/${VERSION}/m/miscellaneous/untar.m
@@ -2455,6 +2522,7 @@ share/octave/${VERSION}/m/set/
share/octave/${VERSION}/m/set/.oct-config
share/octave/${VERSION}/m/set/intersect.m
share/octave/${VERSION}/m/set/ismember.m
+share/octave/${VERSION}/m/set/ismembertol.m
share/octave/${VERSION}/m/set/powerset.m
share/octave/${VERSION}/m/set/private/
share/octave/${VERSION}/m/set/private/validsetargs.m
@@ -2558,8 +2626,6 @@ share/octave/${VERSION}/m/specfun/lcm.m
share/octave/${VERSION}/m/specfun/legendre.m
share/octave/${VERSION}/m/specfun/nchoosek.m
share/octave/${VERSION}/m/specfun/nthroot.m
-share/octave/${VERSION}/m/specfun/perms.m
-share/octave/${VERSION}/m/specfun/pow2.m
share/octave/${VERSION}/m/specfun/primes.m
share/octave/${VERSION}/m/specfun/reallog.m
share/octave/${VERSION}/m/specfun/realpow.m
@@ -2615,6 +2681,7 @@ share/octave/${VERSION}/m/statistics/mov
share/octave/${VERSION}/m/statistics/movstd.m
share/octave/${VERSION}/m/statistics/movsum.m
share/octave/${VERSION}/m/statistics/movvar.m
+share/octave/${VERSION}/m/statistics/normalize.m
share/octave/${VERSION}/m/statistics/prctile.m
share/octave/${VERSION}/m/statistics/quantile.m
share/octave/${VERSION}/m/statistics/range.m
@@ -2708,8 +2775,8 @@ share/octave/${VERSION}/m/web/webwrite.m
share/octave/${VERSION}/site/
share/octave/${VERSION}/site/m/
share/octave/site/
-share/octave/site/api-v57/
-share/octave/site/api-v57/m/
+share/octave/site/api-v59/
+share/octave/site/api-v59/m/
share/octave/site/m/
share/octave/site/m/startup/
share/octave/site/m/startup/octaverc
