[Pkg-octave-commit] [octave-nurbs] 01/01: d/p/compilation-with-octave-4.0.patch: New patch

Rafael Laboissière rlaboiss-guest at moszumanska.debian.org
Sat May 2 17:10:34 UTC 2015


This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch master
in repository octave-nurbs.

commit 47d525c0c3713a2de978f9c1d17b649fb609efc5
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sat May 2 14:04:15 2015 -0300

    d/p/compilation-with-octave-4.0.patch: New patch
---
 debian/patches/compilation-with-octave-4.0.patch | 25 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/compilation-with-octave-4.0.patch b/debian/patches/compilation-with-octave-4.0.patch
new file mode 100644
index 0000000..76edb6c
--- /dev/null
+++ b/debian/patches/compilation-with-octave-4.0.patch
@@ -0,0 +1,25 @@
+Description: Allow compilation with Octave 4.0
+Origin: upstream, http://sourceforge.net/p/octave/code/12785/
+Bug: https://savannah.gnu.org/bugs/?44651
+Last-Update: 2015-05-02
+
+--- octave-nurbs-1.3.8.orig/src/nrbsurfderiveval.cc
++++ octave-nurbs-1.3.8/src/nrbsurfderiveval.cc
+@@ -120,7 +120,7 @@ DEFUN_DLD(nrbsurfderiveval, args, nargou
+       
+       Array<idx_vector> idx(dim_vector (3, 1), idx_vector(':'));	 
+       idx (0) = idx_vector (3);
+-      Matrix weights (NDArray (coefs.index (idx).squeeze ()).matrix_value ());
++      Matrix weights (NDArray (coefs.index (idx).squeeze ()));
+ 
+       for (octave_idx_type iu(0); iu<uv.cols (); iu++)
+ 	{
+@@ -132,7 +132,7 @@ DEFUN_DLD(nrbsurfderiveval, args, nargou
+ 	    {
+ 
+ 	      Matrix Aders; idx(0) = idx_vector (idim);
+-	      Matrix P (NDArray (coefs.index (idx).squeeze ()).matrix_value ());
++	      Matrix P (NDArray (coefs.index (idx).squeeze ()));
+ 	      surfderiveval (n, p, knotsu, m, q, knotsv, P, uv(0,iu), uv(1,iu), d, Aders);;      
+ 	      
+ 	      for (octave_idx_type k(0); k<=d; k++)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b4fa55b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+compilation-with-octave-4.0.patch

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-nurbs.git



More information about the Pkg-octave-commit mailing list