[arch-commits] Commit in octave/trunk (4 files)

[Ronald van Haren]

    Date: Wednesday, April 27, 2011 @ 09:47:11
  Author: ronald
Revision: 120935

upgpkg: octave 3.4.0-1
bump to latest version; remove patches that are not needed anymore; add patch to build with gcc46; disable docs (fails)

Added:
  octave/trunk/octave-3.4.0-gcc46.patch
Modified:
  octave/trunk/PKGBUILD
Deleted:
  octave/trunk/octave-3.2.0_as_needed.patch
  octave/trunk/octave-3.2.0_parallel_make.patch

----------------------------------+
 PKGBUILD                         |   27 +++++++++++----------------
 octave-3.2.0_as_needed.patch     |   11 -----------
 octave-3.2.0_parallel_make.patch |   12 ------------
 octave-3.4.0-gcc46.patch         |   24 ++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-27 13:07:36 UTC (rev 120934)
+++ PKGBUILD	2011-04-27 13:47:11 UTC (rev 120935)
@@ -4,39 +4,35 @@
 # Contributor : cyberdune <cyberdune at gmail.com>
 
 pkgname=octave
-pkgver=3.2.4
-pkgrel=2
+pkgver=3.4.0
+pkgrel=1
 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')
+depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull')
 makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack')
 optdepends=('texinfo: for help-support in octave'
             'gnuplot: alternative plotting'
 	    'umfpack: LU decomposition of some large sparse matrices')
-source=("ftp://ftp.octave.org/pub/octave/octave-$pkgver.tar.bz2"
-	'octave-3.2.0_as_needed.patch'  'octave-3.2.0_parallel_make.patch' 'imread.patch')
+source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2"
+	octave-3.4.0-gcc46.patch)
 options=('!emptydirs')
 install=octave.install
-md5sums=('608196657f4fa010420227b77333bb71'
-         '33c8886cd908ace40f8b60334df1c34f'
-         'd59d783a8d7e8d8306caed4b2b8671a4'
-         '72d33ba1a862244f970cf259923815d9')
+sha1sums=('936a8fc962abd96e7568fb5909ec2a4d7997a1a8'
+          '791c905a80510783e5f9c556c12f02400887fbec')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # gentoo patches
-  patch -Np1 -i ${srcdir}/octave-3.2.0_as_needed.patch
-  patch -Np1 -i ${srcdir}/octave-3.2.0_parallel_make.patch 
-  patch -Np0 -i ${srcdir}/imread.patch
-  
+  # fedora gcc46 patch
+  patch -Np1 -i ${srcdir}/octave-3.4.0-gcc46.patch
+
   # http://www.nabble.com/Random-rounding-errors-td16010966.html
   FFLAGS="-O -ffloat-store" \
 
   ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static
+  --enable-shared --disable-static --disable-docs
 
   make
 }
@@ -45,5 +41,4 @@
   cd ${srcdir}/${pkgname}-${pkgver}
 
   make DESTDIR="${pkgdir}" install
-
 }

Deleted: octave-3.2.0_as_needed.patch
===================================================================
--- octave-3.2.0_as_needed.patch	2011-04-27 13:07:36 UTC (rev 120934)
+++ octave-3.2.0_as_needed.patch	2011-04-27 13:47:11 UTC (rev 120935)
@@ -1,11 +0,0 @@
-diff -Naur octave-3.2.0/liboctave/Makefile.in octave-3.2.0.new/liboctave/Makefile.in
---- octave-3.2.0/liboctave/Makefile.in	2009-05-25 02:04:59.000000000 -0400
-+++ octave-3.2.0.new/liboctave/Makefile.in	2009-07-10 10:32:09.000000000 -0400
-@@ -35,6 +35,7 @@
- DLL_CXXDEFS = @OCTAVE_DLL_DEFS@
- 
- LINK_DEPS = \
-+  -lpthread \
-   -L../libcruft -L. $(RLD_FLAG) \
-   $(LIBCRUFT) $(CHOLMOD_LIBS) $(UMFPACK_LIBS)  $(AMD_LIBS) \
-   $(CAMD_LIBS) $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) \

Deleted: octave-3.2.0_parallel_make.patch
===================================================================
--- octave-3.2.0_parallel_make.patch	2011-04-27 13:07:36 UTC (rev 120934)
+++ octave-3.2.0_parallel_make.patch	2011-04-27 13:47:11 UTC (rev 120935)
@@ -1,12 +0,0 @@
-diff -Naur octave-3.2.0/doc/Makefile.in octave-3.2.0.new/doc/Makefile.in
---- octave-3.2.0/doc/Makefile.in	2009-06-03 07:55:40.000000000 -0400
-+++ octave-3.2.0.new/doc/Makefile.in	2009-07-07 18:20:14.000000000 -0400
-@@ -30,6 +30,8 @@
- all: conf.texi $(SUBDIRS)
- .PHONY: all
- 
-+$(SUBDIRS): conf.texi
-+
- conf.texi: conf.texi.in $(TOPDIR)/Makeconf
- 	@$(do-subst-texinfo-vals)
- 

Added: octave-3.4.0-gcc46.patch
===================================================================
--- octave-3.4.0-gcc46.patch	                        (rev 0)
+++ octave-3.4.0-gcc46.patch	2011-04-27 13:47:11 UTC (rev 120935)
@@ -0,0 +1,24 @@
+diff -up octave-3.4.0/liboctave/oct-alloc.h.gcc46 octave-3.4.0/liboctave/oct-alloc.h
+--- octave-3.4.0/liboctave/oct-alloc.h.gcc46	2011-02-08 03:00:51.000000000 -0700
++++ octave-3.4.0/liboctave/oct-alloc.h	2011-02-08 09:41:23.984081687 -0700
+@@ -23,6 +23,8 @@ along with Octave; see the file COPYING.
+ #if !defined (octave_oct_alloc_h)
+ #define octave_oct_alloc_h 1
+ 
++#include <cstddef>
++
+ class
+ OCTAVE_API
+ octave_allocator
+diff -up octave-3.4.0/src/pr-output.cc.gcc46 octave-3.4.0/src/pr-output.cc
+--- octave-3.4.0/src/pr-output.cc.gcc46	2011-02-08 03:00:52.000000000 -0700
++++ octave-3.4.0/src/pr-output.cc	2011-02-08 09:55:16.149662744 -0700
+@@ -3024,7 +3024,7 @@ abs (T x)
+ }
+ 
+ #define INSTANTIATE_ABS(T) \
+-  template /* static */ inline T abs (T)
++  template /* static */ T abs (T)
+ 
+ INSTANTIATE_ABS(signed char);
+ INSTANTIATE_ABS(short);