[arch-commits] Commit in octave/repos (8 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Sat Sep 14 10:56:59 UTC 2013
Date: Saturday, September 14, 2013 @ 12:56:59
Author: bpiotrowski
Revision: 194351
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
octave/repos/staging-i686/
octave/repos/staging-i686/PKGBUILD
(from rev 194350, octave/trunk/PKGBUILD)
octave/repos/staging-i686/mex-gcc-4.8.patch
(from rev 194350, octave/trunk/mex-gcc-4.8.patch)
octave/repos/staging-i686/octave.install
(from rev 194350, octave/trunk/octave.install)
octave/repos/staging-x86_64/
octave/repos/staging-x86_64/PKGBUILD
(from rev 194350, octave/trunk/PKGBUILD)
octave/repos/staging-x86_64/mex-gcc-4.8.patch
(from rev 194350, octave/trunk/mex-gcc-4.8.patch)
octave/repos/staging-x86_64/octave.install
(from rev 194350, octave/trunk/octave.install)
----------------------------------+
staging-i686/PKGBUILD | 48 +++++++++++++++++++++++++++++++++++++
staging-i686/mex-gcc-4.8.patch | 31 +++++++++++++++++++++++
staging-i686/octave.install | 18 +++++++++++++
staging-x86_64/PKGBUILD | 48 +++++++++++++++++++++++++++++++++++++
staging-x86_64/mex-gcc-4.8.patch | 31 +++++++++++++++++++++++
staging-x86_64/octave.install | 18 +++++++++++++
6 files changed, 194 insertions(+)
Copied: octave/repos/staging-i686/PKGBUILD (from rev 194350, octave/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-09-14 10:56:59 UTC (rev 194351)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor : shining <shiningxc.at.gmail.com>
+# Contributor : cyberdune <cyberdune at gmail.com>
+
+pkgname=octave
+pkgver=3.6.4
+pkgrel=4
+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/staging-i686/mex-gcc-4.8.patch (from rev 194350, octave/trunk/mex-gcc-4.8.patch)
===================================================================
--- staging-i686/mex-gcc-4.8.patch (rev 0)
+++ staging-i686/mex-gcc-4.8.patch 2013-09-14 10:56:59 UTC (rev 194351)
@@ -0,0 +1,31 @@
+# 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
Copied: octave/repos/staging-i686/octave.install (from rev 194350, octave/trunk/octave.install)
===================================================================
--- staging-i686/octave.install (rev 0)
+++ staging-i686/octave.install 2013-09-14 10:56:59 UTC (rev 194351)
@@ -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
+}
Copied: octave/repos/staging-x86_64/PKGBUILD (from rev 194350, octave/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-09-14 10:56:59 UTC (rev 194351)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor : shining <shiningxc.at.gmail.com>
+# Contributor : cyberdune <cyberdune at gmail.com>
+
+pkgname=octave
+pkgver=3.6.4
+pkgrel=4
+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/staging-x86_64/mex-gcc-4.8.patch (from rev 194350, octave/trunk/mex-gcc-4.8.patch)
===================================================================
--- staging-x86_64/mex-gcc-4.8.patch (rev 0)
+++ staging-x86_64/mex-gcc-4.8.patch 2013-09-14 10:56:59 UTC (rev 194351)
@@ -0,0 +1,31 @@
+# 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
Copied: octave/repos/staging-x86_64/octave.install (from rev 194350, octave/trunk/octave.install)
===================================================================
--- staging-x86_64/octave.install (rev 0)
+++ staging-x86_64/octave.install 2013-09-14 10:56:59 UTC (rev 194351)
@@ -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
+}
More information about the arch-commits
mailing list