[libdap] 01/22: Fix for G++ 6 FTBFS.

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository libdap.

commit fc8ea92c0b9b00408c5ef041c6a374f7c47a8819
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Feb 15 20:25:42 2016 +0000

    Fix for G++ 6 FTBFS.
---
 debian/changelog           |  6 ++++++
 debian/patches/g++-6.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6731b97..a519f9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdap (3.15.1-8) unstable; urgency=medium
+
+  * Fix for G++ 6 FTBFS.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 15 Feb 2016 20:25:23 +0000
+
 libdap (3.15.1-7) unstable; urgency=medium
 
   * Disable more networ, tests. Closes: #809580.
diff --git a/debian/patches/g++-6.patch b/debian/patches/g++-6.patch
new file mode 100644
index 0000000..40f755f
--- /dev/null
+++ b/debian/patches/g++-6.patch
@@ -0,0 +1,31 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Patch needed for G++-6 (c++11 ABI) changes
+Forwarded: no
+Last-Updated: 2016-02-16
+
+Index: libdap-3.15.1/dds.yy
+===================================================================
+--- libdap-3.15.1.orig/dds.yy
++++ libdap-3.15.1/dds.yy
+@@ -262,7 +262,7 @@ declaration:  base_type var ';'
+ 		| grid '{' SCAN_WORD ':'
+ 		{ 
+ 		    if (is_keyword(string($3), "array")) {
+-			    part = array;
++		      part = Part::array;
+ 			}
+ 		    else {
+ 			    ostringstream msg;
+Index: libdap-3.15.1/unit-tests/generalUtilTest.cc
+===================================================================
+--- libdap-3.15.1.orig/unit-tests/generalUtilTest.cc
++++ libdap-3.15.1/unit-tests/generalUtilTest.cc
+@@ -265,7 +265,7 @@ CPPUNIT_TEST_SUITE(generalUtilTest);
+         DBG(cerr << "XXX" << unescattr("\\\"attr") << "XXX" << endl);
+         CPPUNIT_ASSERT(unescattr("\\\"attr") == "\"attr");
+ 
+-        char A_200_177[4] = { 128, 127, 'A', '\0' };
++        char A_200_177[4] = { (char) 128, (char) 127, 'A', '\0' };
+         DBG(cerr << "XXX" << unescattr("\\200\\177A") << "XXX" << endl);
+         CPPUNIT_ASSERT(unescattr("\\200\\177A") == string(A_200_177));
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c38441f..26800ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ pkgconfig.patch
 disable-cache-test.patch
 disable-dmr-tests.patch
 disable-net-tests.patch
+g++-6.patch

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