From 488acc080068ddfd8fceb4be5bf0d0916aba5f06 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 27 Jul 2015 11:48:14 +0100 Subject: [PATCH] Patch for missing include (boost-1.58.0-variant-includes.patch). --- boost-1.58.0-variant-includes.patch | 18 ++++++++++++++++++ boost.spec | 9 ++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 boost-1.58.0-variant-includes.patch diff --git a/boost-1.58.0-variant-includes.patch b/boost-1.58.0-variant-includes.patch new file mode 100644 index 0000000..2938371 --- /dev/null +++ b/boost-1.58.0-variant-includes.patch @@ -0,0 +1,18 @@ +commit 2b2cc6543c44beeb8331dc8e1a7eff2e071a8cc8 +Author: Antony Polukhin +Date: Sun May 10 21:53:27 2015 +0300 + + Fix error with missing include, that was found by Maarten de Vries + +diff --git a/include/boost/variant/detail/element_index.hpp b/include/boost/variant/detail/element_index.hpp +index bd80bdd..842b018 100644 +--- a/include/boost/variant/detail/element_index.hpp ++++ b/include/boost/variant/detail/element_index.hpp +@@ -16,6 +16,7 @@ + #include "boost/variant/recursive_wrapper_fwd.hpp" + #include "boost/variant/variant_fwd.hpp" + ++#include "boost/type_traits/remove_cv.hpp" + #include "boost/mpl/find_if.hpp" + + namespace boost { namespace detail { namespace variant { diff --git a/boost.spec b/boost.spec index d834601..37c0c9f 100644 --- a/boost.spec +++ b/boost.spec @@ -32,7 +32,7 @@ Name: boost Summary: The free peer-reviewed portable C++ source libraries Version: 1.58.0 %define version_enc 1_58_0 -Release: 1%{?dist} +Release: 2%{?dist} License: Boost and MIT and Python %define toplev_dirname %{name}_%{version_enc} @@ -124,6 +124,9 @@ Patch65: boost-1.57.0-build-optflags.patch # https://svn.boost.org/trac/boost/ticket/10510 Patch66: boost-1.57.0-uuid-comparison.patch +# https://svn.boost.org/trac/boost/ticket/11283 +Patch67: boost-1.58.0-variant-includes.patch + Patch78: boost-context-use-sysv-not-aapcs.patch %bcond_with tests @@ -613,6 +616,7 @@ a number of significant features and is now developed independently %patch63 -p1 %patch65 -p1 %patch66 -p2 +%patch67 -p2 %patch78 -p1 # At least python2_version needs to be a macro so that it's visible in @@ -1233,6 +1237,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/bjam.1* %changelog +* Mon Jul 27 2015 Jonathan Wakely 1.58.0-2 +- Patch for missing include (boost-1.58.0-variant-includes.patch). + * Fri Jul 17 2015 Jonathan Wakely - 1.58.0-1 - Rebase to 1.58.0