[arch-commits] Commit in octave/trunk (PKGBUILD curlfix.patch)

[Ronald van Haren]

    Date: Thursday, July 14, 2011 @ 08:35:49
  Author: ronald
Revision: 131750

upgpkg: octave 3.4.2-2
enable documentation; add texlive-core to makedepends

Added:
  octave/trunk/curlfix.patch
Modified:
  octave/trunk/PKGBUILD

---------------+
 PKGBUILD      |   23 ++++++++++++-----------
 curlfix.patch |   10 ++++++++++
 2 files changed, 22 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-14 12:11:14 UTC (rev 131749)
+++ PKGBUILD	2011-07-14 12:35:49 UTC (rev 131750)
@@ -5,34 +5,35 @@
 
 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(){

Added: curlfix.patch
===================================================================
--- curlfix.patch	                        (rev 0)
+++ curlfix.patch	2011-07-14 12:35:49 UTC (rev 131750)
@@ -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