Date: Monday, November 7, 2016 @ 19:54:13 Author: foutrelis Revision: 280127
archrelease: copy trunk to staging-i686, staging-x86_64 Added: octave/repos/staging-i686/ octave/repos/staging-i686/PKGBUILD (from rev 280126, octave/trunk/PKGBUILD) octave/repos/staging-i686/octave-gcc6.patch (from rev 280126, octave/trunk/octave-gcc6.patch) octave/repos/staging-x86_64/ octave/repos/staging-x86_64/PKGBUILD (from rev 280126, octave/trunk/PKGBUILD) octave/repos/staging-x86_64/octave-gcc6.patch (from rev 280126, octave/trunk/octave-gcc6.patch) ----------------------------------+ staging-i686/PKGBUILD | 56 +++++++++++++++++++++++++++++++++++++ staging-i686/octave-gcc6.patch | 38 +++++++++++++++++++++++++ staging-x86_64/PKGBUILD | 56 +++++++++++++++++++++++++++++++++++++ staging-x86_64/octave-gcc6.patch | 38 +++++++++++++++++++++++++ 4 files changed, 188 insertions(+) Copied: octave/repos/staging-i686/PKGBUILD (from rev 280126, octave/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2016-11-07 19:54:13 UTC (rev 280127) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor : shining <shiningxc.at.gmail.com> +# Contributor : cyberdune <cyberd...@gmail.com> + +pkgname=octave +pkgver=4.0.3 +pkgrel=2 +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') +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) +options=('!emptydirs') +validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton +sha1sums=('c798346a8271e0141d9dbe5610584dabb8311277' + 'SKIP' + '646a285266faf054ae72b1897e575f08da779d6e') + +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 +# https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html + + LANG=C make +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + # add octave library path to ld.so.conf.d + install -d "${pkgdir}/etc/ld.so.conf.d" + echo "/usr/lib/${pkgname}/${pkgver}" > "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf" +} Copied: octave/repos/staging-i686/octave-gcc6.patch (from rev 280126, octave/trunk/octave-gcc6.patch) =================================================================== --- staging-i686/octave-gcc6.patch (rev 0) +++ staging-i686/octave-gcc6.patch 2016-11-07 19:54:13 UTC (rev 280127) @@ -0,0 +1,38 @@ +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 { Copied: octave/repos/staging-x86_64/PKGBUILD (from rev 280126, octave/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2016-11-07 19:54:13 UTC (rev 280127) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor : shining <shiningxc.at.gmail.com> +# Contributor : cyberdune <cyberd...@gmail.com> + +pkgname=octave +pkgver=4.0.3 +pkgrel=2 +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') +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) +options=('!emptydirs') +validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton +sha1sums=('c798346a8271e0141d9dbe5610584dabb8311277' + 'SKIP' + '646a285266faf054ae72b1897e575f08da779d6e') + +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 +# https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html + + LANG=C make +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + # add octave library path to ld.so.conf.d + install -d "${pkgdir}/etc/ld.so.conf.d" + echo "/usr/lib/${pkgname}/${pkgver}" > "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf" +} Copied: octave/repos/staging-x86_64/octave-gcc6.patch (from rev 280126, octave/trunk/octave-gcc6.patch) =================================================================== --- staging-x86_64/octave-gcc6.patch (rev 0) +++ staging-x86_64/octave-gcc6.patch 2016-11-07 19:54:13 UTC (rev 280127) @@ -0,0 +1,38 @@ +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 {