[freeorion] 01/02: Apply boost1.62.patch to fix FTBFS with Boost 1.62.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository freeorion.

commit 53fd71d83707bb3dd1367324cb8ee998eda690fb
Author: Markus Koschany <apo at debian.org>
Date:   Fri Nov 4 17:25:06 2016 +0100

    Apply boost1.62.patch to fix FTBFS with Boost 1.62.
    
    Thanks: Graham Inggs for the report and patch.
    Closes: #843132
---
 debian/patches/boost1.62.patch | 113 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |   1 +
 2 files changed, 114 insertions(+)

diff --git a/debian/patches/boost1.62.patch b/debian/patches/boost1.62.patch
new file mode 100644
index 0000000..4189128
--- /dev/null
+++ b/debian/patches/boost1.62.patch
@@ -0,0 +1,113 @@
+Description: Fix FTBFS with Boost 1.62
+ The previous Boost version checks were too specific.
+Origin: upstream, https://github.com/freeorion/freeorion/commit/f6e6d8abce56688de425775ff7db9ed1396d46d8
+Origin: upstream, https://github.com/freeorion/freeorion/commit/6b971f65dbef4614cd0c9020bcc6670d3f11b961 
+Author: Graham Inggs <ginggs at debian.org>
+Last-Update: 2016-11-04
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -141,7 +141,7 @@
+ find_package(ZLIB REQUIRED)
+ find_package(Freetype REQUIRED)
+ 
+-if(${Boost_VERSION} EQUAL "106100")
++if(${Boost_VERSION} EQUAL "106100" OR ${Boost_VERSION} GREATER "106100")
+     # with boost 1.61 some boost::optional internals were changed. However
+     # boost::spirit relies on some API the old implementation provided.  This
+     # define enables the usage of the old boost::optional implementation.
+--- a/universe/Building.h
++++ b/universe/Building.h
+@@ -69,11 +69,11 @@
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+ 
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ public:
+ #endif
+     ~Building() {}
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ protected:
+ #endif
+ 
+--- a/universe/Field.h
++++ b/universe/Field.h
+@@ -48,11 +48,11 @@
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+ 
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ public:
+ #endif
+     ~Field() {}
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ protected:
+ #endif
+ 
+--- a/universe/Fleet.h
++++ b/universe/Fleet.h
+@@ -150,11 +150,11 @@
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+ 
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ public:
+ #endif
+     ~Fleet() {}
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ protected:
+ #endif
+ 
+--- a/universe/Planet.h
++++ b/universe/Planet.h
+@@ -185,11 +185,11 @@
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+ 
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ public:
+ #endif
+     ~Planet() {}
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ protected:
+ #endif
+ 
+--- a/universe/Ship.h
++++ b/universe/Ship.h
+@@ -104,11 +104,11 @@
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+ 
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ public:
+ #endif
+     ~Ship() {}
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ protected:
+ #endif
+ 
+--- a/universe/System.h
++++ b/universe/System.h
+@@ -134,11 +134,11 @@
+     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
+     template <class T> friend void boost::checked_delete(T* x);
+ 
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ public:
+ #endif
+     ~System() {}
+-#if BOOST_VERSION == 106100
++#if BOOST_VERSION >= 106100
+ protected:
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 31194f7..df9be18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 multiarch-fix.patch
+boost1.62.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freeorion.git