[med-svn] [dssp] 01/03: d/p/boost1.65: Add patch for boost 1.65, Closes: #880465

[Gert Wollny]

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

gewo pushed a commit to branch master
in repository dssp.

commit 2e076fbadb26e267d841d25c13fe9640bd148b88
Author: Gert Wollny <gewo at debian.org>
Date:   Wed Dec 6 19:45:12 2017 +0100

    d/p/boost1.65: Add patch for boost 1.65, Closes: #880465
---
 debian/patches/boost1.65.patch | 87 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 2 files changed, 88 insertions(+)

diff --git a/debian/patches/boost1.65.patch b/debian/patches/boost1.65.patch
new file mode 100644
index 0000000..7cd9f2d
--- /dev/null
+++ b/debian/patches/boost1.65.patch
@@ -0,0 +1,87 @@
+Description: Use C++11 tuple, boost1.65 has removed the TR1 library.
+Author: Dimitri John Ledkov <xnox at ubuntu.com>
+Debian-Bug: https://bugs.debian.org/880465
+
+--- a/src/dssp.cpp
++++ b/src/dssp.cpp
+@@ -73,7 +73,7 @@
+ 
+   double alpha;
+   char chirality;
+-  std::tr1::tie(alpha,chirality) = residue.Alpha();
++  std::tie(alpha,chirality) = residue.Alpha();
+ 
+   uint32 bp[2] = {};
+   char bridgelabel[2] = { ' ', ' ' };
+--- a/src/primitives-3d.cpp
++++ b/src/primitives-3d.cpp
+@@ -152,7 +152,7 @@
+ 
+ // --------------------------------------------------------------------
+ 
+-std::tr1::tuple<double,MPoint> QuaternionToAngleAxis(MQuaternion q)
++std::tuple<double,MPoint> QuaternionToAngleAxis(MQuaternion q)
+ {
+   if (q.R_component_1() > 1)
+     q = Normalize(q);
+@@ -168,7 +168,7 @@
+ 
+   MPoint axis(q.R_component_2() / s, q.R_component_3() / s, q.R_component_4() / s);
+ 
+-  return std::tr1::make_tuple(angle, axis);
++  return std::make_tuple(angle, axis);
+ }
+ 
+ MPoint CenterPoints(std::vector<MPoint>& points)
+--- a/src/primitives-3d.h
++++ b/src/primitives-3d.h
+@@ -12,8 +12,8 @@
+ #pragma once
+ 
+ #include <boost/math/quaternion.hpp>
+-#include <boost/tr1/tuple.hpp>
+ 
++#include <tuple>
+ #include <vector>
+ 
+ typedef boost::math::quaternion<double> MQuaternion;
+@@ -71,7 +71,7 @@
+ 
+ MQuaternion Normalize(MQuaternion q);
+ 
+-std::tr1::tuple<double,MPoint> QuaternionToAngleAxis(MQuaternion q);
++std::tuple<double,MPoint> QuaternionToAngleAxis(MQuaternion q);
+ MPoint Centroid(std::vector<MPoint>& points);
+ MPoint CenterPoints(std::vector<MPoint>& points);
+ MQuaternion AlignPoints(const std::vector<MPoint>& a,
+--- a/src/structure.cpp
++++ b/src/structure.cpp
+@@ -554,7 +554,7 @@
+   return result;
+ }
+ 
+-std::tr1::tuple<double,char> MResidue::Alpha() const
++std::tuple<double,char> MResidue::Alpha() const
+ {
+   double alhpa = 360;
+   char chirality = ' ';
+@@ -571,7 +571,7 @@
+     else
+       chirality = '+';
+   }
+-  return std::tr1::make_tuple(alhpa, chirality);
++  return std::make_tuple(alhpa, chirality);
+ }
+ 
+ double MResidue::Kappa() const
+--- a/src/structure.h
++++ b/src/structure.h
+@@ -171,7 +171,7 @@
+ 
+   double        Phi() const;
+   double        Psi() const;
+-  std::tr1::tuple<double,char>
++  std::tuple<double,char>
+             Alpha() const;
+   double        Kappa() const;
+   double        TCO() const;
diff --git a/debian/patches/series b/debian/patches/series
index d1ab4a4..97a5511 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 makefile
 hardening.patch
+boost1.65.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dssp.git