diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-28 03:27:16 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-28 03:27:16 +0000 |
| commit | 462391357aa5e749dc9908c15f3baa0b4416f3d8 (patch) | |
| tree | 11d4d3f054aae9ffd869adc634054f64a16d83b8 /extra/octave | |
| parent | 748e32a3a886569b58a27003e85b76be5746153d (diff) | |
Tue Jan 28 03:22:21 UTC 2014
Diffstat (limited to 'extra/octave')
| -rw-r--r-- | extra/octave/PKGBUILD | 26 | ||||
| -rw-r--r-- | extra/octave/mex-gcc-4.8.patch | 31 | ||||
| -rw-r--r-- | extra/octave/octave.install | 2 |
3 files changed, 10 insertions, 49 deletions
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index 626cd3c9d..12be4d12d 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,33 +1,25 @@ -# $Id: PKGBUILD 203485 2014-01-11 17:11:51Z bisson $ +# $Id: PKGBUILD 204807 2014-01-27 19:22:09Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave -pkgver=3.6.4 -pkgrel=6 +pkgver=3.8.0 +pkgrel=1 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64') url="http://www.octave.org" license=('GPL') depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 'glu') -makedepends=('gcc-fortran' 'texlive-core' 'suitesparse') +makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot') optdepends=('texinfo: for help-support in octave' - 'gnuplot: alternative plotting') -source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig} - mex-gcc-4.8.patch) + 'gnuplot: alternative plotting' + 'qt4: experimental gui') +source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}) options=('!emptydirs') install=octave.install -sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4' - 'SKIP' - '0608af9b7ccce8455f534d2fc4acf2f4c8f83a60') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # https://savannah.gnu.org/bugs/?38746 - patch -Np1 -i "${srcdir}/mex-gcc-4.8.patch" -} +sha1sums=('ebb03485b72d97fa01f105460f81016f94680f77' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/octave/mex-gcc-4.8.patch b/extra/octave/mex-gcc-4.8.patch deleted file mode 100644 index 99d501879..000000000 --- a/extra/octave/mex-gcc-4.8.patch +++ /dev/null @@ -1,31 +0,0 @@ -# HG changeset patch -# User Clemens Buchacher <drizzd@aon.at> -# Date 1369937542 14400 -# Thu May 30 14:12:22 2013 -0400 -# Node ID 122d3f62e179ba044d47e58510905719220d8706 -# Parent e38a0fa08368d4dd6f3a0dfd20cbe28cf8555f73 -do not include C++ header in extern "C" context (bug #38746) - -* mex.h: Include mexproto.h outside of extern "C" block. - -diff -r e38a0fa08368 -r 122d3f62e179 src/mex.h ---- a/src/mex.h Mon May 27 21:41:57 2013 +0200 -+++ b/src/mex.h Thu May 30 14:12:22 2013 -0400 -@@ -64,6 +64,8 @@ - - #define mxMAXNAME 64 - -+#include "mexproto.h" -+ - #if defined (__cplusplus) - extern "C" { - #endif -@@ -74,8 +76,6 @@ - void mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray *prhs[]); - #endif - --#include "mexproto.h" -- - /* V4 floating point routines renamed in V5. */ - #define mexIsNaN mxIsNaN - #define mexIsFinite mxIsFinite diff --git a/extra/octave/octave.install b/extra/octave/octave.install index 8ee77c430..fb77bb100 100644 --- a/extra/octave/octave.install +++ b/extra/octave/octave.install @@ -1,5 +1,5 @@ info_dir=/usr/share/info -info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5) +info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5 octave.info-6 octave.info-7 octave.info-8) post_install() { for f in ${info_files[@]}; do |