diff options
Diffstat (limited to 'testing/octave')
-rw-r--r-- | testing/octave/PKGBUILD | 44 | ||||
-rw-r--r-- | testing/octave/curlfix.patch | 10 | ||||
-rw-r--r-- | testing/octave/imread.patch | 29 | ||||
-rw-r--r-- | testing/octave/octave-3.4.0-gcc46.patch | 24 | ||||
-rw-r--r-- | testing/octave/octave.install | 18 |
5 files changed, 0 insertions, 125 deletions
diff --git a/testing/octave/PKGBUILD b/testing/octave/PKGBUILD deleted file mode 100644 index efdc54153..000000000 --- a/testing/octave/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 149675 2012-02-08 23:59:49Z allan $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor : shining <shiningxc.at.gmail.com> -# Contributor : cyberdune <cyberdune@gmail.com> - -pkgname=octave -pkgver=3.4.3 -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' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull') -makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core' 'fltk') -optdepends=('texinfo: for help-support in octave' - 'gnuplot: alternative plotting' - 'umfpack: LU decomposition of some large sparse matrices' - 'fltk: alternative plotting') -source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2") -options=('!emptydirs') -install=octave.install -sha1sums=('fe622c28a38f8730c59e46211bc7b18e7f51a679') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # http://www.nabble.com/Random-rounding-errors-td16010966.html - FFLAGS="-O -ffloat-store" \ - - ./configure --prefix=/usr --libexecdir=/usr/lib \ - --enable-shared --disable-static --with-quantum-depth=16 - - 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 -} diff --git a/testing/octave/curlfix.patch b/testing/octave/curlfix.patch deleted file mode 100644 index 26f3d92f9..000000000 --- a/testing/octave/curlfix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/DLD-FUNCTIONS/urlwrite.cc.old 2011-07-02 16:39:22.466603778 +0200 -+++ src/DLD-FUNCTIONS/urlwrite.cc 2011-07-02 16:39:54.543269859 +0200 -@@ -52,7 +52,6 @@ - - #include <curl/curl.h> - #include <curl/curlver.h> --#include <curl/types.h> - #include <curl/easy.h> - - static int diff --git a/testing/octave/imread.patch b/testing/octave/imread.patch deleted file mode 100644 index 4a7b73ea0..000000000 --- a/testing/octave/imread.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- src/DLD-FUNCTIONS/__magick_read__.cc.orig 2010-03-06 08:05:25.000000000 +0000 -+++ src/DLD-FUNCTIONS/__magick_read__.cc 2009-08-25 09:26:01.000000000 +0100 -@@ -30,6 +30,7 @@ - #include "defun-dld.h" - #include "error.h" - #include "ov-struct.h" -+#include "oct-env.h" - - #ifdef HAVE_MAGICK - -@@ -359,6 +358,18 @@ - - #ifdef HAVE_MAGICK - -+ static bool initialized = false; -+ -+ if (! initialized) -+ { -+ std::string program_name = octave_env::get_program_invocation_name (); -+ -+ Magick::InitializeMagick (program_name.c_str ()); -+ -+ initialized = true; -+ } -+ -+ - if (args.length () > 2 || args.length () < 1 || ! args(0).is_string () - || nargout > 3) - { diff --git a/testing/octave/octave-3.4.0-gcc46.patch b/testing/octave/octave-3.4.0-gcc46.patch deleted file mode 100644 index c174204ac..000000000 --- a/testing/octave/octave-3.4.0-gcc46.patch +++ /dev/null @@ -1,24 +0,0 @@ -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); diff --git a/testing/octave/octave.install b/testing/octave/octave.install deleted file mode 100644 index 8ee77c430..000000000 --- a/testing/octave/octave.install +++ /dev/null @@ -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 -} |