[arch-commits] Commit in octave/repos (20 files)

Ronald van Haren ronald at archlinux.org
Sun Mar 18 15:07:27 EDT 2012


    Date: Sunday, March 18, 2012 @ 15:07:27
  Author: ronald
Revision: 153724

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  octave/repos/extra-i686/PKGBUILD
    (from rev 153723, octave/trunk/PKGBUILD)
  octave/repos/extra-i686/curlfix.patch
    (from rev 153723, octave/trunk/curlfix.patch)
  octave/repos/extra-i686/imread.patch
    (from rev 153723, octave/trunk/imread.patch)
  octave/repos/extra-i686/octave-3.4.0-gcc46.patch
    (from rev 153723, octave/trunk/octave-3.4.0-gcc46.patch)
  octave/repos/extra-i686/octave.install
    (from rev 153723, octave/trunk/octave.install)
  octave/repos/extra-x86_64/PKGBUILD
    (from rev 153723, octave/trunk/PKGBUILD)
  octave/repos/extra-x86_64/curlfix.patch
    (from rev 153723, octave/trunk/curlfix.patch)
  octave/repos/extra-x86_64/imread.patch
    (from rev 153723, octave/trunk/imread.patch)
  octave/repos/extra-x86_64/octave-3.4.0-gcc46.patch
    (from rev 153723, octave/trunk/octave-3.4.0-gcc46.patch)
  octave/repos/extra-x86_64/octave.install
    (from rev 153723, octave/trunk/octave.install)
Deleted:
  octave/repos/extra-i686/PKGBUILD
  octave/repos/extra-i686/curlfix.patch
  octave/repos/extra-i686/imread.patch
  octave/repos/extra-i686/octave-3.4.0-gcc46.patch
  octave/repos/extra-i686/octave.install
  octave/repos/extra-x86_64/PKGBUILD
  octave/repos/extra-x86_64/curlfix.patch
  octave/repos/extra-x86_64/imread.patch
  octave/repos/extra-x86_64/octave-3.4.0-gcc46.patch
  octave/repos/extra-x86_64/octave.install

---------------------------------------+
 extra-i686/PKGBUILD                   |   85 +++++++++++++++-----------------
 extra-i686/curlfix.patch              |   20 +++----
 extra-i686/imread.patch               |   58 ++++++++++-----------
 extra-i686/octave-3.4.0-gcc46.patch   |   48 +++++++++---------
 extra-i686/octave.install             |   36 ++++++-------
 extra-x86_64/PKGBUILD                 |   85 +++++++++++++++-----------------
 extra-x86_64/curlfix.patch            |   20 +++----
 extra-x86_64/imread.patch             |   58 ++++++++++-----------
 extra-x86_64/octave-3.4.0-gcc46.patch |   48 +++++++++---------
 extra-x86_64/octave.install           |   36 ++++++-------
 10 files changed, 246 insertions(+), 248 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-03-18 19:06:26 UTC (rev 153723)
+++ extra-i686/PKGBUILD	2012-03-18 19:07:27 UTC (rev 153724)
@@ -1,43 +0,0 @@
-# $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.1
-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' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull' 'fltk')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core')
-optdepends=('texinfo: for help-support in octave'
-            'gnuplot: alternative plotting'
-	    'umfpack: LU decomposition of some large sparse matrices')
-source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2")
-options=('!emptydirs')
-install=octave.install
-sha1sums=('46fdc0b3d7db1b0266975a7443e26769c939a9c7')
-	
-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
-}

Copied: octave/repos/extra-i686/PKGBUILD (from rev 153723, octave/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-03-18 19:07:27 UTC (rev 153724)
@@ -0,0 +1,42 @@
+# $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.1
+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' 'fltk' 'suitesparse') 
+makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'suitesparse' 'texlive-core')
+optdepends=('texinfo: for help-support in octave'
+            'gnuplot: alternative plotting')
+source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2")
+options=('!emptydirs')
+install=octave.install
+sha1sums=('46fdc0b3d7db1b0266975a7443e26769c939a9c7')
+	
+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
+
+  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
+}

Deleted: extra-i686/curlfix.patch
===================================================================
--- extra-i686/curlfix.patch	2012-03-18 19:06:26 UTC (rev 153723)
+++ extra-i686/curlfix.patch	2012-03-18 19:07:27 UTC (rev 153724)
@@ -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

Copied: octave/repos/extra-i686/curlfix.patch (from rev 153723, octave/trunk/curlfix.patch)
===================================================================
--- extra-i686/curlfix.patch	                        (rev 0)
+++ extra-i686/curlfix.patch	2012-03-18 19:07:27 UTC (rev 153724)
@@ -0,0 +1,10 @@
+--- 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

Deleted: extra-i686/imread.patch
===================================================================
--- extra-i686/imread.patch	2012-03-18 19:06:26 UTC (rev 153723)
+++ extra-i686/imread.patch	2012-03-18 19:07:27 UTC (rev 153724)
@@ -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)
-     {

Copied: octave/repos/extra-i686/imread.patch (from rev 153723, octave/trunk/imread.patch)
===================================================================
--- extra-i686/imread.patch	                        (rev 0)
+++ extra-i686/imread.patch	2012-03-18 19:07:27 UTC (rev 153724)
@@ -0,0 +1,29 @@
+--- 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)
+     {

Deleted: extra-i686/octave-3.4.0-gcc46.patch
===================================================================
--- extra-i686/octave-3.4.0-gcc46.patch	2012-03-18 19:06:26 UTC (rev 153723)
+++ extra-i686/octave-3.4.0-gcc46.patch	2012-03-18 19:07:27 UTC (rev 153724)
@@ -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);

Copied: octave/repos/extra-i686/octave-3.4.0-gcc46.patch (from rev 153723, octave/trunk/octave-3.4.0-gcc46.patch)
===================================================================
--- extra-i686/octave-3.4.0-gcc46.patch	                        (rev 0)
+++ extra-i686/octave-3.4.0-gcc46.patch	2012-03-18 19:07:27 UTC (rev 153724)
@@ -0,0 +1,24 @@
+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);

Deleted: extra-i686/octave.install
===================================================================
--- extra-i686/octave.install	2012-03-18 19:06:26 UTC (rev 153723)
+++ extra-i686/octave.install	2012-03-18 19:07:27 UTC (rev 153724)
@@ -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-i686/octave.install (from rev 153723, octave/trunk/octave.install)
===================================================================
--- extra-i686/octave.install	                        (rev 0)
+++ extra-i686/octave.install	2012-03-18 19:07:27 UTC (rev 153724)
@@ -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
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-03-18 19:06:26 UTC (rev 153723)
+++ extra-x86_64/PKGBUILD	2012-03-18 19:07:27 UTC (rev 153724)
@@ -1,43 +0,0 @@
-# $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.1
-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' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull' 'fltk')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core')
-optdepends=('texinfo: for help-support in octave'
-            'gnuplot: alternative plotting'
-	    'umfpack: LU decomposition of some large sparse matrices')
-source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2")
-options=('!emptydirs')
-install=octave.install
-sha1sums=('46fdc0b3d7db1b0266975a7443e26769c939a9c7')
-	
-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
-}

Copied: octave/repos/extra-x86_64/PKGBUILD (from rev 153723, octave/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-03-18 19:07:27 UTC (rev 153724)
@@ -0,0 +1,42 @@
+# $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.1
+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' 'fltk' 'suitesparse') 
+makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'suitesparse' 'texlive-core')
+optdepends=('texinfo: for help-support in octave'
+            'gnuplot: alternative plotting')
+source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2")
+options=('!emptydirs')
+install=octave.install
+sha1sums=('46fdc0b3d7db1b0266975a7443e26769c939a9c7')
+	
+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
+
+  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
+}

Deleted: extra-x86_64/curlfix.patch
===================================================================
--- extra-x86_64/curlfix.patch	2012-03-18 19:06:26 UTC (rev 153723)
+++ extra-x86_64/curlfix.patch	2012-03-18 19:07:27 UTC (rev 153724)
@@ -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

Copied: octave/repos/extra-x86_64/curlfix.patch (from rev 153723, octave/trunk/curlfix.patch)
===================================================================
--- extra-x86_64/curlfix.patch	                        (rev 0)
+++ extra-x86_64/curlfix.patch	2012-03-18 19:07:27 UTC (rev 153724)
@@ -0,0 +1,10 @@
+--- 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

Deleted: extra-x86_64/imread.patch
===================================================================
--- extra-x86_64/imread.patch	2012-03-18 19:06:26 UTC (rev 153723)
+++ extra-x86_64/imread.patch	2012-03-18 19:07:27 UTC (rev 153724)
@@ -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)
-     {

Copied: octave/repos/extra-x86_64/imread.patch (from rev 153723, octave/trunk/imread.patch)
===================================================================
--- extra-x86_64/imread.patch	                        (rev 0)
+++ extra-x86_64/imread.patch	2012-03-18 19:07:27 UTC (rev 153724)
@@ -0,0 +1,29 @@
+--- 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)
+     {

Deleted: extra-x86_64/octave-3.4.0-gcc46.patch
===================================================================
--- extra-x86_64/octave-3.4.0-gcc46.patch	2012-03-18 19:06:26 UTC (rev 153723)
+++ extra-x86_64/octave-3.4.0-gcc46.patch	2012-03-18 19:07:27 UTC (rev 153724)
@@ -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);

Copied: octave/repos/extra-x86_64/octave-3.4.0-gcc46.patch (from rev 153723, octave/trunk/octave-3.4.0-gcc46.patch)
===================================================================
--- extra-x86_64/octave-3.4.0-gcc46.patch	                        (rev 0)
+++ extra-x86_64/octave-3.4.0-gcc46.patch	2012-03-18 19:07:27 UTC (rev 153724)
@@ -0,0 +1,24 @@
+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);

Deleted: extra-x86_64/octave.install
===================================================================
--- extra-x86_64/octave.install	2012-03-18 19:06:26 UTC (rev 153723)
+++ extra-x86_64/octave.install	2012-03-18 19:07:27 UTC (rev 153724)
@@ -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 153723, octave/trunk/octave.install)
===================================================================
--- extra-x86_64/octave.install	                        (rev 0)
+++ extra-x86_64/octave.install	2012-03-18 19:07:27 UTC (rev 153724)
@@ -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