Stuart Henderson [2020-04-19, 22:24:32]:
> On 2020/04/19 22:04, Stuart Henderson wrote:
> > On 2020/04/18 14:38, Steven Mestdagh wrote:
> > > update octave, and reinstate wantlib that was somehow removed earlier.
> > > tested lightly on amd64, test suite shows no regression compared to
> > > version 5.1.0 in tree.
> > >
> > > please test/comment/ok.
> >
> > Not an Octave user and I can't really comment on whether the update is
> > important/safe to have before release or not (ports-wise it looks good
> > though).. but one way or the other the WANTLIB definitely needs fixing.
> >
>
> oh, it picks up fltk if present at configure time, it either needs
> wantlib+lib_depends additions, or --without-fltk
thanks Stuart, I updated the diff to disable fltk.
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.118
diff -u -p -u -r1.118 Makefile
--- Makefile 5 Apr 2020 15:44:52 -0000 1.118
+++ Makefile 20 Apr 2020 06:56:04 -0000
@@ -2,14 +2,13 @@
COMMENT = high-level language for numerical computations
-VERSION = 5.1.0
+VERSION = 5.2.0
DISTNAME = octave-${VERSION}
CATEGORIES = math
-REVISION = 4
-SHARED_LIBS += octave 12.0
-SHARED_LIBS += octgui 6.0
-SHARED_LIBS += octinterp 11.0
+SHARED_LIBS += octave 13.0
+SHARED_LIBS += octgui 7.0
+SHARED_LIBS += octinterp 12.0
HOMEPAGE = https://www.gnu.org/software/octave/
@@ -56,11 +55,29 @@ LIB_DEPENDS = ${MODFORTRAN_LIB_DEPENDS}
print/gl2ps \
x11/qt5/qttools,-main
+WANTLIB += ${MODFORTRAN_WANTLIB}
+WANTLIB += FLAC GL GLU GraphicsMagick GraphicsMagick++ ICE
+WANTLIB += Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Widgets Qt5Core
+WANTLIB += Qt5Help Qt5Xml Qt5Sql qscintilla2_qt5 SM X11 X11-xcb Xdamage
+WANTLIB += Xext Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm amd
+WANTLIB += arpack blas bz2 c camd ccolamd cholmod colamd crypto curl
+WANTLIB += curses cxsparse double-conversion drm ereadline expat
+WANTLIB += execinfo fftw3 fftw3_threads fftw3f fftw3f_threads
+WANTLIB += fontconfig freetype gl2ps glapi glpk glut
+WANTLIB += glib-2.0 graphite2 gthread-2.0 harfbuzz icudata icuio
+WANTLIB += gmp hdf5 iconv icui18n icuuc intl lapack lcms2 ltdl lzma
+WANTLIB += m nghttp2 ogg pcre pcre2-16 png portaudio pthread qhull
+WANTLIB += qrupdate sndfile sndio ssl ${COMPILER_LIBCXX} suitesparseconfig
+WANTLIB += umfpack util vorbis vorbisenc xcb xcb-dri2 xcb-dri3 xcb-glx
+WANTLIB += xcb-present xcb-sync xcb-xfixes xshmfence z zstd
+
+
SEPARATE_BUILD = Yes
USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
# --disable-readline: needs GNU readline
CONFIGURE_ARGS = --disable-java \
+ --without-fltk \
octave_cv_version_2_6_0=yes
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
-I${LOCALBASE}/include/ereadline" \
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.22
diff -u -p -u -r1.22 distinfo
--- distinfo 6 May 2019 21:09:52 -0000 1.22
+++ distinfo 20 Apr 2020 06:56:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (octave-5.1.0.tar.gz) = 42sRJMrCfHyqUcxX3kCMMWdtXwCWNJtNULV7/hvNdJU=
-SIZE (octave-5.1.0.tar.gz) = 32034788
+SHA256 (octave-5.2.0.tar.gz) = L+pis8eNbzjpRR2opNJgI4QHJZd9/+5SUNPRgPVlleE=
+SIZE (octave-5.2.0.tar.gz) = 33360285
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
retrieving revision 1.14
diff -u -p -u -r1.14 patch-configure
--- patches/patch-configure 6 May 2019 21:09:52 -0000 1.14
+++ patches/patch-configure 20 Apr 2020 06:56:04 -0000
@@ -5,7 +5,7 @@ Use GNU readline as our base readline la
Index: configure
--- configure.orig
+++ configure
-@@ -67197,13 +67197,13 @@ fi
+@@ -67123,13 +67123,13 @@ fi
ac_octave_save_LIBS="$LIBS"
LIBS="$TERM_LIBS"
@@ -22,7 +22,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -67242,7 +67242,7 @@ fi
+@@ -67168,7 +67168,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
$as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.26
diff -u -p -u -r1.26 PLIST
--- pkg/PLIST 6 May 2019 21:09:52 -0000 1.26
+++ pkg/PLIST 20 Apr 2020 06:56:05 -0000
@@ -776,13 +776,13 @@ lib/octave/${VERSION}/convhulln.a
lib/octave/${VERSION}/dmperm.a
lib/octave/${VERSION}/fftw.a
lib/octave/${VERSION}/gzip.a
-lib/octave/${VERSION}/liboctave.a
+@static-lib lib/octave/${VERSION}/liboctave.a
lib/octave/${VERSION}/liboctave.la
@lib lib/octave/${VERSION}/liboctave.so.${LIBoctave_VERSION}
-lib/octave/${VERSION}/liboctgui.a
+@static-lib lib/octave/${VERSION}/liboctgui.a
lib/octave/${VERSION}/liboctgui.la
@lib lib/octave/${VERSION}/liboctgui.so.${LIBoctgui_VERSION}
-lib/octave/${VERSION}/liboctinterp.a
+@static-lib lib/octave/${VERSION}/liboctinterp.a
lib/octave/${VERSION}/liboctinterp.la
@lib lib/octave/${VERSION}/liboctinterp.so.${LIBoctinterp_VERSION}
lib/octave/${VERSION}/oct/
@@ -844,6 +844,9 @@ libexec/octave/site/exec/${GNU_ARCH}/
@man man/man1/octave-config.1
@man man/man1/octave.1
share/applications/org.octave.Octave.desktop
+share/icons/hicolor/1024x1024/
+share/icons/hicolor/1024x1024/apps/
+share/icons/hicolor/1024x1024/apps/octave.png
share/icons/hicolor/128x128/apps/octave.png
share/icons/hicolor/16x16/apps/octave.png
share/icons/hicolor/22x22/apps/octave.png
@@ -1107,6 +1110,7 @@ share/octave/${VERSION}/etc/tests/fixed/
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/Snork.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/cack.m
+share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/ctranspose.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/display.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/double.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/end.m
@@ -1139,6 +1143,7 @@ share/octave/${VERSION}/etc/tests/fixed/
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/subsref.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/tattack.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/times.m
+share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/transpose.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/uminus.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/uplus.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/vertcat.m
@@ -1386,6 +1391,7 @@ share/octave/${VERSION}/etc/tests/libint
share/octave/${VERSION}/etc/tests/libinterp/octave-value/ov.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/octave.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/parse-tree/
+share/octave/${VERSION}/etc/tests/libinterp/parse-tree/bp-table.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/parse-tree/lex.ll-tst
share/octave/${VERSION}/etc/tests/libinterp/parse-tree/oct-parse.yy-tst
share/octave/${VERSION}/etc/tests/libinterp/parse-tree/pt-assign.cc-tst
