From e7b292d8fb4bffebf3770decc8c10421d653ec5b Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 2 May 2018 14:59:42 -0500 Subject: [PATCH] octave: update to 4.4.0 - Update license to be SPDX compliant. Closes #12. Signed-off-by: Enno Boland --- common/shlibs | 6 +++--- srcpkgs/octave/patches/01-qscintilla.patch | 14 -------------- srcpkgs/octave/template | 10 +++++----- 3 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/octave/patches/01-qscintilla.patch diff --git a/common/shlibs b/common/shlibs index cdecd2da52..1305ffa192 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3336,9 +3336,9 @@ libgeos-3.6.2.so geos-3.6.2_1 libgeos_c.so.1 geos-3.6.2_1 libspatialindex.so.4 libspatialindex-1.8.5_1 libspatialindex_c.so.4 libspatialindex-1.8.5_1 -liboctave.so.4 octave-4.2.1_8 -liboctinterp.so.4 octave-4.2.1_8 -liboctgui.so.2 octave-4.2.1_8 +liboctave.so.5 octave-4.4.0_1 +liboctinterp.so.5 octave-4.4.0_1 +liboctgui.so.3 octave-4.4.0_1 libpapi.so.5 papi-5.6.0_1 libpfm.so.4 papi-5.6.0_1 libfifechan.so.0.1.4 fifechan-0.1.4_1 diff --git a/srcpkgs/octave/patches/01-qscintilla.patch b/srcpkgs/octave/patches/01-qscintilla.patch deleted file mode 100644 index 68c992affc..0000000000 --- a/srcpkgs/octave/patches/01-qscintilla.patch +++ /dev/null @@ -1,14 +0,0 @@ -# reason: configure looks for the wrong filename -# note: should be fixed in the next release - ---- configure -+++ configure -@@ -34697,7 +34697,7 @@ - case "$qt_version" in - 4) - QT_MODULES="QtCore QtGui QtNetwork QtOpenGL" -- octave_qscintilla_libnames=qscintilla2 -+ octave_qscintilla_libnames=qscintilla2 qscintilla_qt5 - ;; - 5) - QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport" diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template index 3e54a681cf..3acde0d86f 100644 --- a/srcpkgs/octave/template +++ b/srcpkgs/octave/template @@ -1,7 +1,7 @@ # Template file for 'octave' pkgname=octave -version=4.2.2 -revision=2 +version=4.4.0 +revision=1 build_style=gnu-configure configure_args=" --with-blas=openblas --with-lapack=openblas $(vopt_if largearrays --enable-64)" @@ -10,10 +10,10 @@ makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel lcms2-devel glpk-devel" short_desc="High-level language, primarily intended for numerical computations" maintainer="Diogo Leal " -license="GPL-3" +license="GPL-3.0-or-later" homepage="https://gnu.org/software/octave/" distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz" -checksum=77b84395d8e7728a1ab223058fe5e92dc38c03bc13f7358e6533aab36f76726e +checksum=72f846379fcec7e813d46adcbacd069d72c4f4d8f6003bcd92c3513aafcd6e96 # Package build options # TODO: some options are still missing, such as @@ -69,7 +69,7 @@ makedepends+=" $(vopt_if curl libcurl-devel) $(vopt_if fftw3 fftw-devel) $(vopt_if graphicsmagick libgraphicsmagick-devel) - $(vopt_if gui 'qt5-devel qscintilla-qt5-devel') + $(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel') $(vopt_if hdf5 hdf5-devel) $(vopt_if imagemagick libmagick-devel) $(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")