[imview] 01/03: Fix compilation with gcc-6. (Closes: #831075)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository imview.

commit 8dd3d469a2b2eda90b852531e4930b5faea2bcdf
Author: Anton Gladky <gladk at debian.org>
Date:   Tue Aug 2 18:20:11 2016 +0200

    Fix compilation with gcc-6. (Closes: #831075)
---
 debian/patches/10_fix_gcc6.patch | 59 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 2 files changed, 60 insertions(+)

diff --git a/debian/patches/10_fix_gcc6.patch b/debian/patches/10_fix_gcc6.patch
new file mode 100644
index 0000000..bf6108b
--- /dev/null
+++ b/debian/patches/10_fix_gcc6.patch
@@ -0,0 +1,59 @@
+Description: Fix compilation with gcc-6.
+ Replace "move" method by "Move" to escape ambiguity.
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/831075
+Last-Update: 2016-08-02
+
+--- imview-1.1.9c.orig/pointfile.cxx
++++ imview-1.1.9c/pointfile.cxx
+@@ -169,7 +169,7 @@ mypoint::~mypoint()
+     dbgprintf("Point at (%d,%d) destructed\n", x(), y());
+ }
+ 
+-mypoint& mypoint::operator=(mypoint &p)
++mypoint& mypoint::operator=(mypoint const &p)
+ {
+     if (this == &p)
+         return *this ; // but do nothing more
+--- imview-1.1.9c.orig/pointfile.hxx
++++ imview-1.1.9c/pointfile.hxx
+@@ -131,7 +131,7 @@ public:
+ 	    int nbraw, bool annotated=false, string &txt = ptDummyStr , Fl_Color col = FL_BLACK, int font = 0,
+ 	    int size = 0, int length = 0, str_quadrant qdr = STR_NE, bool h = false,
+ 	    int pts = 3, linestyle lsty = STYLE_FILLED_BW, Fl_Color lcol = FL_WHITE) ;
+-    mypoint& operator=(mypoint &p);
++    mypoint& operator=(mypoint const  &p);
+     ~mypoint();
+     int x() const { return x_;}
+     int y() const { return y_;}
+--- imview-1.1.9c.orig/server/interpreter.cxx
++++ imview-1.1.9c/server/interpreter.cxx
+@@ -220,7 +220,7 @@ int cmap::perform(vector<string> &l,	 /*
+ }
+ 
+ 
+-int move::perform(vector<string> &l, string &result) {
++int Move::perform(vector<string> &l, string &result) {
+     int newx, newy;
+ 
+     if (l.size() >= 2) {
+@@ -1451,7 +1451,7 @@ interpreter::interpreter() {
+     tokens["svpf"]  = new save_pointfile;
+     tokens["clpf"]  = new clear_pointfile;
+     tokens["load"]  = new load;
+-    tokens["move"]  = new move;
++    tokens["move"]  = new Move;
+     tokens["size"]  = new size;
+     tokens["cmap"]  = new cmap;
+     tokens["zoom"]  = new zoom;
+--- imview-1.1.9c.orig/server/interpreter.hxx
++++ imview-1.1.9c/server/interpreter.hxx
+@@ -138,7 +138,7 @@ public:
+     int perform(vector<string> &l, string &result);
+ };
+ 
+-class move:public action {
++class Move:public action {
+ public:
+     int perform(vector<string> &l, string &result);
+ };
diff --git a/debian/patches/series b/debian/patches/series
index 1da7293..f8cabd8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 07_fix_kfreebsd_FTBFS.patch
 08_fix_libpng16.patch
 09_fixdatetime.patch
+10_fix_gcc6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/imview.git