[metview] 04/05: Patch for G++ 6 changes (c++-11 abi). Closes: #812161.

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository metview.

commit 6a8d7c3d6044dbbcf866d9b7e459f95ec09c9493
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Feb 10 22:59:24 2016 +0000

    Patch for G++ 6 changes (c++-11 abi). Closes: #812161.
---
 debian/changelog           |  1 +
 debian/patches/g++-6.patch | 56 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 58 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cfa4a56..63ce409 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ metview (4.6.1-2) UNRELEASED; urgency=medium
   * Split dh_fixperms to arch and -indep parts, so dpkg-buildpackage -A
     works. Closes: #814437.
   * Fix bashisms. Closes: #772310.
+  * Patch for G++ 6 changes (c++-11 abi). Closes: #812161.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Tue, 09 Feb 2016 18:03:49 +0000
 
diff --git a/debian/patches/g++-6.patch b/debian/patches/g++-6.patch
new file mode 100644
index 0000000..e95323b
--- /dev/null
+++ b/debian/patches/g++-6.patch
@@ -0,0 +1,56 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Fixes for G++-6
+Last-Updated: 2016-02-14
+Forwarded: no
+
+Index: metview-4.6.1/src/libMarsClient/rpcmars.x
+===================================================================
+--- metview-4.6.1.orig/src/libMarsClient/rpcmars.x
++++ metview-4.6.1/src/libMarsClient/rpcmars.x
+@@ -2,7 +2,7 @@
+ %#include <rpc/xdr.h>
+ #ifdef RPC_HDR
+ %typedef char *cache_t;
+-%typedef void *void_t;
++%typedef void *void_t_;
+ #endif
+ 
+ struct value {
+@@ -31,7 +31,7 @@ struct request {
+ 	cache_t         kind;
+ 
+ #ifdef RPC_HDR
+-	void_t           data; /* user data */
++	void_t_           data; /* user data */
+ 	long             order;
+ #endif
+ 
+Index: metview-4.6.1/src/libUtil/MvFlextra.cc
+===================================================================
+--- metview-4.6.1.orig/src/libUtil/MvFlextra.cc
++++ metview-4.6.1/src/libUtil/MvFlextra.cc
+@@ -11,6 +11,7 @@
+ 
+ #include "MvDate.h"
+ 
++#include <utility>
+ #include <iostream>
+ #include <fstream>
+ 
+@@ -676,13 +677,13 @@ void MvFlextra::decode()
+ 	//Guess if a trajectory block contains uncertainty trajecories or not!
+ 	//It is working only if the FLEXTRA file containing several blocks was
+ 	//generated by metview.
+-	vector<pair<string,bool> > ref;	
++	vector<std::pair<string,bool> > ref;	
+ 	for(unsigned int i=0; i < blocks_.size(); i++)
+ 	{
+-		string comment=blocks_[i]->comment();	
++	        string comment=blocks_[i]->comment();
+ 		bool cstep=blocks_[i]->constantStep();
+ 		
+-		pair<string,bool> p=make_pair<string,bool>(comment,cstep);
++		pair<string,bool> p=make_pair(comment,cstep);
+ 		
+ 		bool newRef=true;
+ 		for(unsigned int j=0; j < ref.size(); j++)
diff --git a/debian/patches/series b/debian/patches/series
index 5cef160..97f587a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ reproducible-build.patch
 fpic.patch
 hurd.patch
 fix-bashisms.patch
+g++-6.patch

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