[sfcgal] 01/01: make package build again in unstable using boost 1.58 and gcc5

[Sven Geggus]

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

giggls-guest pushed a commit to branch master
in repository sfcgal.

commit eff4eea16157162833db98c661f51931b5a56857
Author: Sven Geggus <sven-deb at geggus.net>
Date:   Wed Aug 26 18:58:37 2015 +0200

    make package build again in unstable using boost 1.58 and gcc5
---
 debian/changelog                                   |  6 +++++
 ...T_VARIANT_USE_RELAXED_GET_BY_DEFAULT-in-c.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c1d4ee2..22e0814 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sfcgal (1.1.0-3) unstable; urgency=medium
+
+  * Make package build in unstable with boost 1.58 and gcc5
+
+ -- Sven Geggus <sven-debian at geggus.net>  Wed, 26 Aug 2015 18:56:50 +0200
+
 sfcgal (1.1.0-2) unstable; urgency=medium
 
   * Update symbols for other architectures to prepare for unstable
diff --git a/debian/patches/0002-define-BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT-in-c.patch b/debian/patches/0002-define-BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT-in-c.patch
new file mode 100644
index 0000000..535795a
--- /dev/null
+++ b/debian/patches/0002-define-BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT-in-c.patch
@@ -0,0 +1,29 @@
+From ba2e5c17db0e2276369bac57133f3f7775b68286 Mon Sep 17 00:00:00 2001
+From: Ko Nagase <nagase at georepublic.co.jp>
+Date: Wed, 19 Aug 2015 00:50:34 +0900
+Subject: [PATCH] define BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT in case of
+ boost 1.58.0 build (#103)
+
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ddadd0c..42bf129 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,7 +72,10 @@ if ( SFCGAL_BUILD_TESTS OR SFCGAL_BUILD_EXAMPLES OR SFCGAL_BUILD_OSG OR SFCGAL_B
+ 	set( SFCGAL_Boost_COMPONENTS program_options chrono filesystem timer ${SFCGAL_Boost_COMPONENTS} )
+ endif()
+ find_package( Boost COMPONENTS ${SFCGAL_Boost_COMPONENTS} REQUIRED )
+-
++if((${Boost_MAJOR_VERSION} EQUAL 1) AND (${Boost_MINOR_VERSION} EQUAL 58))
++	message( STATUS "Defining BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT" )
++	add_definitions( "-DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT" )
++endif()
+ 
+ #-- GMP (facultative)  -------------------------------------
+ find_package( GMP )
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 47db852..2fde2a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix-spelling-errors-accourding-to-lintian-tool-of-th.patch
+0002-define-BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT-in-c.patch

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