From 0a65f2d0c1d81c3a7c3e7b86da8ac00653382536 Mon Sep 17 00:00:00 2001 From: Piraty Date: Sun, 25 Mar 2018 22:50:45 +0200 Subject: [PATCH] octave: update to 4.2.2. Closes #13564. Signed-off-by: Enno Boland --- srcpkgs/octave/patches/01-qscintilla.patch | 12 ++++++------ srcpkgs/octave/template | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/srcpkgs/octave/patches/01-qscintilla.patch b/srcpkgs/octave/patches/01-qscintilla.patch index 214022eb954..68c992affcf 100644 --- a/srcpkgs/octave/patches/01-qscintilla.patch +++ b/srcpkgs/octave/patches/01-qscintilla.patch @@ -3,12 +3,12 @@ --- configure +++ configure -@@ -34701,7 +34701,7 @@ +@@ -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" -- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2" -+ octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2 qscintilla2_qt5" - ;; - *) - as_fn_error $? "Unrecognized Qt version $qt_version" "$LINENO" 5 diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template index 160f853e9e7..e2380f886f5 100644 --- a/srcpkgs/octave/template +++ b/srcpkgs/octave/template @@ -1,19 +1,19 @@ # Template file for 'octave' pkgname=octave -version=4.2.1 -revision=8 +version=4.2.2 +revision=1 build_style=gnu-configure configure_args=" --with-blas=openblas --with-lapack=openblas $(vopt_if largearrays --enable-64)" hostmakedepends="perl gcc-fortran pkg-config gnuplot" makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel lcms2-devel glpk-devel" -short_desc="A high-level language, primarily intended for numerical computations" +short_desc="High-level language, primarily intended for numerical computations" maintainer="Diogo Leal " license="GPL-3" homepage="https://gnu.org/software/octave/" distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz" -checksum=80c28f6398576b50faca0e602defb9598d6f7308b0903724442c2a35a605333b +checksum=77b84395d8e7728a1ab223058fe5e92dc38c03bc13f7358e6533aab36f76726e # Package build options # TODO: some options are still missing, such as