Add patch for Boost.Python bug.

This commit is contained in:
Jonathan Wakely 2015-09-02 13:07:43 +01:00
parent 3d13bdbd4b
commit 20123c5e6f
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From f410fbd64d887e2a8824f968b0533588489b5430 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
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<D>(), 0);
}
-# if BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
+# if !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
template <class D>
inline object make_setter(D const& x)
{

View File

@ -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 <jwakely@redhat.com> 1.59.0-2
- Add patch for Boost.Python bug.
* Wed Aug 26 2015 Jonathan Wakely <jwakely@redhat.com> 1.59.0-1
- Rebase to 1.59.0