[Pkg-octave-commit] [SCM] octave branch, master, updated. 3.2.2-2-37-g4ebf6eb

[Thomas Weber]

tags 603046 pending
thanks

The following commit has been merged in the master branch:
commit 350add6988b5a8ef831052dfb84262c9fcb55db5
Author: Thomas Weber <tweber at debian.org>
Date:   Sun May 15 08:02:08 2011 +0200

    New patch: fixes-for-gcc-4.6, fix for 603046

diff --git a/debian/changelog b/debian/changelog
index 17d93f5..2dea778 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+octave3.2 (3.2.4-10) UNRELEASED; urgency=low
+
+  * New patches
+    - fixes-for-gcc-4.6: GCC 4.6 no longer includes the headers that defined
+    size_t automatically; and it doesn't like 'inline' in explicit
+    instantiations either (closes: #603046). The latter bug isn't mentioned in
+    the bug report, but was seen once the first bug was fixed. Thanks to Orion
+    Poplawski from Fedora for the original patch.
+
+ -- Thomas Weber <tweber at debian.org>  Sun, 15 May 2011 07:51:18 +0200
+
 octave3.2 (3.2.4-9) unstable; urgency=low
 
   * debian/in/control: Give an explicit package name as preference for the
diff --git a/debian/in/series b/debian/in/series
index 69f4bcd..8986b63 100644
--- a/debian/in/series
+++ b/debian/in/series
@@ -19,4 +19,5 @@ filter_empty_vector
 handle_new_graphicsmagic
 fix_relative_addpath
 include_mpi_headers
+fixes-for-gcc-4.6
 :]
diff --git a/debian/patches/fixes-for-gcc-4.6 b/debian/patches/fixes-for-gcc-4.6
new file mode 100644
index 0000000..a498eca
--- /dev/null
+++ b/debian/patches/fixes-for-gcc-4.6
@@ -0,0 +1,27 @@
+From: Orion Poplawski <orion at cora.nwra.com>
+Subject: small changes for GCC 4.6
+
+Origin: upstream, http://hg.savannah.gnu.org/hgweb/octave/rev/1cf28ef2bb88
+Bug-Debian: http://bugs.debian.org/603046
+--- a/liboctave/oct-alloc.h
++++ b/liboctave/oct-alloc.h
+@@ -24,6 +24,8 @@
+ #if !defined (octave_oct_alloc_h)
+ #define octave_oct_alloc_h 1
+ 
++#include <cstddef>
++
+ class
+ OCTAVE_API
+ octave_allocator
+--- a/src/pr-output.cc
++++ b/src/pr-output.cc
+@@ -2854,7 +2854,7 @@
+ }
+ 
+ #define INSTANTIATE_ABS(T) \
+-  template /* static */ inline T abs (T)
++  template /* static */ T abs (T)
+ 
+ INSTANTIATE_ABS(signed char);
+ INSTANTIATE_ABS(short);

-- 
octave