Date: Sunday, May 15, 2016 @ 00:03:18 Author: arojas Revision: 268045
Hooks Added: octave/trunk/octave-gcc6.patch Modified: octave/trunk/PKGBUILD Deleted: octave/trunk/octave.install -------------------+ PKGBUILD | 20 ++++++++++++----- octave-gcc6.patch | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++ octave.install | 20 ----------------- 3 files changed, 73 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-14 21:15:23 UTC (rev 268044) +++ PKGBUILD 2016-05-14 22:03:18 UTC (rev 268045) @@ -4,8 +4,8 @@ # Contributor : cyberdune <cyberd...@gmail.com> pkgname=octave -pkgver=4.0.1 -pkgrel=4 +pkgver=4.0.2 +pkgrel=1 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64') url="http://www.octave.org" @@ -15,13 +15,21 @@ 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}) +source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.xz{,.sig} octave-gcc6.patch) options=('!emptydirs') -install=octave.install validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton -sha1sums=('76b531063e37df13fdbe3467a6e3c14dce364d9e' - 'SKIP') +sha1sums=('34384a5ddeea1b29bdfedd5e8d2bdb13b7b2daf5' + 'SKIP' + 'a723bace13eeb09d8ea3223b9f594124ab5cc05f') +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}" Added: octave-gcc6.patch =================================================================== --- octave-gcc6.patch (rev 0) +++ octave-gcc6.patch 2016-05-14 22:03:18 UTC (rev 268045) @@ -0,0 +1,59 @@ +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 { +diff -up octave-4.0.1/libgnu/math.in.h.signbit octave-4.0.1/libgnu/math.in.h +--- octave-4.0.1/libgnu/math.in.h.signbit 2015-05-14 01:31:01.000000000 -0600 ++++ octave-4.0.1/libgnu/math.in.h 2016-03-23 17:34:43.719131933 -0600 +@@ -1,6 +1,6 @@ + /* A GNU-like <math.h>. + +- Copyright (C) 2002-2003, 2007-2015 Free Software Foundation, Inc. ++ Copyright (C) 2002-2003, 2007-2016 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -2205,7 +2205,8 @@ _GL_WARN_REAL_FLOATING_DECL (isnan); + + + #if @GNULIB_SIGNBIT@ +-# if @REPLACE_SIGNBIT_USING_GCC@ ++# if (@REPLACE_SIGNBIT_USING_GCC@ \ ++ && (!defined __cplusplus || __cplusplus < 201103L)) + # undef signbit + /* GCC 4.0 and newer provides three built-ins for signbit. */ + # define signbit(x) \ Deleted: octave.install =================================================================== --- octave.install 2016-05-14 21:15:23 UTC (rev 268044) +++ octave.install 2016-05-14 22:03:18 UTC (rev 268045) @@ -1,20 +0,0 @@ -info_dir=/usr/share/info -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 - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -pre_remove() { - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -}