From e796e9e9eebdca2e619a0f1d94c323e47c6217b4 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 31 2020 09:37:47 +0000 Subject: import boost-1.53.0-28.el7 --- diff --git a/SOURCES/boost-1.53-joinable.patch b/SOURCES/boost-1.53-joinable.patch new file mode 100644 index 0000000..224f098 --- /dev/null +++ b/SOURCES/boost-1.53-joinable.patch @@ -0,0 +1,16 @@ +Index: boost/thread/scoped_thread.hpp +=================================================================== +--- boost/thread/scoped_thread.hpp (revision 83938) ++++ boost/thread/scoped_thread.hpp (working copy) +@@ -171,6 +171,11 @@ + t_.detach(); + } + ++ bool joinable() const BOOST_NOEXCEPT ++ { ++ return t_.joinable(); ++ } ++ + void join() + { + t_.join(); diff --git a/SOURCES/boost-1.54.0-date-time.patch b/SOURCES/boost-1.54.0-date-time.patch new file mode 100644 index 0000000..a05efeb --- /dev/null +++ b/SOURCES/boost-1.54.0-date-time.patch @@ -0,0 +1,19 @@ +------------------------------------------------------------------------ +r84948 | danieljames | 2013-07-03 23:02:30 +0100 (Wed, 03 Jul 2013) | 4 lines + +In C++11 the shared_ptr -> bool conversion is explicit. In custom time zone code, make the cast explicit. Fixes compilation failure in C++11 + +From [84626], by marshall. + +------------------------------------------------------------------------ +--- 1_54_0/boost/date_time/local_time/custom_time_zone.hpp (revision 84947) ++++ 1_54_0/boost/date_time/local_time/custom_time_zone.hpp (revision 84948) +@@ -64,7 +64,7 @@ + //! True if zone uses daylight savings adjustments + virtual bool has_dst() const + { +- return (dst_calc_rules_); //if calc_rule is set the tz has dst ++ return (bool) dst_calc_rules_; //if calc_rule is set the tz has dst + } + //! Local time that DST starts -- NADT if has_dst is false + virtual posix_time::ptime dst_local_start_time(gregorian::greg_year y) const diff --git a/SPECS/boost.spec b/SPECS/boost.spec index 4637424..8b1f399 100644 --- a/SPECS/boost.spec +++ b/SPECS/boost.spec @@ -34,7 +34,7 @@ Name: boost Summary: The free peer-reviewed portable C++ source libraries Version: 1.53.0 %define version_enc 1_53_0 -Release: 27%{?dist} +Release: 28%{?dist} License: Boost and MIT and Python %define toplev_dirname %{name}_%{version_enc} @@ -225,6 +225,14 @@ Patch64: boost-1.53.0-no-rpath.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1402516 Patch70: boost-1.53-spirit-lexer.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1636817 +# https://www.boost.org/patches/1_54_0/002-date-time.patch +Patch71: boost-1.54.0-date-time.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1676674 +# https://svn.boost.org/trac10/ticket/8451 +Patch72: boost-1.53-joinable.patch + %bcond_with tests %bcond_with docs_generated @@ -697,6 +705,8 @@ a number of significant features and is now developed independently %patch63 -p1 %patch64 -p1 %patch70 -p2 +%patch71 -p1 +%patch72 -p0 # At least python2_version needs to be a macro so that it's visible in # %%install as well. @@ -1272,6 +1282,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/bjam.1* %changelog +* Wed Feb 13 2019 Jonathan Wakely - 1.53.0-28 +- Add patch for scoped_thread (#1676674) + +* Mon Oct 08 2018 Jonathan Wakely - 1.53.0-28 +- Add patch for date-time bug (#1636817) + * Tue Feb 21 2017 Jonathan Wakely - 1.53.0-27 - Patch Boost.Spirit for ppc64 (#1402516)