[arch-commits] Commit in octave/trunk (5 files)
Ronald van Haren
ronald at archlinux.org
Tue Sep 2 17:18:37 UTC 2008
Date: Tuesday, September 2, 2008 @ 13:18:37
Author: ronald
Revision: 11763
upgpkg: octave 3.0.2-1
Modified:
octave/trunk/PKGBUILD
octave/trunk/octave.install
Deleted:
octave/trunk/gcc-4.3.patch
octave/trunk/octave.desktop
octave/trunk/octave.png
----------------+
PKGBUILD | 67 +++++++++++---------------
gcc-4.3.patch | 141 -------------------------------------------------------
octave.desktop | 18 -------
octave.install | 19 +++----
4 files changed, 40 insertions(+), 205 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-09-02 16:42:34 UTC (rev 11762)
+++ PKGBUILD 2008-09-02 17:18:37 UTC (rev 11763)
@@ -1,46 +1,39 @@
# $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor : shining <shiningxc.at.gmail.com>
+# Contributor : cyberdune <cyberdune at gmail.com>
pkgname=octave
-pkgver=2.1.73
-pkgrel=6
-pkgdesc="Octave is a high-level language, primarily intended for numerical computations."
-arch=(i686 x86_64)
+pkgver=3.0.2
+pkgrel=1
+pkgdesc="A high-level language, primarily intended for numerical computations."
+arch=('i686' 'x86_64')
url="http://www.octave.org"
-depends=('gcc-libs>=4.3.0' 'readline' 'fftw>=3.1.2-2' 'blas>=19980702-4')
-mirror="ftp://ftp.octave.org/pub/octave/obsolete/"
-#mirror="ftp://ftp.math.uni-hamburg.de/pub/soft/math/octave/"
-#source=("ftp://ftp.octave.org/pub/octave/$pkgname-$pkgver.tar.bz2")
-source=(${mirror}${pkgname}-${pkgver}.tar.bz2
- octave.png
- octave.desktop
- gcc-4.3.patch)
+license=('GPL')
+depends=('fftw' 'pcre' 'curl' 'blas')
+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")
+options=('!emptydirs')
install=octave.install
-license=('GPL2')
-md5sums=('c356475aa06d81a10f8bf27f1a1d27a0'
- '5bf187e2c47f534be9524db9d68fa305'
- 'dcac0dbefb011d538c4b290fe9b96f7c'
- '52f37b3438b59f812034b8d0ff7e125e')
+md5sums=('931e28ab1181018c8079fb8138971ab0')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
- patch -Np1 -i ${startdir}/src/gcc-4.3.patch || return 1
- FFLAGS="-O -ffloat-store" ./configure \
- --prefix=/usr \
- --enable-shared \
- --enable-dl \
- --without-hdf5 \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info
- make || return 1
- make DESTDIR=${startdir}/pkg install || return 1
+ cd "$srcdir/octave-$pkgver"
- # install some freedesktop.org compatibility
- install -d -m755 ${startdir}/pkg/usr/share/applications
- install -d -m755 ${startdir}/pkg/usr/share/pixmaps
- install -m644 ${startdir}/src/octave.desktop \
- ${startdir}/pkg/usr/share/applications/ || return 1
- install -m644 ${startdir}/src/octave.png \
- ${startdir}/pkg/usr/share/pixmaps/ || return 1
- rm ${pkgdir}/usr/share/info/dir
+ ./autogen.sh
+
+ # http://www.nabble.com/Random-rounding-errors-td16010966.html
+ FFLAGS="-O -ffloat-store" \
+
+ ./configure --prefix=/usr --libexecdir=/usr/lib \
+ --without-hdf5 --without-umfpack
+
+ make || return 1
+ make DESTDIR="$pkgdir" install || return 1
}
+
Deleted: gcc-4.3.patch
===================================================================
--- gcc-4.3.patch 2008-09-02 16:42:34 UTC (rev 11762)
+++ gcc-4.3.patch 2008-09-02 17:18:37 UTC (rev 11763)
@@ -1,141 +0,0 @@
---- octave2.1-2.1.73.orig/doc/interpreter/munge-texi.cc
-+++ octave2.1-2.1.73/doc/interpreter/munge-texi.cc
-@@ -30,6 +30,8 @@
- #include <fstream>
- #include <string>
- #include <map>
-+#include <cstdlib>
-+#include <cstring>
-
- static const char doc_delim = ' ';
-
---- octave2.1-2.1.73.orig/liboctave/data-conv.cc
-+++ octave2.1-2.1.73/liboctave/data-conv.cc
-@@ -26,6 +26,7 @@
- #endif
-
- #include <cctype>
-+#include <cstdlib>
-
- #include <iostream>
-
---- octave2.1-2.1.73.orig/liboctave/lo-utils.cc
-+++ octave2.1-2.1.73/liboctave/lo-utils.cc
-@@ -29,6 +29,7 @@
- #include <climits>
- #include <cstdlib>
- #include <cstdio>
-+#include <cstring>
-
- #include <string>
-
---- octave2.1-2.1.73.orig/liboctave/oct-env.cc
-+++ octave2.1-2.1.73/liboctave/oct-env.cc
-@@ -43,6 +43,7 @@
-
- #include <cctype>
- #include <cstdlib>
-+#include <cstring>
-
- #include <string>
-
---- octave2.1-2.1.73.orig/src/unwind-prot.cc
-+++ octave2.1-2.1.73/src/unwind-prot.cc
-@@ -30,6 +30,7 @@
- #endif
-
- #include <cstddef>
-+#include <cstring>
-
- #include "CMatrix.h"
-
---- octave2.1-2.1.73.orig/src/pr-output.cc
-+++ octave2.1-2.1.73/src/pr-output.cc
-@@ -32,6 +32,7 @@
-
- #include <iomanip>
- #include <iostream>
-+#include <sstream>
- #include <string>
-
- #include "Array-util.h"
-@@ -1602,7 +1603,7 @@
- }
-
- template <>
--static inline void
-+/* static */ inline void
- pr_plus_format (std::ostream& os, const Complex& c)
- {
- double rp = c.real ();
---- octave2.1-2.1.73.orig/src/DLD-FUNCTIONS/sort.cc
-+++ octave2.1-2.1.73/src/DLD-FUNCTIONS/sort.cc
-@@ -26,6 +26,8 @@
- #include <config.h>
- #endif
-
-+#include <vector>
-+
- #include "lo-mappers.h"
- #include "quit.h"
-
-@@ -294,7 +296,7 @@
- template class octave_sort<vec_index<unsigned EIGHT_BYTE_INT> *>;
-
- template <>
--static octave_value
-+/* static */ octave_value
- mx_sort (ArrayN<double> &m, int dim, sortmode mode)
- {
- octave_value retval;
-@@ -431,7 +433,7 @@
- }
-
- template <>
--static octave_value_list
-+/* static */ octave_value_list
- mx_sort_indexed (ArrayN<double> &m, int dim, sortmode mode)
- {
- octave_value_list retval;
---- octave2.1-2.1.73.orig/liboctave/oct-sort.cc
-+++ octave2.1-2.1.73/liboctave/oct-sort.cc
-@@ -84,6 +84,8 @@
- #include <config.h>
- #endif
-
-+#include <cstdlib>
-+#include <cstring>
- #include "lo-mappers.h"
- #include "quit.h"
- #include "oct-sort.h"
---- octave2.1-2.1.73.orig/liboctave/chMatrix.cc
-+++ octave2.1-2.1.73/liboctave/chMatrix.cc
-@@ -30,6 +30,8 @@
- #include <config.h>
- #endif
-
-+#include <cstring>
-+
- #include <iostream>
- #include <string>
-
---- octave-2.1.73/src/file-io.cc.orig 2008-03-09 18:48:12.000000000 +0000
-+++ octave-2.1.73/src/file-io.cc 2008-03-09 18:48:51.000000000 +0000
-@@ -42,6 +42,7 @@
- #include <cerrno>
- #include <climits>
- #include <cstdio>
-+#include <cstring>
-
- #include <iostream>
- #include <vector>
---- octave-2.1.73/src/parse.y.orig 2008-03-09 18:52:16.000000000 +0000
-+++ octave-2.1.73/src/parse.y 2008-03-09 18:52:25.000000000 +0000
-@@ -34,6 +34,7 @@
-
- #include <cassert>
- #include <cstdio>
-+#include <cstring>
-
- #ifdef YYBYACC
- #include <cstdlib>
Deleted: octave.desktop
===================================================================
--- octave.desktop 2008-09-02 16:42:34 UTC (rev 11762)
+++ octave.desktop 2008-09-02 17:18:37 UTC (rev 11763)
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Categories=Science;Math
-Comment=environment for numerical computing
-Comment[en_GB]=environment for numerical computing
-Exec=octave
-GenericName=environment for numerical computing
-GenericName[en_GB]=environment for numerical computing
-Icon=/usr/share/pixmaps/octave.png
-MimeType=
-Name=octave
-Path=
-StartupNotify=true
-Terminal=true
-TerminalOptions=
-Type=Application
-X-DCOP-ServiceType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
Modified: octave.install
===================================================================
--- octave.install 2008-09-02 16:42:34 UTC (rev 11762)
+++ octave.install 2008-09-02 17:18:37 UTC (rev 11763)
@@ -1,21 +1,22 @@
# arg 1: the new package version
post_install() {
- echo "octave: install 'texinfo' for help-support in octave"
- echo "octave: install 'gnuplot' to be able to plot in octave"
+cat << _EOF
+
+==>> octave installation notes:
+ ------------------------------------
+ Please note that Octave 3.0 is significantly different from Octave 2.1.x,
+ particularly with regard to graphics, path handling, and built-in variables.
+ Please read the NEWS file (http://www.gnu.org/software/octave/NEWS-3.html).
+
+_EOF
}
# arg 1: the new package version
# arg 2: the old package version
post_upgrade() {
- echo "octave: install 'texinfo' for help-support in octave"
- echo "octave: install 'gnuplot' to be able to plot in octave"
+ post_install
}
-# arg 1: the old package version
-pre_remove() {
- /bin/true
-}
-
op=$1
shift
Deleted: octave.png
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list