diff --git a/adobe-source-libraries.spec b/adobe-source-libraries.spec index 700a2f8..d07fc14 100644 --- a/adobe-source-libraries.spec +++ b/adobe-source-libraries.spec @@ -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 1.0.43-30 +- Add patch for Boost 1.60.0 + * Thu Aug 27 2015 Jonathan Wakely - 1.0.43-29 - Rebuilt for Boost 1.59 diff --git a/asl-boost-1.60.patch b/asl-boost-1.60.patch new file mode 100644 index 0000000..2fc1c59 --- /dev/null +++ b/asl-boost-1.60.patch @@ -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 + + #include ++#include + + #include + #include +@@ -38,6 +39,13 @@ + + #if !defined(ADOBE_NO_DOCUMENTATION) + namespace boost { ++#if BOOST_VERSION >= 106000 ++ template <> ++ struct is_pod ++ : true_type ++ { ++ }; ++#else + namespace detail { + template <> + struct is_pod_impl +@@ -45,6 +53,7 @@ + BOOST_STATIC_CONSTANT(bool, value = true); + }; + } ++#endif + } + #endif +