[boost] Rebase to 1.55.0
Petr Machata
pmachata at fedoraproject.org
Thu May 22 11:02:32 UTC 2014
commit b9aa7fb633ff907160e19f9eb793b0694d0fd897
Author: Petr Machata <pmachata at redhat.com>
Date: Wed May 21 20:18:20 2014 +0200
Rebase to 1.55.0
001-coroutine.patch | 19 ---
002-date-time.patch | 19 ---
003-log.patch | 16 --
boost-1.53.0-attribute.patch | 33 -----
boost-1.54.0-__GLIBC_HAVE_LONG_LONG.patch | 22 ---
boost-1.54.0-algorithm-unused_typedef.patch | 43 ------
boost-1.54.0-context-execstack.patch | 129 -----------------
boost-1.54.0-graph-unused_typedef.patch | 11 --
boost-1.54.0-interprocess-atomic_cas32-ppc.patch | 14 --
boost-1.54.0-lexical_cast-int128.patch | 61 --------
boost-1.54.0-math-unused_typedef-2.patch | 52 -------
boost-1.54.0-math-unused_typedef.patch | 15 --
boost-1.54.0-mpi-unused_typedef.patch | 11 --
boost-1.54.0-multiprecision-unused_typedef.patch | 148 --------------------
boost-1.54.0-thread-cond_variable_shadow.patch | 104 --------------
boost-1.54.0-thread-link_atomic.patch | 51 -------
boost-1.54.0-unordered-unused_typedef.patch | 14 --
boost-1.54.0-xpressive-unused_typedef.patch | 11 --
boost-1.55.0-archive-init_order.patch | 13 ++
boost-1.55.0-program_options-class_attribute.patch | 14 ++
boost-1.55.0-spirit-unused_typedefs.patch | 15 ++
boost-1.55.0-xpressive-unused_typedefs.patch | 11 ++
boost.spec | 137 +++++++++----------
sources | 2 +-
24 files changed, 119 insertions(+), 846 deletions(-)
---
diff --git a/boost-1.55.0-archive-init_order.patch b/boost-1.55.0-archive-init_order.patch
new file mode 100644
index 0000000..7de81ef
--- /dev/null
+++ b/boost-1.55.0-archive-init_order.patch
@@ -0,0 +1,13 @@
+diff -up ./boost/archive/iterators/transform_width.hpp~ ./boost/archive/iterators/transform_width.hpp
+--- ./boost/archive/iterators/transform_width.hpp~ 2013-04-28 18:07:27.000000000 +0200
++++ ./boost/archive/iterators/transform_width.hpp 2014-05-13 18:08:53.683355277 +0200
+@@ -119,8 +119,8 @@ public:
+ transform_width(const transform_width & rhs) :
+ super_t(rhs.base_reference()),
+ m_buffer_out_full(rhs.m_buffer_out_full),
+- m_remaining_bits(rhs.m_remaining_bits),
+ m_buffer_in(rhs.m_buffer_in),
++ m_remaining_bits(rhs.m_remaining_bits),
+ m_end_of_sequence(false)
+ {}
+ };
diff --git a/boost-1.55.0-program_options-class_attribute.patch b/boost-1.55.0-program_options-class_attribute.patch
new file mode 100644
index 0000000..cfd0df4
--- /dev/null
+++ b/boost-1.55.0-program_options-class_attribute.patch
@@ -0,0 +1,14 @@
+diff -up boost_1_55_0/boost/program_options/variables_map.hpp\~ boost_1_55_0/boost/program_options/variables_map.hpp
+--- boost_1_55_0/boost/program_options/variables_map.hpp~ 2012-04-08 12:02:26.000000000 +0200
++++ boost_1_55_0/boost/program_options/variables_map.hpp 2014-05-13 17:49:18.219749093 +0200
+@@ -98,7 +98,7 @@ namespace boost { namespace program_opti
+ void store(const basic_parsed_options<char>& options,
+ variables_map& m, bool);
+
+- friend BOOST_PROGRAM_OPTIONS_DECL class variables_map;
++ friend class BOOST_PROGRAM_OPTIONS_DECL variables_map;
+ };
+
+ /** Implements string->string mapping with convenient value casting
+
+Diff finished. Tue May 13 17:49:22 2014
diff --git a/boost-1.55.0-spirit-unused_typedefs.patch b/boost-1.55.0-spirit-unused_typedefs.patch
new file mode 100644
index 0000000..399d99b
--- /dev/null
+++ b/boost-1.55.0-spirit-unused_typedefs.patch
@@ -0,0 +1,15 @@
+diff -up boost_1_55_0/boost/spirit/home/support/char_set/range_run_impl.hpp\~ boost_1_55_0/boost/spirit/home/support/char_set/range_run_impl.hpp
+--- boost_1_55_0/boost/spirit/home/support/char_set/range_run_impl.hpp~ 2011-01-13 03:11:19.000000000 +0100
++++ boost_1_55_0/boost/spirit/home/support/char_set/range_run_impl.hpp 2014-05-15 18:09:07.326237692 +0200
+@@ -25,9 +25,6 @@ namespace boost { namespace spirit { nam
+ // if *iter intersects with, or is adjacent to, 'range'...
+ if (can_merge(*iter, range))
+ {
+- typedef typename Range::value_type value_type;
+- typedef integer_traits<value_type> integer_traits;
+-
+ // merge range and *iter
+ merge(*iter, range);
+
+
+Diff finished. Thu May 15 18:09:11 2014
diff --git a/boost-1.55.0-xpressive-unused_typedefs.patch b/boost-1.55.0-xpressive-unused_typedefs.patch
new file mode 100644
index 0000000..1365d92
--- /dev/null
+++ b/boost-1.55.0-xpressive-unused_typedefs.patch
@@ -0,0 +1,11 @@
+diff -up ./boost/xpressive/detail/dynamic/parser.hpp~ ./boost/xpressive/detail/dynamic/parser.hpp
+--- ./boost/xpressive/detail/dynamic/parser.hpp~ 2009-09-23 23:53:53.000000000 +0200
++++ ./boost/xpressive/detail/dynamic/parser.hpp 2014-05-13 17:15:47.263001855 +0200
+@@ -328,7 +328,6 @@ inline sequence<BidiIter> make_assert_en
+ template<typename BidiIter, typename Cond, typename Traits>
+ inline sequence<BidiIter> make_assert_word(Cond, Traits const &tr)
+ {
+- typedef typename iterator_value<BidiIter>::type char_type;
+ return detail::make_dynamic<BidiIter>
+ (
+ detail::assert_word_matcher<Cond, Traits>(tr)
diff --git a/boost.spec b/boost.spec
index 05bab75..7f9864d 100644
--- a/boost.spec
+++ b/boost.spec
@@ -34,9 +34,9 @@
Name: boost
Summary: The free peer-reviewed portable C++ source libraries
-Version: 1.54.0
-%define version_enc 1_54_0
-Release: 14%{?dist}
+Version: 1.55.0
+%define version_enc 1_55_0
+Release: 1%{?dist}
License: Boost and MIT and Python
%define toplev_dirname %{name}_%{version_enc}
@@ -59,6 +59,7 @@ Requires: boost-atomic = %{version}-%{release}
Requires: boost-chrono = %{version}-%{release}
%if %{with context}
Requires: boost-context = %{version}-%{release}
+Requires: boost-coroutine = %{version}-%{release}
%endif
Requires: boost-date-time = %{version}-%{release}
Requires: boost-filesystem = %{version}-%{release}
@@ -96,29 +97,10 @@ Patch4: boost-1.50.0-fix-non-utf8-files.patch
# http://www.boost.org/boost-build2/doc/html/bbv2/overview.html
Patch5: boost-1.48.0-add-bjam-man-page.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=781859
-# The following tickets have yet to be fixed by upstream.
-# https://svn.boost.org/trac/boost/ticket/6413
-# https://svn.boost.org/trac/boost/ticket/8849
-Patch9: boost-1.53.0-attribute.patch
-
# https://bugzilla.redhat.com/show_bug.cgi?id=828856
# https://bugzilla.redhat.com/show_bug.cgi?id=828857
Patch15: boost-1.50.0-pool.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=977098
-# https://svn.boost.org/trac/boost/ticket/8731
-Patch18: boost-1.54.0-__GLIBC_HAVE_LONG_LONG.patch
-
-# Upstream patches posted as release notes:
-# http://www.boost.org/users/history/version_1_54_0.html
-Patch19: 001-coroutine.patch
-Patch20: 002-date-time.patch
-Patch21: 003-log.patch
-
-# https://svn.boost.org/trac/boost/ticket/8826
-Patch22: boost-1.54.0-context-execstack.patch
-
# https://svn.boost.org/trac/boost/ticket/8844
Patch23: boost-1.54.0-bind-static_assert.patch
@@ -131,10 +113,6 @@ Patch25: boost-1.54.0-mpl-print.patch
# https://svn.boost.org/trac/boost/ticket/8859
Patch26: boost-1.54.0-static_warning-unused_typedef.patch
-# https://svn.boost.org/trac/boost/ticket/8855
-Patch27: boost-1.54.0-math-unused_typedef.patch
-Patch28: boost-1.54.0-math-unused_typedef-2.patch
-
# https://svn.boost.org/trac/boost/ticket/8853
Patch31: boost-1.54.0-tuple-unused_typedef.patch
@@ -152,51 +130,32 @@ Patch36: boost-1.54.0-spirit-unused_typedef-2.patch
# https://svn.boost.org/trac/boost/ticket/8871
Patch37: boost-1.54.0-numeric-unused_typedef.patch
-# https://svn.boost.org/trac/boost/ticket/8872
-Patch38: boost-1.54.0-multiprecision-unused_typedef.patch
-
-# https://svn.boost.org/trac/boost/ticket/8874
-Patch42: boost-1.54.0-unordered-unused_typedef.patch
-
-# https://svn.boost.org/trac/boost/ticket/8876
-Patch43: boost-1.54.0-algorithm-unused_typedef.patch
-
-# https://svn.boost.org/trac/boost/ticket/8877
-Patch44: boost-1.54.0-graph-unused_typedef.patch
-
# https://svn.boost.org/trac/boost/ticket/8878
Patch45: boost-1.54.0-locale-unused_typedef.patch
# https://svn.boost.org/trac/boost/ticket/8879
Patch46: boost-1.54.0-property_tree-unused_typedef.patch
-# https://svn.boost.org/trac/boost/ticket/8880
-Patch47: boost-1.54.0-xpressive-unused_typedef.patch
-
-# https://svn.boost.org/trac/boost/ticket/8881
-Patch48: boost-1.54.0-mpi-unused_typedef.patch
-
# https://svn.boost.org/trac/boost/ticket/8888
Patch49: boost-1.54.0-python-unused_typedef.patch
-# https://svn.boost.org/trac/boost/ticket/8941
-Patch50: boost-1.54.0-lexical_cast-int128.patch
-
# https://svn.boost.org/trac/boost/ticket/9038
Patch51: boost-1.54.0-pool-test_linking.patch
-# https://svn.boost.org/trac/boost/ticket/9037
-Patch52: boost-1.54.0-thread-cond_variable_shadow.patch
-
# This was already fixed upstream, so no tracking bug.
Patch53: boost-1.54.0-pool-max_chunks_shadow.patch
-# https://svn.boost.org/trac/boost/ticket/9041
-Patch54: boost-1.54.0-thread-link_atomic.patch
+# https://svn.boost.org/trac/boost/ticket/8725
+Patch54: boost-1.55.0-program_options-class_attribute.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1002578
-# https://svn.boost.org/trac/boost/ticket/9065
-Patch55: boost-1.54.0-interprocess-atomic_cas32-ppc.patch
+# Fixed upstream on Oct 4 00:26:49 2013.
+Patch55: boost-1.55.0-archive-init_order.patch
+
+# https://github.com/boostorg/xpressive/pull/1
+Patch56: boost-1.55.0-xpressive-unused_typedefs.patch
+
+# Fixed upstream on Aug 20 05:11:14 2013.
+Patch57: boost-1.55.0-spirit-unused_typedefs.patch
%bcond_with tests
%bcond_with docs_generated
@@ -240,6 +199,16 @@ Group: System Environment/Libraries
Run-Time support for Boost.Context, a foundational library that
provides a sort of cooperative multitasking on a single thread.
+
+%package coroutine
+Summary: Run-Time component of boost coroutine library
+Group: System Environment/Libraries
+
+%description coroutine
+Run-Time support for Boost.Coroutine, a library that provides
+generalized subroutines which allow multiple entry points for
+suspending and resuming execution.
+
%endif
%package date-time
@@ -653,19 +622,11 @@ a number of significant features and is now developed independently
%patch4 -p1
%patch5 -p1
-%patch9 -p1
%patch15 -p0
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p0
%patch26 -p1
-%patch27 -p1
-%patch28 -p0
%patch31 -p0
%patch32 -p0
%patch33 -p0
@@ -673,21 +634,15 @@ a number of significant features and is now developed independently
%patch35 -p1
%patch36 -p1
%patch37 -p1
-%patch38 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
%patch45 -p1
%patch46 -p1
-%patch47 -p1
-%patch48 -p1
%patch49 -p1
-%patch50 -p0
%patch51 -p1
-%patch52 -p1
%patch53 -p1
%patch54 -p1
%patch55 -p1
+%patch56 -p1
+%patch57 -p1
# At least python2_version needs to be a macro so that it's visible in
# %%install as well.
@@ -894,7 +849,6 @@ rm -f tmp-doc-directories
echo ============================= install examples ==================
# Fix a few non-standard issues (DOS and/or non-UTF8 files)
sed -i -e 's/\r//g' libs/geometry/example/ml02_distance_strategy.cpp
-sed -i -e 's/\r//g' libs/geometry/example/ml02_distance_strategy.vcproj
for tmp_doc_file in flyweight/example/Jamfile.v2 \
format/example/sample_new_features.cpp multi_index/example/Jamfile.v2 \
multi_index/example/hashed.cpp serialization/example/demo_output.txt \
@@ -953,6 +907,10 @@ rm -rf $RPM_BUILD_ROOT
%post context -p /sbin/ldconfig
%postun context -p /sbin/ldconfig
+
+%post coroutine -p /sbin/ldconfig
+
+%postun coroutine -p /sbin/ldconfig
%endif
%post date-time -p /sbin/ldconfig
@@ -1044,10 +1002,17 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libboost_chrono.so.%{sonamever}
%if %{with context}
+
%files context
%defattr(-, root, root, -)
%doc LICENSE_1_0.txt
%{_libdir}/libboost_context.so.%{sonamever}
+
+%files coroutine
+%defattr(-, root, root, -)
+%doc LICENSE_1_0.txt
+%{_libdir}/libboost_coroutine.so.%{sonamever}
+
%endif
%files date-time
@@ -1176,6 +1141,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libboost_chrono.so
%if %{with context}
%{_libdir}/libboost_context.so
+%{_libdir}/libboost_coroutine.so
%endif
%{_libdir}/libboost_date_time.so
%{_libdir}/libboost_filesystem.so
@@ -1279,6 +1245,33 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/bjam.1*
%changelog
+* Mon May 12 2014 Petr Machata <pmachata at redhat.com> - 1.55.0-1
+- Add a new sub-package boost-coroutine
+- Annotate or drop some unused typedefs
+ (boost-1.55.0-python-unused_typedefs.patch,
+ boost-1.55.0-spirit-unused_typedefs.patch,
+ boost-1.55.0-xpressive-unused_typedefs.patch)
+- Add a patch for wrong initialization order
+ (boost-1.55.0-archive-init_order.patch)
+- Add a patch for misplaced attribute at class declaration
+ (boost-1.55.0-program_options-class_attribute.patch)
+- Drop 001-coroutine.patch, 002-date-time.patch, 003-log.patch,
+ boost-1.53.0-attribute.patch,
+ boost-1.54.0-__GLIBC_HAVE_LONG_LONG.patch,
+ boost-1.54.0-algorithm-unused_typedef.patch,
+ boost-1.54.0-context-execstack.patch,
+ boost-1.54.0-graph-unused_typedef.patch,
+ boost-1.54.0-interprocess-atomic_cas32-ppc.patch,
+ boost-1.54.0-lexical_cast-int128.patch,
+ boost-1.54.0-math-unused_typedef-2.patch,
+ boost-1.54.0-math-unused_typedef.patch,
+ boost-1.54.0-mpi-unused_typedef.patch,
+ boost-1.54.0-multiprecision-unused_typedef.patch,
+ boost-1.54.0-thread-cond_variable_shadow.patch,
+ boost-1.54.0-thread-link_atomic.patch,
+ boost-1.54.0-unordered-unused_typedef.patch,
+ boost-1.54.0-xpressive-unused_typedef.patch,
+
* Tue Mar 18 2014 Petr Machata <pmachata at redhat.com> - 1.54.0-14
- Fix a noexecstack patch for ARM, enable Boost.Context on ARM.
(boost-1.54.0-context-execstack.patch)
diff --git a/sources b/sources
index b83e24d..329a0a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15cb8c0803064faef0c4ddf5bc5ca279 boost_1_54_0.tar.bz2
+d6eef4b4cacb2183f2bf265a5a03a354 boost_1_55_0.tar.bz2
More information about the scm-commits
mailing list