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

[Giovanni Scafora]

    Date: Tuesday, July 14, 2009 @ 21:31:29
  Author: giovanni
Revision: 46268

Merged revisions 46240 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/octave/trunk

........
  r46240 | ronald | 2009-07-14 14:26:06 -0700 (mar, 14 lug 2009) | 2 lines
  
  upgpkg: octave 3.2.0-1
      bump to latest version, add build patches
........

Added:
  octave/repos/extra-i686/octave-3.2.0_as_needed.patch
    (from rev 46240, octave/trunk/octave-3.2.0_as_needed.patch)
  octave/repos/extra-i686/octave-3.2.0_parallel_make.patch
    (from rev 46240, octave/trunk/octave-3.2.0_parallel_make.patch)
Modified:
  octave/repos/extra-i686/	(properties)
  octave/repos/extra-i686/PKGBUILD

----------------------------------+
 PKGBUILD                         |   21 +++++++++++++--------
 octave-3.2.0_as_needed.patch     |   11 +++++++++++
 octave-3.2.0_parallel_make.patch |   12 ++++++++++++
 3 files changed, 36 insertions(+), 8 deletions(-)


Property changes on: octave/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /octave/trunk:1-43463
   + /octave/trunk:1-46267

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-15 00:47:54 UTC (rev 46267)
+++ extra-i686/PKGBUILD	2009-07-15 01:31:29 UTC (rev 46268)
@@ -4,29 +4,34 @@
 # Contributor : cyberdune <cyberdune at gmail.com>
 
 pkgname=octave
-pkgver=3.0.5
-pkgrel=4
+pkgver=3.2.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' 'blas' 'lapack')
+depends=('fftw' 'pcre' 'curl' 'blas' 'lapack' 'libx11')
 makedepends=('texinfo')
 optdepends=('texinfo: for help-support in octave'
             'gnuplot: to be able to plot in octave')
 provides=(octave3)
 conflicts=(octave3)
 replaces=(octave3)
-source=("ftp://ftp.octave.org/pub/octave/octave-$pkgver.tar.bz2")
+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')
 options=('!emptydirs')
 install=octave.install
-md5sums=('bfba44eeda8fa6e29c2bbcd2604c34eb')
+md5sums=('f7965847648233cd7ed866dd2db3bcdc'
+         '33c8886cd908ace40f8b60334df1c34f'
+         'd59d783a8d7e8d8306caed4b2b8671a4')
 
 build() {
-  cd "${srcdir}/octave-${pkgver}"
+  cd ${srcdir}/${pkgname}-${pkgver}
 
-  ./autogen.sh
-
+  # gentoo patches
+  patch -Np1 -i ${srcdir}/octave-3.2.0_as_needed.patch || return 1
+  patch -Np1 -i ${srcdir}/octave-3.2.0_parallel_make.patch || return 1
+  
   # http://www.nabble.com/Random-rounding-errors-td16010966.html
   FFLAGS="-O -ffloat-store" \
 

Copied: octave/repos/extra-i686/octave-3.2.0_as_needed.patch (from rev 46240, octave/trunk/octave-3.2.0_as_needed.patch)
===================================================================
--- extra-i686/octave-3.2.0_as_needed.patch	                        (rev 0)
+++ extra-i686/octave-3.2.0_as_needed.patch	2009-07-15 01:31:29 UTC (rev 46268)
@@ -0,0 +1,11 @@
+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) \

Copied: octave/repos/extra-i686/octave-3.2.0_parallel_make.patch (from rev 46240, octave/trunk/octave-3.2.0_parallel_make.patch)
===================================================================
--- extra-i686/octave-3.2.0_parallel_make.patch	                        (rev 0)
+++ extra-i686/octave-3.2.0_parallel_make.patch	2009-07-15 01:31:29 UTC (rev 46268)
@@ -0,0 +1,12 @@
+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)
+