[Pkg-octave-commit] [octave-secs2d] 02/03: d/p/compilation-with-octave-4.0.patch: New patch

[Rafael Laboissière]

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

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

commit 681100aa4b30ab921ad2f195170a49dfa729e6b1
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sat May 2 14:15:31 2015 -0300

    d/p/compilation-with-octave-4.0.patch: New patch
---
 debian/patches/compilation-with-octave-4.0.patch | 92 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 93 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..2c5428c
--- /dev/null
+++ b/debian/patches/compilation-with-octave-4.0.patch
@@ -0,0 +1,92 @@
+Description: Allow compilation with Octave 4.0
+Author: Rafael Laboissiere <rafael at labosisiere.net>
+Origin: https://savannah.gnu.org/bugs/?44803
+Last-Update: 2015-05-02
+
+--- octave-secs2d-0.0.8.orig/src/Makefile
++++ octave-secs2d-0.0.8/src/Makefile
+@@ -3,19 +3,21 @@ ccfiles  := $(wildcard *.cc)
+ octfiles := $(patsubst %.cc, %.oct, $(ccfiles) )
+ objfiles := $(patsubst %.cc, %.o,   $(ccfiles) )
+ 
++MKOCTFILE ?= mkoctfile
++
+ all: $(octfiles)
+ 
+ $(objectfile): Makefile
+ 
+ %.o: %.cc
+-	mkoctfile -c $(patsubst %.o, %.cc, $@ ) -o $@
++	$(MKOCTFILE) -c $(patsubst %.o, %.cc, $@ ) -o $@
+ 
+ Uscharfettergummel.oct: Uscharfettergummel.o Ubern.o
+-	mkoctfile -s $< Ubern.o -o $@
++	$(MKOCTFILE) -s $< Ubern.o -o $@
+ 	$(RM) Uscharfettergummel.o
+ 
+ %.oct:  %.o  
+-	mkoctfile -s $< -o $@
++	$(MKOCTFILE) -s $< -o $@
+ 	#strip -x $@
+ 
+ clean:
+--- octave-secs2d-0.0.8.orig/src/Ucompconst.cc
++++ octave-secs2d-0.0.8/src/Ucompconst.cc
+@@ -34,7 +34,7 @@
+ ////////////////////////////////////////////
+ 
+ 
+-int Ucompconst(const Octave_map &mesh, 
++int Ucompconst(const octave_map &mesh, 
+                        const ColumnVector &acoeff,
+                        const ColumnVector &bcoeff,
+                        ColumnVector &SG )
+@@ -99,7 +99,7 @@ octave_value_list retval;
+ 
+ ColumnVector acoeff=ColumnVector(args(1).vector_value());
+ ColumnVector bcoeff=ColumnVector(args(2).vector_value());
+-Octave_map mesh = args(0).map_value();
++octave_map mesh = args(0).map_value();
+ 
+ ColumnVector SG;
+                 
+--- octave-secs2d-0.0.8.orig/src/Ucomplap.cc
++++ octave-secs2d-0.0.8/src/Ucomplap.cc
+@@ -34,7 +34,7 @@
+ ////////////////////////////////////////////
+ 
+ 
+-int Ucomplap(const Octave_map &mesh, 
++int Ucomplap(const octave_map &mesh, 
+                        const ColumnVector &acoeff, 
+                        SparseMatrix &SG )
+ {
+@@ -125,7 +125,7 @@ octave_value_list retval;
+ ColumnVector acoeff=ColumnVector(args(1).vector_value());
+ 
+ 
+-Octave_map mesh = args(0).map_value();
++octave_map mesh = args(0).map_value();
+ 
+ SparseMatrix SG;
+                 
+--- octave-secs2d-0.0.8.orig/src/Uscharfettergummel.cc
++++ octave-secs2d-0.0.8/src/Uscharfettergummel.cc
+@@ -36,7 +36,7 @@
+ 
+ 
+ 
+-int Uscharfettergummel(const Octave_map &mesh, 
++int Uscharfettergummel(const octave_map &mesh, 
+                        const ColumnVector &v, 
+                        const ColumnVector &acoeff, 
+                        SparseMatrix &SG )
+@@ -173,7 +173,7 @@ and u is the unknown\n \
+     acoeff=ColumnVector(args(2).vector_value());
+ 
+ 
+-  Octave_map mesh = args(0).map_value();
++  octave_map mesh = args(0).map_value();
+ 
+   SparseMatrix SG;
+ 
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-secs2d.git