Date: Friday, December 9, 2016 @ 19:57:11 Author: arojas Revision: 282973
Update to 4.2.0 Modified: octave/trunk/PKGBUILD Deleted: octave/trunk/octave-gcc6.patch -------------------+ PKGBUILD | 28 ++++++++-------------------- octave-gcc6.patch | 38 -------------------------------------- 2 files changed, 8 insertions(+), 58 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-12-09 19:53:01 UTC (rev 282972) +++ PKGBUILD 2016-12-09 19:57:11 UTC (rev 282973) @@ -4,42 +4,30 @@ # Contributor : cyberdune <[email protected]> pkgname=octave -pkgver=4.0.3 -pkgrel=2 +pkgver=4.2.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' 'ghostscript' - 'suitesparse' 'gl2ps' 'qscintilla' 'libsndfile') -makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 'qscintilla') + 'suitesparse' 'gl2ps' 'qscintilla-qt5' 'libsndfile') +makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 'qt5-tools') optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting') -source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.xz{,.sig} octave-gcc6.patch) +source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}) options=('!emptydirs') validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton -sha1sums=('c798346a8271e0141d9dbe5610584dabb8311277' - 'SKIP' - '646a285266faf054ae72b1897e575f08da779d6e') +sha1sums=('9fac578c08a7efabd79ccc38bc196b9627e3212f' + 'SKIP') -prepare() { - cd $pkgname-$pkgver - # Fix build with GCC 6 (Fedora) - patch -p1 -i ../octave-gcc6.patch - find -name \*.cc -o -name \*.h -o -name \*.yy | xargs sed -i -e 's/#include <c\(math\|stdlib\)>/#include <\1.h>/' - find -name \*.h -o -name \*.cc | xargs sed -i -e 's/<config.h>/"config.h"/' -e 's/<base-list.h>/"base-list.h"/' -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" - autoreconf -vfi - ./configure --prefix=/usr --libexecdir=/usr/lib \ --enable-shared --disable-static \ --with-quantum-depth=16 \ - --with-umfpack="-lumfpack -lsuitesparseconfig" \ - MOC=moc-qt4 UIC=uic-qt4 + --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html LANG=C make Deleted: octave-gcc6.patch =================================================================== --- octave-gcc6.patch 2016-12-09 19:53:01 UTC (rev 282972) +++ octave-gcc6.patch 2016-12-09 19:57:11 UTC (rev 282973) @@ -1,38 +0,0 @@ -diff -up octave-4.0.0/libinterp/corefcn/pr-output.cc.abs octave-4.0.0/libinterp/corefcn/pr-output.cc ---- octave-4.0.0/libinterp/corefcn/pr-output.cc.abs 2015-05-23 08:21:53.000000000 -0600 -+++ octave-4.0.0/libinterp/corefcn/pr-output.cc 2016-02-21 08:59:30.966291273 -0700 -@@ -21,7 +21,7 @@ along with Octave; see the file COPYING. - */ - - #ifdef HAVE_CONFIG_H --#include <config.h> -+#include "config.h" - #endif - - #include <cfloat> -@@ -3145,6 +3145,14 @@ PRINT_INT_SCALAR_INTERNAL (uint32_t) - PRINT_INT_SCALAR_INTERNAL (int64_t) - PRINT_INT_SCALAR_INTERNAL (uint64_t) - -+inline unsigned int abs (unsigned int x) { return x; } -+inline long unsigned int abs (long unsigned int x) { return x; } -+inline long long unsigned int abs (long long unsigned int x) { return x; } -+inline short unsigned int abs (short unsigned int x) { return x; } -+inline unsigned char abs (unsigned char x) { return x; } -+inline signed char abs (signed char x) { return abs((int)x); } -+inline short int abs (short int x) { return abs((int)x); } -+ - template <class T> - /* static */ inline void - octave_print_internal_template (std::ostream& os, const intNDArray<T>& nda, -diff -up octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh.gnulib octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh ---- octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh.gnulib 2015-05-23 08:21:53.000000000 -0600 -+++ octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh 2016-02-19 19:50:04.693811663 -0700 -@@ -27,6 +27,7 @@ - #ifndef FADDEEVA_HH - #define FADDEEVA_HH 1 - -+#include <math.h> - #include <complex> - - namespace Faddeeva {
