Add patch for Boost 1.60.0

This commit is contained in:
Jonathan Wakely 2016-01-14 01:57:03 +00:00
commit 90e6239bf6
2 changed files with 38 additions and 1 deletions

View file

@ -2,7 +2,7 @@
Name: adobe-source-libraries
Version: 1.0.43
Release: 29%{?dist}
Release: 30%{?dist}
Summary: General purpose C++ libraries
Group: System Environment/Libraries
@ -24,6 +24,7 @@ Patch2: asl-no-concept-check1043.patch
Patch3: asl-time-utc.patch
Patch4: asl-boost-1.50.patch
Patch6: asl-boost-1.57.patch
Patch7: asl-boost-1.60.patch
BuildRequires: boost-build
BuildRequires: boost-devel
@ -66,6 +67,7 @@ API and other documentation for Adobe Source Libraries (ASL).
%patch3 -p1
%patch4 -p1
%patch6 -p1
%patch7 -p1
find . \( -name *.hpp -o -name *.jpg \) -executable -exec chmod 644 {} \;
iconv -f iso8859-1 -t utf-8 release_notes.txt > release_notes.txt.conv && \
@ -141,6 +143,9 @@ ln -sf $sofile ${sofile%%.*.*.*}
%changelog
* Thu Jan 14 2016 Jonathan Wakely <jwakely@redhat.com> 1.0.43-30
- Add patch for Boost 1.60.0
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 1.0.43-29
- Rebuilt for Boost 1.59

32
asl-boost-1.60.patch Normal file
View file

@ -0,0 +1,32 @@
--- source_release/adobe/eve.hpp~ 2015-11-20 11:35:57.541968704 +0000
+++ source_release/adobe/eve.hpp 2015-11-20 11:37:45.443943283 +0000
@@ -14,6 +14,7 @@
#include <utility>
#include <boost/noncopyable.hpp>
+#include <boost/version.hpp>
#include <adobe/forest.hpp>
#include <adobe/extents.hpp>
@@ -38,6 +39,13 @@
#if !defined(ADOBE_NO_DOCUMENTATION)
namespace boost {
+#if BOOST_VERSION >= 106000
+ template <>
+ struct is_pod<adobe::implementation::view_proxy_t>
+ : true_type
+ {
+ };
+#else
namespace detail {
template <>
struct is_pod_impl<adobe::implementation::view_proxy_t>
@@ -45,6 +53,7 @@
BOOST_STATIC_CONSTANT(bool, value = true);
};
}
+#endif
}
#endif