[Debian-astro-commits] [gyoto] 01/01: Prepare for Boost >= 1.64. New patch boost1.64.

[Thibaut Jean-Claude Paumard]

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

thibaut pushed a commit to branch master
in repository gyoto.

commit 2b5d85222f84af24c8bdc7b6c92fb364092f8c22
Author: Thibaut Paumard <thibaut at debian.org>
Date:   Mon Nov 20 19:19:02 2017 +0100

    Prepare for Boost >= 1.64. New patch boost1.64.
---
 debian/changelog         |  6 ++++++
 debian/patches/boost1.64 | 28 ++++++++++++++++++++++++++++
 debian/patches/series    |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2f0461a..5d6de6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gyoto (1.2.0-4) unstable; urgency=low
+
+  * Prepare for Boost >= 1.64. New patch boost1.64.
+
+ -- Thibaut Paumard <thibaut at debian.org>  Mon, 20 Nov 2017 15:05:17 +0100
+
 gyoto (1.2.0-3) unstable; urgency=low
 
   * Bug fix: "requires rebuild against GCC 7 and symbols/shlibs bump",
diff --git a/debian/patches/boost1.64 b/debian/patches/boost1.64
new file mode 100644
index 0000000..4d03bc1
--- /dev/null
+++ b/debian/patches/boost1.64
@@ -0,0 +1,28 @@
+Description: update for Boost 1.64 and above
+ serialization/array.hpp has been split into several parts in Boost
+ 1.64. We now need to load several of those pieces.
+Author: Thibaut Paumard <thibaut at debian.org>
+Origin: vendor
+Forwarded: yes, to self
+Last-Update: 2017-11-20
+
+--- gyoto-1.2.0.orig/include/GyotoScreen.h
++++ gyoto-1.2.0/include/GyotoScreen.h
+@@ -30,8 +30,15 @@
+ #include <fstream>
+ #include <string>
+ #if defined HAVE_BOOST_ARRAY_HPP
+-#include <boost/array.hpp>
+-#define GYOTO_ARRAY boost::array
++# include <boost/array.hpp>
++# define GYOTO_ARRAY boost::array
++# if defined HAVE_MPI
++#  include <boost/version.hpp>
++#  if BOOST_VERSION >= 106400 
++#   include <boost/serialization/boost_array.hpp>
++#   include <boost/serialization/array_wrapper.hpp>
++#  endif
++# endif
+ #else
+ template <typename T, size_t sz> class GYOTO_ARRAY {
+  private:
diff --git a/debian/patches/series b/debian/patches/series
index b8c491c..4c79149 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 interpreter-path
+boost1.64

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