diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-18 12:59:47 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-18 12:59:47 -0300 |
| commit | 12c074375919d2de177eb9456352866902118a03 (patch) | |
| tree | 3f6b2e5baadedbc7901bf3e614fd017ca8aaee52 /extra/octave | |
| parent | 598db82f25ffe3557e395a11f379de65af9e1ac1 (diff) | |
| parent | ddddf9c453076a407bfdbf3e030e606f31ee2b86 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dopewars/PKGBUILD
community/virtualbox/PKGBUILD
core/lvm2/PKGBUILD
extra/aspell/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/libproxy/PKGBUILD
extra/live-media/PKGBUILD
extra/ocaml/PKGBUILD
extra/putty/PKGBUILD
extra/python/PKGBUILD
extra/ruby/PKGBUILD
kde-unstable/calligra/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/octave')
| -rw-r--r-- | extra/octave/PKGBUILD | 25 | ||||
| -rw-r--r-- | extra/octave/curlfix.patch | 10 |
2 files changed, 23 insertions, 12 deletions
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index b6e723f7c..0bc2c252d 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,38 +1,39 @@ -# $Id: PKGBUILD 131039 2011-07-09 20:49:15Z stephane $ +# $Id: PKGBUILD 131750 2011-07-14 12:35:49Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave pkgver=3.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64' 'mips64el') url="http://www.octave.org" license=('GPL') depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull') -makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack') +makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core') optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting' 'umfpack: LU decomposition of some large sparse matrices') -source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2") +source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2" "curlfix.patch") options=('!emptydirs') -#install=octave.install -sha1sums=('12cac29ef7d1ab8374980e1e2fd14637b2f15ba5') - +install=octave.install +sha1sums=('12cac29ef7d1ab8374980e1e2fd14637b2f15ba5' + '3f856798f5f8aa15bce1200b8abd059154f3d909') + build() { cd ${srcdir}/${pkgname}-${pkgver} + # remove curl/types.h include + patch -Np0 -i ${srcdir}/curlfix.patch + # http://www.nabble.com/Random-rounding-errors-td16010966.html FFLAGS="-O -ffloat-store" \ - # Avoid build failure due to missing curl/types.h - sed -i "/curl\/types.h/d" src/DLD-FUNCTIONS/urlwrite.cc - ./configure --prefix=/usr --libexecdir=/usr/lib \ - --enable-shared --disable-static --disable-docs + --enable-shared --disable-static - make + LANG=C make } package(){ diff --git a/extra/octave/curlfix.patch b/extra/octave/curlfix.patch new file mode 100644 index 000000000..26f3d92f9 --- /dev/null +++ b/extra/octave/curlfix.patch @@ -0,0 +1,10 @@ +--- src/DLD-FUNCTIONS/urlwrite.cc.old 2011-07-02 16:39:22.466603778 +0200 ++++ src/DLD-FUNCTIONS/urlwrite.cc 2011-07-02 16:39:54.543269859 +0200 +@@ -52,7 +52,6 @@ + + #include <curl/curl.h> + #include <curl/curlver.h> +-#include <curl/types.h> + #include <curl/easy.h> + + static int |