Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=582e6764bf22255e470cee90f582ab673db64c1a
commit 582e6764bf22255e470cee90f582ab673db64c1a Author: Melko <me...@frugalware.org> Date: Fri Jul 6 13:30:37 2012 +0200 octave-3.2.4-2-i686 * rebuild against pcre diff --git a/source/apps-extra/octave/FrugalBuild b/source/apps-extra/octave/FrugalBuild index c203969..c51f5d3 100644 --- a/source/apps-extra/octave/FrugalBuild +++ b/source/apps-extra/octave/FrugalBuild @@ -3,18 +3,21 @@ pkgname=octave pkgver=3.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="Octave is a high-level language, primarily intended for numerical computations." url="http://www.octave.org/"; depends=('libstdc++>=4.3.0-4' 'fftw' 'libgfortran>=4.3.0-4' 'readline>=5.2-2' 'libx11') -makedepends=('gcc-gfortran') +makedepends=('gcc-gfortran' 'texlive') groups=('apps-extra') archs=('i686' 'x86_64') up2date="lynx -dump $url/download.html|grep Stable|sed 's/.* \([0-9.]\+\) (.*/\1/'" -source=(ftp://ftp.octave.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('7de078564027108f3436f3ba7bf5993a6b411a67') +source=(ftp://ftp.octave.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 \ + gcc46.patch) +sha1sums=('7de078564027108f3436f3ba7bf5993a6b411a67' \ + '0aefe02dacacff20908e08f841b608a9a75b139d') build() { + export CXXFLAGS="$CXXFLAGS -fpermissive -std=c++11" Fbuild Fmkdir ${Fprefix}/share/octave/packages touch ${Fdestdir}/${Fprefix}/share/octave/packages/.frugalware diff --git a/source/apps-extra/octave/gcc46.patch b/source/apps-extra/octave/gcc46.patch new file mode 100644 index 0000000..113f1cc --- /dev/null +++ b/source/apps-extra/octave/gcc46.patch @@ -0,0 +1,24 @@ +diff --git a/liboctave/oct-alloc.h b/liboctave/oct-alloc.h +--- a/liboctave/oct-alloc.h ++++ b/liboctave/oct-alloc.h +@@ -23,6 +23,8 @@ + #if !defined (octave_oct_alloc_h) + #define octave_oct_alloc_h 1 + ++#include <cstddef> ++ + class + OCTAVE_API + octave_allocator +diff --git a/src/pr-output.cc b/src/pr-output.cc +--- a/src/pr-output.cc ++++ b/src/pr-output.cc +@@ -3024,7 +3024,7 @@ + } + + #define INSTANTIATE_ABS(T) \ +- template /* static */ inline T abs (T) ++ template /* static */ T abs (T) + + INSTANTIATE_ABS(signed char); + INSTANTIATE_ABS(short); _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
