commit a9282badd9f315a8f410fb829281fbf4de48cbe6
Author: Jan Rękorajski <[email protected]>
Date: Mon Jun 24 13:09:47 2013 +0200
- fix mex.h not to include mexproto.h surrounded by "extern C",
mexproto.h does "extern C" on its own
- rel 3
octave-header.patch | 20 ++++++++++++++++++++
octave.spec | 4 +++-
2 files changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/octave.spec b/octave.spec
index 291b5bc..f8cd1dd 100644
--- a/octave.spec
+++ b/octave.spec
@@ -16,7 +16,7 @@ Summary(sv.UTF-8): GNU Octave - ett högninvåspråk för
numeriska beräkningar
Summary(zh_CN.UTF-8): GNU Octave - 用于数字计算的高级语言。
Name: octave
Version: 3.6.4
-Release: 2
+Release: 3
Epoch: 2
License: GPL v3+
Group: Applications/Math
@@ -25,6 +25,7 @@ Source0:
http://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Patch0: %{name}-info.patch
Patch1: %{name}-build.patch
+Patch2: %{name}-header.patch
URL: http://www.octave.org/
BuildRequires: AMD-devel
BuildRequires: CAMD-devel
@@ -270,6 +271,7 @@ Pliki nagłówkowe i dodatkowa dokumentacja Octave.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
diff --git a/octave-header.patch b/octave-header.patch
new file mode 100644
index 0000000..c8f0802
--- /dev/null
+++ b/octave-header.patch
@@ -0,0 +1,20 @@
+--- octave-3.6.4/src/mex.h~ 2013-02-21 21:19:24.000000000 +0100
++++ octave-3.6.4/src/mex.h 2013-06-24 13:08:46.755012288 +0200
+@@ -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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/octave.git/commitdiff/a9282badd9f315a8f410fb829281fbf4de48cbe6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
