From 20123c5e6f762c5aa183dca159206b163cc1d780 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sep 02 2015 12:07:43 +0000 Subject: Add patch for Boost.Python bug. --- diff --git a/boost-1.59-python-make_setter.patch b/boost-1.59-python-make_setter.patch new file mode 100644 index 0000000..6c00658 --- /dev/null +++ b/boost-1.59-python-make_setter.patch @@ -0,0 +1,25 @@ +From f410fbd64d887e2a8824f968b0533588489b5430 Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely +Date: Wed, 2 Sep 2015 13:02:12 +0100 +Subject: [PATCH] Python: Fix condition for make_setter overload. + +This fixes the regression caused by 42e7d7b. + +Fixes #39 +--- + include/boost/python/data_members.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/boost/python/data_members.hpp b/include/boost/python/data_members.hpp +index 139bde3..5d3309c 100644 +--- a/include/boost/python/data_members.hpp ++++ b/include/boost/python/data_members.hpp +@@ -305,7 +305,7 @@ inline object make_setter(D& x) + return detail::make_setter(x, default_call_policies(), is_member_pointer(), 0); + } + +-# if BOOST_WORKAROUND(__EDG_VERSION__, <= 238) ++# if !BOOST_WORKAROUND(__EDG_VERSION__, <= 238) + template + inline object make_setter(D const& x) + { diff --git a/boost.spec b/boost.spec index 5d8f982..0c3b1da 100644 --- a/boost.spec +++ b/boost.spec @@ -32,7 +32,7 @@ Name: boost Summary: The free peer-reviewed portable C++ source libraries Version: 1.59.0 %define version_enc 1_59_0 -Release: 1%{?dist} +Release: 2%{?dist} License: Boost and MIT and Python %define toplev_dirname %{name}_%{version_enc} @@ -124,6 +124,9 @@ Patch68: boost-1.58.0-address-model.patch # https://svn.boost.org/trac/boost/ticket/11549 Patch70: boost-1.59.0-log.patch +# https://github.com/boostorg/python/pull/40 +Patch80: boost-1.59-python-make_setter.patch + %bcond_with tests %bcond_with docs_generated @@ -618,6 +621,7 @@ a number of significant features and is now developed independently %patch65 -p1 %patch68 -p1 %patch70 -p2 +%patch80 -p2 # At least python2_version needs to be a macro so that it's visible in # %%install as well. @@ -1279,6 +1283,9 @@ fi %{_mandir}/man1/bjam.1* %changelog +* Wed Sep 02 2015 Jonathan Wakely 1.59.0-2 +- Add patch for Boost.Python bug. + * Wed Aug 26 2015 Jonathan Wakely 1.59.0-1 - Rebase to 1.59.0