Hello community, here is the log from the commit of package SimGear for openSUSE:Factory checked in at 2019-03-22 15:10:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SimGear (Old) and /work/SRC/openSUSE:Factory/.SimGear.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SimGear" Fri Mar 22 15:10:55 2019 rev:11 rq:687431 version:2018.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2019-03-06 15:51:04.692439578 +0100 +++ /work/SRC/openSUSE:Factory/.SimGear.new.25356/SimGear.changes 2019-03-22 15:11:05.365301439 +0100 @@ -1,0 +2,7 @@ +Thu Mar 21 18:22:45 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Fix building with booost 1.69: + * Add 0001-Remove-deprecated-boost-utility.patch + * Add 0001-boost-enable_if-Support-Boost-versions-1.56.patch + +------------------------------------------------------------------- New: ---- 0001-Remove-deprecated-boost-utility.patch 0001-boost-enable_if-Support-Boost-versions-1.56.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SimGear.spec ++++++ --- /var/tmp/diff_new_pack.CwxBle/_old 2019-03-22 15:11:07.753301132 +0100 +++ /var/tmp/diff_new_pack.CwxBle/_new 2019-03-22 15:11:07.773301129 +0100 @@ -33,6 +33,10 @@ Source0: https://sourceforge.net/projects/flightgear/files/release-%{main_version}/simgear-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM 0001-Improve-HTTP-redirect-handling-and-add-test.patch Patch0: 0001-Improve-HTTP-redirect-handling-and-add-test.patch +# PATCH-FIX-UPSTREAM 0001-Remove-deprecated-boost-utility.patch +Patch1: 0001-Remove-deprecated-boost-utility.patch +# PATCH-FIX-UPSTREAM 0001-boost-enable_if-Support-Boost-versions-1.56.patch +Patch2: 0001-boost-enable_if-Support-Boost-versions-1.56.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libOpenSceneGraph-devel < 3.6 @@ -90,6 +94,8 @@ %prep %setup -q -n simgear-%{version} %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build export CFLAGS="%{optflags}" ++++++ 0001-Remove-deprecated-boost-utility.patch ++++++ >From 4b793d5344af26a0fca4f6d7ccc7ce0b55d3c935 Mon Sep 17 00:00:00 2001 From: Scott Giese <sctt...@gmail.com> Date: Sat, 2 Feb 2019 19:46:04 -0600 Subject: [PATCH] Remove deprecated boost/utility. This is enable compatibility with boost 1.69. --- simgear/nasal/cppbind/NasalHash.hxx | 1 + simgear/props/props.hxx | 3 ++- simgear/structure/SGWeakReferenced.hxx | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/simgear/nasal/cppbind/NasalHash.hxx b/simgear/nasal/cppbind/NasalHash.hxx index aac672fd..5019d08b 100644 --- a/simgear/nasal/cppbind/NasalHash.hxx +++ b/simgear/nasal/cppbind/NasalHash.hxx @@ -24,6 +24,7 @@ #include <simgear/structure/map.hxx> #include <boost/iterator/iterator_facade.hpp> +#include <boost/core/enable_if.hpp> namespace nasal { diff --git a/simgear/props/props.hxx b/simgear/props/props.hxx index c94186cb..68d3c03c 100644 --- a/simgear/props/props.hxx +++ b/simgear/props/props.hxx @@ -55,13 +55,14 @@ namespace boost { struct disable_if : public disable_if_c<Cond::value, T> {}; } #else -# include <boost/utility.hpp> # include <boost/type_traits/is_enum.hpp> +# include <boost/core/enable_if.hpp> # include <simgear/debug/logstream.hxx> # include <simgear/math/SGMathFwd.hxx> # include <simgear/math/sg_types.hxx> #endif + #include <simgear/structure/SGReferenced.hxx> #include <simgear/structure/SGSharedPtr.hxx> diff --git a/simgear/structure/SGWeakReferenced.hxx b/simgear/structure/SGWeakReferenced.hxx index 3bb70ffa..27f647b4 100644 --- a/simgear/structure/SGWeakReferenced.hxx +++ b/simgear/structure/SGWeakReferenced.hxx @@ -22,7 +22,7 @@ #include "SGSharedPtr.hxx" #include <boost/type_traits/is_base_of.hpp> -#include <boost/utility/enable_if.hpp> +#include <boost/core/enable_if.hpp> #ifdef _MSC_VER # pragma warning(push) -- 2.21.0 ++++++ 0001-boost-enable_if-Support-Boost-versions-1.56.patch ++++++ >From 7246edcb4b5180bf14c25a012562120ff0805fac Mon Sep 17 00:00:00 2001 From: Scott Giese <sctt...@gmail.com> Date: Tue, 5 Feb 2019 12:20:06 -0600 Subject: [PATCH] [boost::enable_if] Support Boost versions < 1.56 --- simgear/nasal/cppbind/NasalHash.hxx | 4 ++++ simgear/props/props.hxx | 6 +++++- simgear/structure/SGWeakReferenced.hxx | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/simgear/nasal/cppbind/NasalHash.hxx b/simgear/nasal/cppbind/NasalHash.hxx index 5019d08b..59281643 100644 --- a/simgear/nasal/cppbind/NasalHash.hxx +++ b/simgear/nasal/cppbind/NasalHash.hxx @@ -24,7 +24,11 @@ #include <simgear/structure/map.hxx> #include <boost/iterator/iterator_facade.hpp> +#if BOOST_VERSION >= 105600 #include <boost/core/enable_if.hpp> +#else +#include <boost/utility/enable_if.hpp> +#endif namespace nasal { diff --git a/simgear/props/props.hxx b/simgear/props/props.hxx index 68d3c03c..3afc8796 100644 --- a/simgear/props/props.hxx +++ b/simgear/props/props.hxx @@ -56,7 +56,11 @@ namespace boost { } #else # include <boost/type_traits/is_enum.hpp> -# include <boost/core/enable_if.hpp> +#if BOOST_VERSION >= 105600 +#include <boost/core/enable_if.hpp> +#else +#include <boost/utility/enable_if.hpp> +#endif # include <simgear/debug/logstream.hxx> # include <simgear/math/SGMathFwd.hxx> diff --git a/simgear/structure/SGWeakReferenced.hxx b/simgear/structure/SGWeakReferenced.hxx index 27f647b4..24db41b8 100644 --- a/simgear/structure/SGWeakReferenced.hxx +++ b/simgear/structure/SGWeakReferenced.hxx @@ -22,7 +22,11 @@ #include "SGSharedPtr.hxx" #include <boost/type_traits/is_base_of.hpp> +#if BOOST_VERSION >= 105600 #include <boost/core/enable_if.hpp> +#else +#include <boost/utility/enable_if.hpp> +#endif #ifdef _MSC_VER # pragma warning(push) -- 2.21.0
