From 24ba6f186a509d1970a09757d1b4435f9a862b17 Mon Sep 17 00:00:00 2001
From: Denis Arnaud <denis.arnaud_fedora@m4x.org>
Date: Sat, 25 Feb 2017 22:44:11 +0100
Subject: [PATCH] Attempt to fix the FTBFS issue related to new Boost 1.63
 serialization

---
 ...protected-pointer-with-boost-archive.patch | 78 +++++++++++++++----
 stdair.spec                                   |  4 +-
 2 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/stdair-fix-protected-pointer-with-boost-archive.patch b/stdair-fix-protected-pointer-with-boost-archive.patch
index f3455c7..0e94e6a 100644
--- a/stdair-fix-protected-pointer-with-boost-archive.patch
+++ b/stdair-fix-protected-pointer-with-boost-archive.patch
@@ -1,14 +1,66 @@
-diff --git a/config/project_config_embeddable.cmake b/config/project_config_embeddable.cmake
-index b9f38e6..07901ff 100644
---- a/config/project_config_embeddable.cmake
-+++ b/config/project_config_embeddable.cmake
-@@ -1387,6 +1387,9 @@ macro (init_build)
-   if (NOT "${CMAKE_CXX_FLAGS}" MATCHES "-DBOOST_VERSION=")
-     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_VERSION=${Boost_VERSION}")
-   endif (NOT "${CMAKE_CXX_FLAGS}" MATCHES "-DBOOST_VERSION=")
-+  ##
-+  # Work around for new Boost 1.63 serialization code
-+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDONT_USE_HAS_NEW_OPERATOR=1")
+diff --git a/stdair/bom/FlightDate.hpp b/stdair/bom/FlightDate.hpp
+index cf031fd..f63d0b4 100644
+--- a/stdair/bom/FlightDate.hpp
++++ b/stdair/bom/FlightDate.hpp
+@@ -194,6 +194,10 @@ namespace stdair {
+     /**
+      * Destructor.
+      */
++    // (Bad) work-around for an issue with Boost 1.63 Serialization
++#if BOOST_VERSION == 106300
++  public:
++#endif
+     virtual ~FlightDate();
  
-   #
-   include_directories (BEFORE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+   private:
+diff --git a/stdair/bom/Inventory.hpp b/stdair/bom/Inventory.hpp
+index 76253bd..f97a57b 100644
+--- a/stdair/bom/Inventory.hpp
++++ b/stdair/bom/Inventory.hpp
+@@ -180,10 +180,15 @@ namespace stdair {
+      * Constructor.
+      */
+     Inventory (const Key_T&);
++
+     /**
+      * Destructor.
+      */
+-    ~Inventory();
++    // (Bad) work-around for an issue with Boost 1.63 Serialization
++#if BOOST_VERSION == 106300
++  public:
++#endif
++    virtual ~Inventory();
+ 
+   private:
+     /**
+diff --git a/stdair/bom/SegmentCabin.hpp b/stdair/bom/SegmentCabin.hpp
+index acf007e..62fa195 100644
+--- a/stdair/bom/SegmentCabin.hpp
++++ b/stdair/bom/SegmentCabin.hpp
+@@ -278,6 +278,10 @@ namespace stdair {
+     /**
+      * Destructor.
+      */
++    // (Bad) work-around for an issue with Boost 1.63 Serialization
++#if BOOST_VERSION == 106300
++  public:
++#endif
+     virtual ~SegmentCabin();
+ 
+   private:
+diff --git a/stdair/bom/SegmentDate.hpp b/stdair/bom/SegmentDate.hpp
+index 4220348..b7d1ca3 100644
+--- a/stdair/bom/SegmentDate.hpp
++++ b/stdair/bom/SegmentDate.hpp
+@@ -285,6 +285,10 @@ namespace stdair {
+     /**
+      * Destructor.
+      */
++    // (Bad) work-around for an issue with Boost 1.63 Serialization
++#if BOOST_VERSION == 106300
++  public:
++#endif
+     virtual ~SegmentDate();
+ 
+   private:
diff --git a/stdair.spec b/stdair.spec
index 3ee342c..c8d465f 100644
--- a/stdair.spec
+++ b/stdair.spec
@@ -3,7 +3,7 @@
 #
 Name:           stdair
 Version:        1.00.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 
 Summary:        C++ Standard Airline IT Object Library
 
@@ -149,7 +149,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Feb 25 2017 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.2-11
+* Sat Feb 25 2017 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.2-12
 - Attempt to fix the FTBFS issue related to new Boost 1.63 serialization
 
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.2-9