update to 4.2.2
ok pirofti@
This commit is contained in:
parent
8b6e27d943
commit
defd66a55d
@ -1,15 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.101 2018/02/28 19:23:56 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.102 2018/04/25 21:27:06 steven Exp $
|
||||
|
||||
COMMENT = high-level language for numerical computations
|
||||
|
||||
VERSION = 4.2.1
|
||||
VERSION = 4.2.2
|
||||
DISTNAME = octave-${VERSION}
|
||||
REVISION = 2
|
||||
CATEGORIES = math
|
||||
|
||||
SHARED_LIBS += octave 8.0
|
||||
SHARED_LIBS += octgui 2.0
|
||||
SHARED_LIBS += octinterp 7.0
|
||||
SHARED_LIBS += octave 9.0
|
||||
SHARED_LIBS += octgui 3.0
|
||||
SHARED_LIBS += octinterp 8.0
|
||||
|
||||
HOMEPAGE = https://www.gnu.org/software/octave/
|
||||
|
||||
@ -27,7 +26,7 @@ WANTLIB += Xext Xfixes Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm amd
|
||||
WANTLIB += arpack blas bz2 c camd ccolamd cholmod colamd crypto curl
|
||||
WANTLIB += cxsparse drm ereadline expat fftw3 fftw3_threads fftw3f
|
||||
WANTLIB += fftw3f_threads fltk fltk_gl fontconfig freetype gl2ps glapi
|
||||
WANTLIB += glpk glut gmp hdf5 iconv intl lapack lcms2 ltdl lzma m ncurses
|
||||
WANTLIB += glpk glut gmp hdf5 iconv intl lapack lcms2 ltdl lzma m curses
|
||||
WANTLIB += nghttp2 ogg pcre png portaudio pthread qhull qrupdate
|
||||
WANTLIB += sndfile sndio ssl ${COMPILER_LIBCXX} suitesparseconfig
|
||||
WANTLIB += umfpack util vorbis vorbisenc xcb xcb-dri2 xcb-glx z
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (octave-4.2.1.tar.gz) = gMKPY5hXa1D6yg5gLe+5WY1vcwiwkDckRCwqNaYFMzs=
|
||||
SIZE (octave-4.2.1.tar.gz) = 25409651
|
||||
SHA256 (octave-4.2.2.tar.gz) = d7hDldjncooasiMFj+XpLcOMA7wT9zWOZTOqs292cm4=
|
||||
SIZE (octave-4.2.2.tar.gz) = 25624087
|
||||
|
@ -1,20 +1,11 @@
|
||||
$OpenBSD: patch-configure,v 1.10 2017/11/03 12:28:53 steven Exp $
|
||||
$OpenBSD: patch-configure,v 1.11 2018/04/25 21:27:06 steven Exp $
|
||||
|
||||
Use GNU readline as our base readline lacks rl_prefer_env_winsize.
|
||||
|
||||
Index: configure
|
||||
--- configure.orig
|
||||
+++ configure
|
||||
@@ -34701,7 +34701,7 @@ $as_echo_n "checking Qt version $ver... " >&6; }
|
||||
;;
|
||||
5)
|
||||
QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
|
||||
- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
|
||||
+ octave_qscintilla_libnames="qscintilla2_qt5 qt5scintilla2"
|
||||
;;
|
||||
*)
|
||||
as_fn_error $? "Unrecognized Qt version $qt_version" "$LINENO" 5
|
||||
@@ -44617,13 +44617,13 @@ fi
|
||||
@@ -44777,13 +44777,13 @@ fi
|
||||
|
||||
ac_octave_save_LIBS="$LIBS"
|
||||
LIBS="$TERM_LIBS"
|
||||
@ -31,7 +22,7 @@ Index: configure
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -44662,7 +44662,7 @@ fi
|
||||
@@ -44822,7 +44822,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 :
|
||||
|
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-liboctave_system_file-stat_cc,v 1.1 2017/11/03 12:28:53 steven Exp $
|
||||
|
||||
Index: liboctave/system/file-stat.cc
|
||||
--- liboctave/system/file-stat.cc.orig
|
||||
+++ liboctave/system/file-stat.cc
|
||||
@@ -174,7 +174,7 @@ namespace octave
|
||||
update_internal ();
|
||||
}
|
||||
|
||||
- inline file_stat::~file_stat () { }
|
||||
+ file_stat::~file_stat () { }
|
||||
|
||||
void
|
||||
file_stat::update_internal (bool force)
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.21 2017/11/03 12:28:53 steven Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.22 2018/04/25 21:27:06 steven Exp $
|
||||
bin/mkoctfile
|
||||
@bin bin/mkoctfile-${VERSION}
|
||||
bin/octave
|
||||
@ -940,6 +940,7 @@ share/octave/${VERSION}/etc/tests/fixed/classdef/foo_value_class.m
|
||||
share/octave/${VERSION}/etc/tests/fixed/classdef/plist_t1.m
|
||||
share/octave/${VERSION}/etc/tests/fixed/classdef/plist_t2.m
|
||||
share/octave/${VERSION}/etc/tests/fixed/classdef/plist_t3.m
|
||||
share/octave/${VERSION}/etc/tests/fixed/classdef/struct_wrapper.m
|
||||
share/octave/${VERSION}/etc/tests/fixed/classes/
|
||||
share/octave/${VERSION}/etc/tests/fixed/classes/@Blork/
|
||||
share/octave/${VERSION}/etc/tests/fixed/classes/@Blork/Blork.m
|
||||
|
Loading…
Reference in New Issue
Block a user