Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2013-07-30 16:36:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave" Changes: -------- --- /work/SRC/openSUSE:Factory/octave/octave.changes 2013-05-02 11:28:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2013-07-30 16:36:34.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jul 28 01:01:01 UTC 2013 - [email protected] + +- Added octave-gcc48-mex_remove_externc, fixes an issue when + building packages that include mex.h in gcc 4.8 + +------------------------------------------------------------------- New: ---- octave-gcc48-mex_remove_externc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.GOrviQ/_old 2013-07-30 16:36:35.000000000 +0200 +++ /var/tmp/diff_new_pack.GOrviQ/_new 2013-07-30 16:36:35.000000000 +0200 @@ -29,6 +29,8 @@ Url: http://www.octave.org/ Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2 Source2: octave.pc.in +#PATCH-FIX-UPSTREAM octave-gcc48-mex_remove_externc.patch - fixes problem when including mex.h when building packages, upstream changeset 16705:122d3f62e179 +Patch1: octave-gcc48-mex_remove_externc.patch BuildRequires: arpack-ng-devel BuildRequires: bison BuildRequires: blas-devel @@ -115,6 +117,9 @@ %prep %setup -q +%if 0%{suse_version} >= 1210 +%patch1 -p3 -d src +%endif %build export CPPFLAGS="-DH5_USE_16_API" ++++++ octave-gcc48-mex_remove_externc.patch ++++++ # HG changeset patch # User Clemens Buchacher <[email protected]> # Date 1369937542 14400 # Node ID 122d3f62e179ba044d47e58510905719220d8706 # Parent e38a0fa08368d4dd6f3a0dfd20cbe28cf8555f73 do not include C++ header in extern "C" context (bug #38746) * mex.h: Include mexproto.h outside of extern "C" block. diff --git a/libinterp/interp-core/mex.h b/libinterp/interp-core/mex.h --- a/libinterp/interp-core/mex.h +++ b/libinterp/interp-core/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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
