[arch-commits] Commit in octave/trunk (PKGBUILD mex-gcc-4.8.patch octave.install)

[Ronald van Haren]

    Date: Sunday, January 26, 2014 @ 12:14:57
  Author: ronald
Revision: 204738

update PKGBUILD files for 3.8.0 release; extra makedepends are needed for building docs; patch no longer needed; wait for version 4 before including the gui, upstream doesn't considers it finished yet

Modified:
  octave/trunk/PKGBUILD
  octave/trunk/octave.install
Deleted:
  octave/trunk/mex-gcc-4.8.patch

-------------------+
 PKGBUILD          |   21 ++++++---------------
 mex-gcc-4.8.patch |   31 -------------------------------
 octave.install    |    2 +-
 3 files changed, 7 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-26 10:45:02 UTC (rev 204737)
+++ PKGBUILD	2014-01-26 11:14:57 UTC (rev 204738)
@@ -4,31 +4,22 @@
 # Contributor : cyberdune <cyberdune at gmail.com>
 
 pkgname=octave
-pkgver=3.6.4
-pkgrel=6
+pkgver=3.8.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' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 'glu') 
-makedepends=('gcc-fortran' 'texlive-core' 'suitesparse')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot')
 optdepends=('texinfo: for help-support in octave'
             'gnuplot: alternative plotting')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}
-        mex-gcc-4.8.patch)
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig})
 options=('!emptydirs')
 install=octave.install
-sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4'
-          'SKIP'
-          '0608af9b7ccce8455f534d2fc4acf2f4c8f83a60')
+sha1sums=('ebb03485b72d97fa01f105460f81016f94680f77'
+          'SKIP')
 
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # https://savannah.gnu.org/bugs/?38746
-  patch -Np1 -i "${srcdir}/mex-gcc-4.8.patch"
-}
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 

Deleted: mex-gcc-4.8.patch
===================================================================
--- mex-gcc-4.8.patch	2014-01-26 10:45:02 UTC (rev 204737)
+++ mex-gcc-4.8.patch	2014-01-26 11:14:57 UTC (rev 204738)
@@ -1,31 +0,0 @@
-# HG changeset patch
-# User Clemens Buchacher <drizzd at aon.at>
-# Date 1369937542 14400
-#      Thu May 30 14:12:22 2013 -0400
-# Node ID 122d3f62e179ba044d47e58510905719220d8706
-# Parent  e38a0fa08368d4dd6f3a0dfd20cbe28cf8555f73
-do not include C++ header in extern "C" context (bug #38746)
-
-* mex.h: Include mexproto.h outside of extern "C" block.
-
-diff -r e38a0fa08368 -r 122d3f62e179 src/mex.h
---- a/src/mex.h	Mon May 27 21:41:57 2013 +0200
-+++ b/src/mex.h	Thu May 30 14:12:22 2013 -0400
-@@ -64,6 +64,8 @@
- 
- #define mxMAXNAME 64
- 
-+#include "mexproto.h"
-+
- #if defined (__cplusplus)
- extern "C" {
- #endif
-@@ -74,8 +76,6 @@
- void mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray *prhs[]);
- #endif
- 
--#include "mexproto.h"
--
- /* V4 floating point routines renamed in V5.  */
- #define mexIsNaN mxIsNaN
- #define mexIsFinite mxIsFinite

Modified: octave.install
===================================================================
--- octave.install	2014-01-26 10:45:02 UTC (rev 204737)
+++ octave.install	2014-01-26 11:14:57 UTC (rev 204738)
@@ -1,5 +1,5 @@
 info_dir=/usr/share/info
-info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5)
+info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5 octave.info-6 octave.info-7 octave.info-8)
 
 post_install() {
   for f in ${info_files[@]}; do