summaryrefslogtreecommitdiff
path: root/extra/octave
diff options
context:
space:
mode:
Diffstat (limited to 'extra/octave')
-rw-r--r--extra/octave/PKGBUILD25
-rw-r--r--extra/octave/curlfix.patch10
2 files changed, 23 insertions, 12 deletions
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index 21ff40fe7..b88a9edbc 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')
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