[Pkg-octave-commit] [SCM] octave-fixed branch, master, updated. 7be95d3a6d46bfa36ba97d8cf3c2d810e62a02bc

Thomas Weber thomas.weber.mail at gmail.com
Sun Jul 19 11:56:50 UTC 2009


The following commit has been merged in the master branch:
commit 47f0cc88f465d1cdd570b51e243ea1c74d257933
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Sat Jul 18 22:43:38 2009 +0200

    New patch for building against Octave3.2, taken from upstream SVN

diff --git a/debian/patches/build-with-3.2 b/debian/patches/build-with-3.2
new file mode 100644
index 0000000..25dbfe2
--- /dev/null
+++ b/debian/patches/build-with-3.2
@@ -0,0 +1,14 @@
+--- a/src/Array-f.cc
++++ b/src/Array-f.cc
+@@ -50,9 +50,9 @@
+ 				    (arg (a) > arg (b))));
+ }
+ 
+-template class OCTAVE_FIXED_API Array<FixedPoint>;
++INSTANTIATE_ARRAY(FixedPoint, OCTAVE_FIXED_API);
+ template class MArray<FixedPoint>;
+-template class OCTAVE_FIXED_API Array<FixedPointComplex>;
++INSTANTIATE_ARRAY(FixedPointComplex, OCTAVE_FIXED_API);
+ template class MArray<FixedPointComplex>;
+ 
+ INSTANTIATE_MARRAY_FRIENDS (FixedPoint, )
diff --git a/debian/patches/series b/debian/patches/series
index 9e152b6..7cf52be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+build-with-3.2
 install-info-files

-- 
octave-fixed



More information about the Pkg-octave-commit mailing list