[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. debian/3.6.4-2-4-g1ef026b

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 5810662410640c9f3cab2e33904537ae64442ca6
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed May 29 14:52:17 2013 +0200

    gcc-4.8.diff: new patch, fixes compilation of C++ MEX files with GCC 4.8
    
    Closes: #705485

diff --git a/debian/patches/gcc-4.8.diff b/debian/patches/gcc-4.8.diff
new file mode 100644
index 0000000..1e13ebc
--- /dev/null
+++ b/debian/patches/gcc-4.8.diff
@@ -0,0 +1,34 @@
+Description: Fix compilation of C++ MEX files with GCC 4.8
+ The header mex.h was including mexproto.h within an extern "C" block. In turn,
+ mexproto.h includes cstdlib.
+ .
+ Apparently, including cstdlib within an extern "C" block was working with GCC
+ 4.7, but this is no longer the case with GCC 4.8.
+ .
+ The fix consists in including mexproto.h outside of the extern "C" block.
+Author: Sébastien Villemot <sebastien at debian.org>
+Bug: https://savannah.gnu.org/bugs/index.php?38746
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705485
+Last-Update: 2013-05-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/mex.h
++++ b/src/mex.h
+@@ -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
diff --git a/debian/patches/series b/debian/patches/series
index 7ade4ef..009c33d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ drop_version_from_mkoctfile_function_call
 mkoctfile-mpi.diff
 contourc-stack-overflow.diff
 texinfo5.diff
+gcc-4.8.diff

-- 
Debian packaging for octave