Date: Sunday, June 2, 2013 @ 12:21:27 Author: ronald Revision: 186980
archrelease: copy trunk to extra-x86_64 Added: octave/repos/extra-x86_64/PKGBUILD (from rev 186979, octave/trunk/PKGBUILD) octave/repos/extra-x86_64/mex-gcc-4.8.patch (from rev 186979, octave/trunk/mex-gcc-4.8.patch) octave/repos/extra-x86_64/octave.install (from rev 186979, octave/trunk/octave.install) Deleted: octave/repos/extra-x86_64/PKGBUILD octave/repos/extra-x86_64/octave-gethelp.patch octave/repos/extra-x86_64/octave.install ----------------------+ PKGBUILD | 94 +++++++++++++++++++++++++------------------------ mex-gcc-4.8.patch | 31 ++++++++++++++++ octave-gethelp.patch | 13 ------ octave.install | 36 +++++++++--------- 4 files changed, 97 insertions(+), 77 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2013-06-02 10:21:12 UTC (rev 186979) +++ PKGBUILD 2013-06-02 10:21:27 UTC (rev 186980) @@ -1,46 +0,0 @@ -# $Id$ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor : shining <shiningxc.at.gmail.com> -# Contributor : cyberdune <cyberd...@gmail.com> - -pkgname=octave -pkgver=3.6.4 -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' 'suitesparse' 'arpack') -makedepends=('gcc-fortran' 'texlive-core') -optdepends=('texinfo: for help-support in octave' - 'gnuplot: alternative plotting') -source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}) -options=('!emptydirs') -install=octave.install -sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4' - 'SKIP') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - autoreconf -vfi - - # http://www.nabble.com/Random-rounding-errors-td16010966.html - FFLAGS="-O -ffloat-store" \ - - ./configure --prefix=/usr --libexecdir=/usr/lib \ - --enable-shared --disable-static \ - --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html - - LANG=C make -} - -package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - # add octave library path to ld.so.conf.d - install -d "${pkgdir}/etc/ld.so.conf.d" - echo "/usr/lib/${pkgname}/${pkgver}" > "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf" -} Copied: octave/repos/extra-x86_64/PKGBUILD (from rev 186979, octave/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2013-06-02 10:21:27 UTC (rev 186980) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor : shining <shiningxc.at.gmail.com> +# Contributor : cyberdune <cyberd...@gmail.com> + +pkgname=octave +pkgver=3.6.4 +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' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'suitesparse' 'arpack') +makedepends=('gcc-fortran' 'texlive-core') +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) +options=('!emptydirs') +install=octave.install +sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4' + 'SKIP' + '0608af9b7ccce8455f534d2fc4acf2f4c8f83a60') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # https://savannah.gnu.org/bugs/?38746 + patch -Np1 -i "${srcdir}/mex-gcc-4.8.patch" + + autoreconf -vfi + + ./configure --prefix=/usr --libexecdir=/usr/lib \ + --enable-shared --disable-static \ + --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html + + LANG=C make +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + # add octave library path to ld.so.conf.d + install -d "${pkgdir}/etc/ld.so.conf.d" + echo "/usr/lib/${pkgname}/${pkgver}" > "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf" +} Copied: octave/repos/extra-x86_64/mex-gcc-4.8.patch (from rev 186979, octave/trunk/mex-gcc-4.8.patch) =================================================================== --- mex-gcc-4.8.patch (rev 0) +++ mex-gcc-4.8.patch 2013-06-02 10:21:27 UTC (rev 186980) @@ -0,0 +1,31 @@ +# HG changeset patch +# User Clemens Buchacher <dri...@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 Deleted: octave-gethelp.patch =================================================================== --- octave-gethelp.patch 2013-06-02 10:21:12 UTC (rev 186979) +++ octave-gethelp.patch 2013-06-02 10:21:27 UTC (rev 186980) @@ -1,13 +0,0 @@ -Help parallel compilation -patch by Sebastien Fabbro ---- scripts/Makefile.am.orig 2011-06-09 22:27:22.688268651 +0100 -+++ scripts/Makefile.am 2011-02-08 10:00:51.000000000 +0000 -@@ -316,7 +316,7 @@ - - gethelp_SOURCES = gethelp.cc - --.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile -+.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile gethelp - @$(MAKE) $(AM_MAKEFLAGS) gethelp$(BUILD_EXEEXT) - if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \ - cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \ Deleted: octave.install =================================================================== --- octave.install 2013-06-02 10:21:12 UTC (rev 186979) +++ octave.install 2013-06-02 10:21:27 UTC (rev 186980) @@ -1,18 +0,0 @@ -info_dir=/usr/share/info -info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5) - -post_install() { - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install -} - -pre_remove() { - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} Copied: octave/repos/extra-x86_64/octave.install (from rev 186979, octave/trunk/octave.install) =================================================================== --- octave.install (rev 0) +++ octave.install 2013-06-02 10:21:27 UTC (rev 186980) @@ -0,0 +1,18 @@ +info_dir=/usr/share/info +info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5) + +post_install() { + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install +} + +pre_remove() { + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +}