From c2b3a56ca087ef9e38db9a48fc80a36ba83b5fec Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 20 Jan 2015 18:49:47 +0100 Subject: [PATCH] Rebase to 1.57 --- boost-1.54.0-bind-static_assert.patch | 21 -- boost-1.54.0-concept-unused_typedef.patch | 21 -- boost-1.54.0-date_time-unused_typedef-2.patch | 13 - boost-1.54.0-date_time-unused_typedef.patch | 100 ------- boost-1.54.0-numeric-unused_typedef.patch | 250 ------------------ ...-1.54.0-property_tree-unused_typedef.patch | 19 -- boost-1.54.0-smart_ptr-shared_ptr_at.patch | 88 ------ boost-1.54.0-spirit-unused_typedef-2.patch | 22 -- boost-1.54.0-spirit-unused_typedef.patch | 11 - ...1.54.0-static_warning-unused_typedef.patch | 23 -- boost-1.54.0-tuple-unused_typedef.patch | 12 - boost-1.55.0-archive-init_order.patch | 13 - boost-1.55.0-atomic-int128_1.patch | 48 ---- boost-1.55.0-atomic-int128_2.patch | 68 ----- ...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 - ...rint.patch => boost-1.57.0-mpl-print.patch | 18 +- ...ch => boost-1.57.0-pool-test_linking.patch | 12 +- ...h => boost-1.57.0-python-abi_letters.patch | 4 +- ...=> boost-1.57.0-python-libpython_dep.patch | 6 +- boost-1.57.0-spirit-unused_typedef.patch | 19 ++ boost.spec | 145 +++++----- 23 files changed, 103 insertions(+), 850 deletions(-) delete mode 100644 boost-1.54.0-bind-static_assert.patch delete mode 100644 boost-1.54.0-concept-unused_typedef.patch delete mode 100644 boost-1.54.0-date_time-unused_typedef-2.patch delete mode 100644 boost-1.54.0-date_time-unused_typedef.patch delete mode 100644 boost-1.54.0-numeric-unused_typedef.patch delete mode 100644 boost-1.54.0-property_tree-unused_typedef.patch delete mode 100644 boost-1.54.0-smart_ptr-shared_ptr_at.patch delete mode 100644 boost-1.54.0-spirit-unused_typedef-2.patch delete mode 100644 boost-1.54.0-spirit-unused_typedef.patch delete mode 100644 boost-1.54.0-static_warning-unused_typedef.patch delete mode 100644 boost-1.54.0-tuple-unused_typedef.patch delete mode 100644 boost-1.55.0-archive-init_order.patch delete mode 100644 boost-1.55.0-atomic-int128_1.patch delete mode 100644 boost-1.55.0-atomic-int128_2.patch delete mode 100644 boost-1.55.0-program_options-class_attribute.patch delete mode 100644 boost-1.55.0-spirit-unused_typedefs.patch delete mode 100644 boost-1.55.0-xpressive-unused_typedefs.patch rename boost-1.54.0-mpl-print.patch => boost-1.57.0-mpl-print.patch (62%) rename boost-1.54.0-pool-test_linking.patch => boost-1.57.0-pool-test_linking.patch (74%) rename boost-1.55.0-python-abi_letters.patch => boost-1.57.0-python-abi_letters.patch (92%) rename boost-1.55.0-python-libpython_dep.patch => boost-1.57.0-python-libpython_dep.patch (59%) create mode 100644 boost-1.57.0-spirit-unused_typedef.patch diff --git a/boost-1.54.0-bind-static_assert.patch b/boost-1.54.0-bind-static_assert.patch deleted file mode 100644 index bd1800e..0000000 --- a/boost-1.54.0-bind-static_assert.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up ./boost/bind/arg.hpp~ ./boost/bind/arg.hpp ---- ./boost/bind/arg.hpp~ 2007-11-25 10:07:19.000000000 -0800 -+++ ./boost/bind/arg.hpp 2013-07-18 00:41:41.667412595 -0700 -@@ -21,6 +21,7 @@ - - #include - #include -+#include - - namespace boost - { -@@ -33,8 +34,7 @@ template< int I > struct arg - - template< class T > arg( T const & /* t */ ) - { -- // static assert I == is_placeholder::value -- typedef char T_must_be_placeholder[ I == is_placeholder::value? 1: -1 ]; -+ BOOST_STATIC_ASSERT(I == is_placeholder::value); - } - }; - diff --git a/boost-1.54.0-concept-unused_typedef.patch b/boost-1.54.0-concept-unused_typedef.patch deleted file mode 100644 index 9559a5c..0000000 --- a/boost-1.54.0-concept-unused_typedef.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up ./boost/concept/detail/general.hpp~ ./boost/concept/detail/general.hpp ---- ./boost/concept/detail/general.hpp~ 2010-06-08 12:31:13.000000000 -0700 -+++ ./boost/concept/detail/general.hpp 2013-07-18 06:01:05.967747186 -0700 -@@ -6,6 +6,7 @@ - - # include - # include -+# include - - # ifdef BOOST_OLD_CONCEPT_SUPPORT - # include -@@ -68,7 +69,8 @@ struct requirement_ - # define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \ - typedef ::boost::concepts::detail::instantiate< \ - &::boost::concepts::requirement_::failed> \ -- BOOST_PP_CAT(boost_concept_check,__LINE__) -+ BOOST_PP_CAT(boost_concept_check,__LINE__) \ -+ BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE - - }} - diff --git a/boost-1.54.0-date_time-unused_typedef-2.patch b/boost-1.54.0-date_time-unused_typedef-2.patch deleted file mode 100644 index b39abe5..0000000 --- a/boost-1.54.0-date_time-unused_typedef-2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up boost_1_54_0/boost/date_time/gregorian/greg_facet.hpp\~ boost_1_54_0/boost/date_time/gregorian/greg_facet.hpp ---- boost_1_54_0/boost/date_time/gregorian/greg_facet.hpp~ 2008-11-23 12:13:35.000000000 +0100 -+++ boost_1_54_0/boost/date_time/gregorian/greg_facet.hpp 2013-07-22 23:44:42.834012788 +0200 -@@ -215,7 +215,6 @@ namespace gregorian { - { - std::istream_iterator, charT> beg(is), eos; - -- typedef boost::date_time::all_date_names_put facet_def; - d = from_stream(beg, eos); - return is; - } - -Diff finished. Mon Jul 22 23:44:50 2013 diff --git a/boost-1.54.0-date_time-unused_typedef.patch b/boost-1.54.0-date_time-unused_typedef.patch deleted file mode 100644 index 0f287ee..0000000 --- a/boost-1.54.0-date_time-unused_typedef.patch +++ /dev/null @@ -1,100 +0,0 @@ -Index: boost/date_time/date_parsing.hpp -=================================================================== ---- boost/date_time/date_parsing.hpp (revision 85073) -+++ boost/date_time/date_parsing.hpp (working copy) -@@ -113,7 +113,6 @@ - spec_str = "mdy"; - } - -- typedef typename date_type::year_type year_type; - typedef typename date_type::month_type month_type; - unsigned pos = 0; - unsigned short year(0), month(0), day(0); -@@ -160,7 +159,6 @@ - parse_undelimited_date(const std::string& s) { - int offsets[] = {4,2,2}; - int pos = 0; -- typedef typename date_type::year_type year_type; - //typename date_type::ymd_type ymd((year_type::min)(),1,1); - unsigned short y = 0, m = 0, d = 0; - -Index: boost/date_time/local_time/local_time_io.hpp -=================================================================== ---- boost/date_time/local_time/local_time_io.hpp (revision 85073) -+++ boost/date_time/local_time/local_time_io.hpp (working copy) -@@ -36,7 +36,6 @@ - boost::io::ios_flags_saver iflags(os); - typedef local_date_time time_type;//::utc_time_type typename - typedef date_time::time_facet custom_time_facet; -- typedef std::time_put std_time_facet; - std::ostreambuf_iterator oitr(os); - - if(std::has_facet(os.getloc())) { -@@ -123,7 +122,6 @@ - const boost::local_time::local_time_period& p) { - boost::io::ios_flags_saver iflags(os); - typedef boost::date_time::time_facet custom_facet; -- typedef std::time_put std_time_facet; - std::ostreambuf_iterator oitr(os); - if (std::has_facet(os.getloc())) { - std::use_facet(os.getloc()).put(oitr, os, os.fill(), p); -Index: boost/date_time/posix_time/posix_time_io.hpp -=================================================================== ---- boost/date_time/posix_time/posix_time_io.hpp (revision 85073) -+++ boost/date_time/posix_time/posix_time_io.hpp (working copy) -@@ -47,7 +47,6 @@ - const ptime& p) { - boost::io::ios_flags_saver iflags(os); - typedef boost::date_time::time_facet custom_ptime_facet; -- typedef std::time_put std_ptime_facet; - std::ostreambuf_iterator oitr(os); - if (std::has_facet(os.getloc())) - std::use_facet(os.getloc()).put(oitr, os, os.fill(), p); -@@ -114,7 +113,6 @@ - const boost::posix_time::time_period& p) { - boost::io::ios_flags_saver iflags(os); - typedef boost::date_time::time_facet custom_ptime_facet; -- typedef std::time_put std_time_facet; - std::ostreambuf_iterator oitr(os); - if (std::has_facet(os.getloc())) { - std::use_facet(os.getloc()).put(oitr, os, os.fill(), p); -@@ -180,7 +178,6 @@ - { - boost::io::ios_flags_saver iflags(os); - typedef boost::date_time::time_facet custom_ptime_facet; -- typedef std::time_put std_ptime_facet; - std::ostreambuf_iterator oitr(os); - if (std::has_facet(os.getloc())) - std::use_facet(os.getloc()).put(oitr, os, os.fill(), td); -Index: boost/date_time/string_convert.hpp -=================================================================== ---- boost/date_time/string_convert.hpp (revision 85073) -+++ boost/date_time/string_convert.hpp (working copy) -@@ -21,7 +21,6 @@ - inline - std::basic_string convert_string_type(const std::basic_string& inp_str) - { -- typedef std::basic_string input_type; - typedef std::basic_string output_type; - output_type result; - result.insert(result.begin(), inp_str.begin(), inp_str.end()); -Index: boost/date_time/strings_from_facet.hpp -=================================================================== ---- boost/date_time/strings_from_facet.hpp (revision 85073) -+++ boost/date_time/strings_from_facet.hpp (working copy) -@@ -35,7 +35,6 @@ - { - typedef std::basic_string string_type; - typedef std::vector collection_type; -- typedef std::basic_ostringstream ostream_type; - typedef std::ostreambuf_iterator ostream_iter_type; - typedef std::basic_ostringstream stringstream_type; - typedef std::time_put time_put_facet_type; -@@ -86,7 +85,6 @@ - { - typedef std::basic_string string_type; - typedef std::vector collection_type; -- typedef std::basic_ostringstream ostream_type; - typedef std::ostreambuf_iterator ostream_iter_type; - typedef std::basic_ostringstream stringstream_type; - typedef std::time_put time_put_facet_type; diff --git a/boost-1.54.0-numeric-unused_typedef.patch b/boost-1.54.0-numeric-unused_typedef.patch deleted file mode 100644 index b391725..0000000 --- a/boost-1.54.0-numeric-unused_typedef.patch +++ /dev/null @@ -1,250 +0,0 @@ -diff -up boost_1_54_0/boost/numeric/ublas/detail/matrix_assign.hpp~ boost_1_54_0/boost/numeric/ublas/detail/matrix_assign.hpp ---- boost_1_54_0/boost/numeric/ublas/detail/matrix_assign.hpp~ 2010-10-19 00:01:35.000000000 -0700 -+++ boost_1_54_0/boost/numeric/ublas/detail/matrix_assign.hpp 2013-07-22 04:33:26.399038120 -0700 -@@ -1303,7 +1303,6 @@ namespace detail { - void matrix_swap (M &m, matrix_expression &e, packed_proxy_tag, row_major_tag) { - typedef F functor_type; - // R unnecessary, make_conformant not required -- typedef typename M::size_type size_type; - typedef typename M::difference_type difference_type; - typename M::iterator1 it1 (m.begin1 ()); - typename E::iterator1 it1e (e ().begin1 ()); -@@ -1329,7 +1328,6 @@ namespace detail { - void matrix_swap (M &m, matrix_expression &e, packed_proxy_tag, column_major_tag) { - typedef F functor_type; - // R unnecessary, make_conformant not required -- typedef typename M::size_type size_type; - typedef typename M::difference_type difference_type; - typename M::iterator2 it2 (m.begin2 ()); - typename E::iterator2 it2e (e ().begin2 ()); -@@ -1357,7 +1355,6 @@ namespace detail { - typedef R conformant_restrict_type; - typedef typename M::size_type size_type; - typedef typename M::difference_type difference_type; -- typedef typename M::value_type value_type; - BOOST_UBLAS_CHECK (m.size1 () == e ().size1 (), bad_size ()); - BOOST_UBLAS_CHECK (m.size2 () == e ().size2 (), bad_size ()); - -@@ -1482,7 +1479,6 @@ namespace detail { - typedef R conformant_restrict_type; - typedef typename M::size_type size_type; - typedef typename M::difference_type difference_type; -- typedef typename M::value_type value_type; - BOOST_UBLAS_CHECK (m.size1 () == e ().size1 (), bad_size ()); - BOOST_UBLAS_CHECK (m.size2 () == e ().size2 (), bad_size ()); - -diff -up boost_1_54_0/boost/numeric/ublas/detail/vector_assign.hpp~ boost_1_54_0/boost/numeric/ublas/detail/vector_assign.hpp ---- boost_1_54_0/boost/numeric/ublas/detail/vector_assign.hpp~ 2007-11-25 10:07:19.000000000 -0800 -+++ boost_1_54_0/boost/numeric/ublas/detail/vector_assign.hpp 2013-07-22 04:32:21.774650296 -0700 -@@ -379,7 +379,6 @@ namespace detail { - typedef typename V::size_type size_type; - typedef typename V::difference_type difference_type; - typedef typename V::value_type value_type; -- typedef typename V::reference reference; - #if BOOST_UBLAS_TYPE_CHECK - vector cv (v.size ()); - indexing_vector_assign (cv, v); -@@ -513,7 +512,6 @@ namespace detail { - typedef F functor_type; - typedef typename V::size_type size_type; - typedef typename V::difference_type difference_type; -- typedef typename V::value_type value_type; - - detail::make_conformant (v, e); - // FIXME should be a seperate restriction for E -diff -up boost_1_54_0/boost/numeric/ublas/lu.hpp~ boost_1_54_0/boost/numeric/ublas/lu.hpp ---- boost_1_54_0/boost/numeric/ublas/lu.hpp~ 2010-07-04 23:06:24.000000000 -0700 -+++ boost_1_54_0/boost/numeric/ublas/lu.hpp 2013-07-22 04:40:06.634440205 -0700 -@@ -63,7 +63,6 @@ namespace boost { namespace numeric { na - BOOST_UBLAS_INLINE - void swap_rows (const PM &pm, MV &mv, vector_tag) { - typedef typename PM::size_type size_type; -- typedef typename MV::value_type value_type; - - size_type size = pm.size (); - for (size_type i = 0; i < size; ++ i) { -@@ -75,7 +74,6 @@ namespace boost { namespace numeric { na - BOOST_UBLAS_INLINE - void swap_rows (const PM &pm, MV &mv, matrix_tag) { - typedef typename PM::size_type size_type; -- typedef typename MV::value_type value_type; - - size_type size = pm.size (); - for (size_type i = 0; i < size; ++ i) { -diff -up boost_1_54_0/boost/numeric/ublas/operation.hpp~ boost_1_54_0/boost/numeric/ublas/operation.hpp ---- boost_1_54_0/boost/numeric/ublas/operation.hpp~ 2007-11-25 10:07:19.000000000 -0800 -+++ boost_1_54_0/boost/numeric/ublas/operation.hpp 2013-07-22 04:42:19.436046788 -0700 -@@ -129,7 +129,6 @@ namespace boost { namespace numeric { na - const vector_expression &e2, - V &v, packed_random_access_iterator_tag, row_major_tag) { - typedef const E1 expression1_type; -- typedef const E2 expression2_type; - typedef typename V::size_type size_type; - - typename expression1_type::const_iterator1 it1 (e1 ().begin1 ()); -@@ -159,7 +158,6 @@ namespace boost { namespace numeric { na - const vector_expression &e2, - V &v, packed_random_access_iterator_tag, column_major_tag) { - typedef const E1 expression1_type; -- typedef const E2 expression2_type; - typedef typename V::size_type size_type; - - typename expression1_type::const_iterator2 it2 (e1 ().begin2 ()); -@@ -188,9 +186,7 @@ namespace boost { namespace numeric { na - axpy_prod (const matrix_expression &e1, - const vector_expression &e2, - V &v, sparse_bidirectional_iterator_tag) { -- typedef const E1 expression1_type; - typedef const E2 expression2_type; -- typedef typename V::size_type size_type; - - typename expression2_type::const_iterator it (e2 ().begin ()); - typename expression2_type::const_iterator it_end (e2 ().end ()); -@@ -350,7 +346,6 @@ namespace boost { namespace numeric { na - axpy_prod (const vector_expression &e1, - const matrix_expression &e2, - V &v, packed_random_access_iterator_tag, column_major_tag) { -- typedef const E1 expression1_type; - typedef const E2 expression2_type; - typedef typename V::size_type size_type; - -@@ -380,7 +375,6 @@ namespace boost { namespace numeric { na - axpy_prod (const vector_expression &e1, - const matrix_expression &e2, - V &v, packed_random_access_iterator_tag, row_major_tag) { -- typedef const E1 expression1_type; - typedef const E2 expression2_type; - typedef typename V::size_type size_type; - -@@ -411,8 +405,6 @@ namespace boost { namespace numeric { na - const matrix_expression &e2, - V &v, sparse_bidirectional_iterator_tag) { - typedef const E1 expression1_type; -- typedef const E2 expression2_type; -- typedef typename V::size_type size_type; - - typename expression1_type::const_iterator it (e1 ().begin ()); - typename expression1_type::const_iterator it_end (e1 ().end ()); -@@ -501,9 +493,6 @@ namespace boost { namespace numeric { na - const matrix_expression &e2, - M &m, TRI, - dense_proxy_tag, row_major_tag) { -- typedef M matrix_type; -- typedef const E1 expression1_type; -- typedef const E2 expression2_type; - typedef typename M::size_type size_type; - typedef typename M::value_type value_type; - -@@ -530,11 +519,9 @@ namespace boost { namespace numeric { na - const matrix_expression &e2, - M &m, TRI, - sparse_proxy_tag, row_major_tag) { -- typedef M matrix_type; - typedef TRI triangular_restriction; - typedef const E1 expression1_type; - typedef const E2 expression2_type; -- typedef typename M::size_type size_type; - typedef typename M::value_type value_type; - - #if BOOST_UBLAS_TYPE_CHECK -@@ -580,9 +567,6 @@ namespace boost { namespace numeric { na - const matrix_expression &e2, - M &m, TRI, - dense_proxy_tag, column_major_tag) { -- typedef M matrix_type; -- typedef const E1 expression1_type; -- typedef const E2 expression2_type; - typedef typename M::size_type size_type; - typedef typename M::value_type value_type; - -@@ -609,11 +593,9 @@ namespace boost { namespace numeric { na - const matrix_expression &e2, - M &m, TRI, - sparse_proxy_tag, column_major_tag) { -- typedef M matrix_type; - typedef TRI triangular_restriction; - typedef const E1 expression1_type; - typedef const E2 expression2_type; -- typedef typename M::size_type size_type; - typedef typename M::value_type value_type; - - #if BOOST_UBLAS_TYPE_CHECK -@@ -738,9 +720,6 @@ namespace boost { namespace numeric { na - const matrix_expression &e2, - M &m, - dense_proxy_tag, row_major_tag) { -- typedef M matrix_type; -- typedef const E1 expression1_type; -- typedef const E2 expression2_type; - typedef typename M::size_type size_type; - typedef typename M::value_type value_type; - -@@ -769,9 +748,6 @@ namespace boost { namespace numeric { na - const matrix_expression &e2, - M &m, - dense_proxy_tag, column_major_tag) { -- typedef M matrix_type; -- typedef const E1 expression1_type; -- typedef const E2 expression2_type; - typedef typename M::size_type size_type; - typedef typename M::value_type value_type; - -diff -up boost_1_54_0/boost/numeric/ublas/triangular.hpp~ boost_1_54_0/boost/numeric/ublas/triangular.hpp ---- boost_1_54_0/boost/numeric/ublas/triangular.hpp~ 2012-09-18 14:07:07.000000000 -0700 -+++ boost_1_54_0/boost/numeric/ublas/triangular.hpp 2013-07-22 04:39:31.667230329 -0700 -@@ -1859,7 +1859,6 @@ namespace boost { namespace numeric { na - void inplace_solve (const matrix_expression &e1, vector_expression &e2, - lower_tag, column_major_tag, dense_proxy_tag) { - typedef typename E2::size_type size_type; -- typedef typename E2::difference_type difference_type; - typedef typename E2::value_type value_type; - - BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); -@@ -1914,7 +1913,6 @@ namespace boost { namespace numeric { na - void inplace_solve (const matrix_expression &e1, vector_expression &e2, - lower_tag, column_major_tag, unknown_storage_tag) { - typedef typename E2::size_type size_type; -- typedef typename E2::difference_type difference_type; - typedef typename E2::value_type value_type; - - BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); -@@ -1943,7 +1941,6 @@ namespace boost { namespace numeric { na - void inplace_solve (const matrix_expression &e1, vector_expression &e2, - lower_tag, row_major_tag, dense_proxy_tag) { - typedef typename E2::size_type size_type; -- typedef typename E2::difference_type difference_type; - typedef typename E2::value_type value_type; - - BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); -@@ -1969,7 +1966,6 @@ namespace boost { namespace numeric { na - void inplace_solve (const matrix_expression &e1, vector_expression &e2, - lower_tag, row_major_tag, packed_proxy_tag) { - typedef typename E2::size_type size_type; -- typedef typename E2::difference_type difference_type; - typedef typename E2::value_type value_type; - - BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); -@@ -1998,7 +1994,6 @@ namespace boost { namespace numeric { na - void inplace_solve (const matrix_expression &e1, vector_expression &e2, - lower_tag, row_major_tag, unknown_storage_tag) { - typedef typename E2::size_type size_type; -- typedef typename E2::difference_type difference_type; - typedef typename E2::value_type value_type; - - BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); -@@ -2374,7 +2369,6 @@ namespace boost { namespace numeric { na - void inplace_solve (const matrix_expression &e1, matrix_expression &e2, - lower_tag, dense_proxy_tag) { - typedef typename E2::size_type size_type; -- typedef typename E2::difference_type difference_type; - typedef typename E2::value_type value_type; - - BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); -@@ -2435,7 +2429,6 @@ namespace boost { namespace numeric { na - void inplace_solve (const matrix_expression &e1, matrix_expression &e2, - lower_tag, unknown_storage_tag) { - typedef typename E2::size_type size_type; -- typedef typename E2::difference_type difference_type; - typedef typename E2::value_type value_type; - - BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); diff --git a/boost-1.54.0-property_tree-unused_typedef.patch b/boost-1.54.0-property_tree-unused_typedef.patch deleted file mode 100644 index 05158ef..0000000 --- a/boost-1.54.0-property_tree-unused_typedef.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urp boost_1_54_0-orig/boost/property_tree/detail/xml_parser_write.hpp boost_1_54_0/boost/property_tree/detail/xml_parser_write.hpp ---- boost_1_54_0-orig/boost/property_tree/detail/xml_parser_write.hpp 2013-07-23 00:47:43.731888449 +0200 -+++ boost_1_54_0/boost/property_tree/detail/xml_parser_write.hpp 2013-07-23 00:50:40.597960319 +0200 -@@ -35,7 +35,6 @@ namespace boost { namespace property_tre - const xml_writer_settings & settings - ) - { -- typedef typename std::basic_string Str; - if (separate_line) - write_xml_indent(stream,indent,settings); - stream << Ch('<') << Ch('!') << Ch('-') << Ch('-'); -@@ -69,7 +68,6 @@ namespace boost { namespace property_tre - { - - typedef typename Ptree::key_type::value_type Ch; -- typedef typename std::basic_string Str; - typedef typename Ptree::const_iterator It; - - bool want_pretty = settings.indent_count > 0; diff --git a/boost-1.54.0-smart_ptr-shared_ptr_at.patch b/boost-1.54.0-smart_ptr-shared_ptr_at.patch deleted file mode 100644 index 675e13d..0000000 --- a/boost-1.54.0-smart_ptr-shared_ptr_at.patch +++ /dev/null @@ -1,88 +0,0 @@ -From f65c57d9d2a4f535e36c96b7f563574634e46b02 Mon Sep 17 00:00:00 2001 -From: Peter Dimov -Date: Wed, 12 Nov 2014 19:04:29 +0200 -Subject: [PATCH] Fix explicit instantiation regression - ---- - include/boost/smart_ptr/shared_ptr.hpp | 2 +- - test/Jamfile.v2 | 2 ++ - test/array_fail_array_access.cpp | 6 +++++- - test/sp_explicit_inst_test.cpp | 23 +++++++++++++++++++++++ - 4 files changed, 31 insertions(+), 2 deletions(-) - create mode 100644 test/sp_explicit_inst_test.cpp - -diff --git a/include/boost/smart_ptr/shared_ptr.hpp b/include/boost/smart_ptr/shared_ptr.hpp -index 82ece8b..8be92ab 100644 ---- a/boost/smart_ptr/shared_ptr.hpp -+++ b/boost/smart_ptr/shared_ptr.hpp -@@ -655,7 +655,7 @@ public: - BOOST_ASSERT( px != 0 ); - BOOST_ASSERT( i >= 0 && ( i < boost::detail::sp_extent< T >::value || boost::detail::sp_extent< T >::value == 0 ) ); - -- return px[ i ]; -+ return static_cast< typename boost::detail::sp_array_access< T >::type >( px[ i ] ); - } - - element_type * get() const BOOST_NOEXCEPT -diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 -index 027367c..0b51eee 100644 ---- a/libs/smart_ptr/test/Jamfile.v2 -+++ b/libs/smart_ptr/test/Jamfile.v2 -@@ -153,5 +153,7 @@ import testing ; - [ run allocate_shared_array_throws_test.cpp ] - [ run allocate_shared_array_esft_test.cpp ] - [ run allocate_shared_array_args_test.cpp ] -+ -+ [ compile sp_explicit_inst_test.cpp ] - ; - } -diff --git a/test/array_fail_array_access.cpp b/test/array_fail_array_access.cpp -index abfacbe..4f4e3f8 100644 ---- a/libs/smart_ptr/test/array_fail_array_access.cpp -+++ b/libs/smart_ptr/test/array_fail_array_access.cpp -@@ -12,8 +12,12 @@ struct X - { - }; - -+template void f( T & /*t*/ ) -+{ -+} -+ - int main() - { - boost::shared_ptr px( new X ); -- px[ 0 ]; -+ f( px[ 0 ] ); - } -diff --git a/test/sp_explicit_inst_test.cpp b/test/sp_explicit_inst_test.cpp -new file mode 100644 -index 0000000..d8de782 ---- /dev/null -+++ b/libs/smart_ptr/test/sp_explicit_inst_test.cpp -@@ -0,0 +1,23 @@ -+// -+// Explicit instantiations are reported to exist in user code -+// -+// Copyright (c) 2014 Peter Dimov -+// -+// Distributed under the Boost Software License, Version 1.0. -+// See accompanying file LICENSE_1_0.txt or copy at -+// http://www.boost.org/LICENSE_1_0.txt -+// -+ -+#include -+ -+template class boost::shared_ptr< int >; -+ -+struct X -+{ -+}; -+ -+template class boost::shared_ptr< X >; -+ -+int main() -+{ -+} --- -2.1.0 - diff --git a/boost-1.54.0-spirit-unused_typedef-2.patch b/boost-1.54.0-spirit-unused_typedef-2.patch deleted file mode 100644 index fdc9849..0000000 --- a/boost-1.54.0-spirit-unused_typedef-2.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urp boost_1_54_0-orig/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp boost_1_54_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp ---- boost_1_54_0-orig/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2013-07-23 00:47:37.497850668 +0200 -+++ boost_1_54_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2013-07-23 00:50:40.662960713 +0200 -@@ -307,7 +307,6 @@ struct grammar_definition - #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) - typedef impl::grammar_helper_base helper_base_t; - typedef grammar_helper_list helper_list_t; -- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; - - helper_list_t& helpers = - # if !defined(__GNUC__) || (__GNUC__ > 2) -diff -urp boost_1_54_0-orig/boost/spirit/home/classic/tree/parse_tree.hpp boost_1_54_0/boost/spirit/home/classic/tree/parse_tree.hpp ---- boost_1_54_0-orig/boost/spirit/home/classic/tree/parse_tree.hpp 2013-07-23 00:47:37.407850122 +0200 -+++ boost_1_54_0/boost/spirit/home/classic/tree/parse_tree.hpp 2013-07-23 00:50:40.674960786 +0200 -@@ -76,7 +76,6 @@ struct pt_tree_policy : - template - static void concat(MatchAT& a, MatchBT const& b) - { -- typedef typename match_t::attr_t attr_t; - BOOST_SPIRIT_ASSERT(a && b); - - std::copy(b.trees.begin(), b.trees.end(), diff --git a/boost-1.54.0-spirit-unused_typedef.patch b/boost-1.54.0-spirit-unused_typedef.patch deleted file mode 100644 index 830e418..0000000 --- a/boost-1.54.0-spirit-unused_typedef.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up boost_1_54_0/boost/spirit/home/classic/core/primitives/primitives.hpp~ boost_1_54_0/boost/spirit/home/classic/core/primitives/primitives.hpp ---- boost_1_54_0/boost/spirit/home/classic/core/primitives/primitives.hpp~ 2008-06-22 08:05:38.000000000 -0700 -+++ boost_1_54_0/boost/spirit/home/classic/core/primitives/primitives.hpp 2013-07-22 06:35:38.417914083 -0700 -@@ -47,7 +47,6 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN - typename parser_result::type - parse(ScannerT const& scan) const - { -- typedef typename parser_result::type result_t; - typedef typename ScannerT::value_t value_t; - typedef typename ScannerT::iterator_t iterator_t; - diff --git a/boost-1.54.0-static_warning-unused_typedef.patch b/boost-1.54.0-static_warning-unused_typedef.patch deleted file mode 100644 index 9418a17..0000000 --- a/boost-1.54.0-static_warning-unused_typedef.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up boost_1_54_0/boost/serialization/static_warning.hpp\~ boost_1_54_0/boost/serialization/static_warning.hpp ---- boost_1_54_0/boost/serialization/static_warning.hpp~ 2013-07-15 23:36:08.224983552 +0200 -+++ boost_1_54_0/boost/serialization/static_warning.hpp 2013-07-18 19:33:36.163463409 +0200 -@@ -72,6 +72,7 @@ - #include - #include - #include -+#include - - namespace boost { - namespace serialization { -@@ -101,7 +102,8 @@ struct BOOST_SERIALIZATION_SS {}; - #define BOOST_SERIALIZATION_BSW(B, L) \ - typedef boost::serialization::BOOST_SERIALIZATION_SS< \ - sizeof( boost::serialization::static_warning_test< B, L > ) \ -- > BOOST_JOIN(STATIC_WARNING_LINE, L); -+ > BOOST_JOIN(STATIC_WARNING_LINE, L) \ -+ BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE; - - #define BOOST_STATIC_WARNING(B) BOOST_SERIALIZATION_BSW(B, __LINE__) - - -Diff finished. Fri Jul 19 01:38:59 2013 diff --git a/boost-1.54.0-tuple-unused_typedef.patch b/boost-1.54.0-tuple-unused_typedef.patch deleted file mode 100644 index 51481c2..0000000 --- a/boost-1.54.0-tuple-unused_typedef.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: boost/tuple/detail/tuple_basic.hpp -=================================================================== ---- boost/tuple/detail/tuple_basic.hpp (revision 85075) -+++ boost/tuple/detail/tuple_basic.hpp (working copy) -@@ -225,7 +225,6 @@ - get(const cons& c BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) { - typedef BOOST_DEDUCED_TYPENAME detail::drop_front::BOOST_NESTED_TEMPLATE - apply > impl; -- typedef BOOST_DEDUCED_TYPENAME impl::type cons_element; - return impl::call(c).head; - } - diff --git a/boost-1.55.0-archive-init_order.patch b/boost-1.55.0-archive-init_order.patch deleted file mode 100644 index 7de81ef..0000000 --- a/boost-1.55.0-archive-init_order.patch +++ /dev/null @@ -1,13 +0,0 @@ -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-atomic-int128_1.patch b/boost-1.55.0-atomic-int128_1.patch deleted file mode 100644 index eafd53e..0000000 --- a/boost-1.55.0-atomic-int128_1.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6bb71fdd8f7cc346d90fb14beb38b7297fc1ffd9 Mon Sep 17 00:00:00 2001 -From: Andrey Semashev -Date: Sun, 26 Jan 2014 13:58:48 +0400 -Subject: [PATCH] Fixed incorrect initialization of 128-bit values, when no - native support for 128-bit integers is available. - ---- - include/boost/atomic/detail/cas128strong.hpp | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/include/boost/atomic/detail/cas128strong.hpp b/include/boost/atomic/detail/cas128strong.hpp -index 906c13e..dcb4d7d 100644 ---- a/include/boost/atomic/detail/cas128strong.hpp -+++ b/include/boost/atomic/detail/cas128strong.hpp -@@ -196,15 +196,17 @@ protected: - - public: - BOOST_DEFAULTED_FUNCTION(base_atomic(void), {}) -- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0) -+ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT - { -+ memset(&v_, 0, sizeof(v_)); - memcpy(&v_, &v, sizeof(value_type)); - } - - void - store(value_type const& value, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT - { -- storage_type value_s = 0; -+ storage_type value_s; -+ memset(&value_s, 0, sizeof(value_s)); - memcpy(&value_s, &value, sizeof(value_type)); - platform_fence_before_store(order); - platform_store128(value_s, &v_); -@@ -247,7 +249,9 @@ public: - memory_order success_order, - memory_order failure_order) volatile BOOST_NOEXCEPT - { -- storage_type expected_s = 0, desired_s = 0; -+ storage_type expected_s, desired_s; -+ memset(&expected_s, 0, sizeof(expected_s)); -+ memset(&desired_s, 0, sizeof(desired_s)); - memcpy(&expected_s, &expected, sizeof(value_type)); - memcpy(&desired_s, &desired, sizeof(value_type)); - --- -2.1.0 - diff --git a/boost-1.55.0-atomic-int128_2.patch b/boost-1.55.0-atomic-int128_2.patch deleted file mode 100644 index 212a67e..0000000 --- a/boost-1.55.0-atomic-int128_2.patch +++ /dev/null @@ -1,68 +0,0 @@ -From e4bde20f2eec0a51be14533871d2123bd2ab9cf3 Mon Sep 17 00:00:00 2001 -From: Andrey Semashev -Date: Fri, 28 Feb 2014 12:43:11 +0400 -Subject: [PATCH] More compilation fixes for the case when 128-bit integers are - not supported. - ---- - include/boost/atomic/detail/gcc-atomic.hpp | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/include/boost/atomic/detail/gcc-atomic.hpp b/include/boost/atomic/detail/gcc-atomic.hpp -index a130590..4af99a1 100644 ---- a/include/boost/atomic/detail/gcc-atomic.hpp -+++ b/include/boost/atomic/detail/gcc-atomic.hpp -@@ -958,14 +958,16 @@ protected: - - public: - BOOST_DEFAULTED_FUNCTION(base_atomic(void), {}) -- explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0) -+ explicit base_atomic(value_type const& v) BOOST_NOEXCEPT - { -+ memset(&v_, 0, sizeof(v_)); - memcpy(&v_, &v, sizeof(value_type)); - } - - void store(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT - { -- storage_type tmp = 0; -+ storage_type tmp; -+ memset(&tmp, 0, sizeof(tmp)); - memcpy(&tmp, &v, sizeof(value_type)); - __atomic_store_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order)); - } -@@ -980,7 +982,8 @@ public: - - value_type exchange(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT - { -- storage_type tmp = 0; -+ storage_type tmp; -+ memset(&tmp, 0, sizeof(tmp)); - memcpy(&tmp, &v, sizeof(value_type)); - tmp = __atomic_exchange_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order)); - value_type res; -@@ -994,7 +997,9 @@ public: - memory_order success_order, - memory_order failure_order) volatile BOOST_NOEXCEPT - { -- storage_type expected_s = 0, desired_s = 0; -+ storage_type expected_s, desired_s; -+ memset(&expected_s, 0, sizeof(expected_s)); -+ memset(&desired_s, 0, sizeof(desired_s)); - memcpy(&expected_s, &expected, sizeof(value_type)); - memcpy(&desired_s, &desired, sizeof(value_type)); - const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, false, -@@ -1010,7 +1015,9 @@ public: - memory_order success_order, - memory_order failure_order) volatile BOOST_NOEXCEPT - { -- storage_type expected_s = 0, desired_s = 0; -+ storage_type expected_s, desired_s; -+ memset(&expected_s, 0, sizeof(expected_s)); -+ memset(&desired_s, 0, sizeof(desired_s)); - memcpy(&expected_s, &expected, sizeof(value_type)); - memcpy(&desired_s, &desired, sizeof(value_type)); - const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, true, --- -2.1.0 - diff --git a/boost-1.55.0-program_options-class_attribute.patch b/boost-1.55.0-program_options-class_attribute.patch deleted file mode 100644 index cfd0df4..0000000 --- a/boost-1.55.0-program_options-class_attribute.patch +++ /dev/null @@ -1,14 +0,0 @@ -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& 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 deleted file mode 100644 index 399d99b..0000000 --- a/boost-1.55.0-spirit-unused_typedefs.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 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 deleted file mode 100644 index 1365d92..0000000 --- a/boost-1.55.0-xpressive-unused_typedefs.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 make_assert_en - template - inline sequence make_assert_word(Cond, Traits const &tr) - { -- typedef typename iterator_value::type char_type; - return detail::make_dynamic - ( - detail::assert_word_matcher(tr) diff --git a/boost-1.54.0-mpl-print.patch b/boost-1.57.0-mpl-print.patch similarity index 62% rename from boost-1.54.0-mpl-print.patch rename to boost-1.57.0-mpl-print.patch index 6c27b14..561cef1 100644 --- a/boost-1.54.0-mpl-print.patch +++ b/boost-1.57.0-mpl-print.patch @@ -1,15 +1,7 @@ -Index: boost/mpl/print.hpp -=================================================================== ---- boost/mpl/print.hpp (revision 83411) -+++ boost/mpl/print.hpp (working copy) -@@ -45,22 +45,21 @@ - : mpl::identity - #if defined(__MWERKS__) - , aux::print_base --#endif -+#endif - { - #if defined(BOOST_MSVC) +diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp +--- boost_1_57_0/boost/mpl/print.hpp~ 2014-07-09 23:12:31.000000000 +0200 ++++ boost_1_57_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100 +@@ -52,16 +52,15 @@ struct print enum { n = sizeof(T) + -1 }; #elif defined(__MWERKS__) void f(int); @@ -35,3 +27,5 @@ Index: boost/mpl/print.hpp }; #if defined(BOOST_MSVC) + +Diff finished. Tue Jan 20 12:45:03 2015 diff --git a/boost-1.54.0-pool-test_linking.patch b/boost-1.57.0-pool-test_linking.patch similarity index 74% rename from boost-1.54.0-pool-test_linking.patch rename to boost-1.57.0-pool-test_linking.patch index 0f749f7..57e6206 100644 --- a/boost-1.54.0-pool-test_linking.patch +++ b/boost-1.57.0-pool-test_linking.patch @@ -1,8 +1,8 @@ -diff -up ./libs/pool/test/Jamfile.v2~ ./libs/pool/test/Jamfile.v2 ---- ./libs/pool/test/Jamfile.v2~ 2011-08-02 19:04:07.000000000 +0200 -+++ ./libs/pool/test/Jamfile.v2 2013-08-22 11:48:34.907287286 +0200 -@@ -24,17 +24,17 @@ run valgrind_config_check.cpp : : : "valgrind --error-exitcode=1" : no ] ; test-suite pool : - [ run test_simple_seg_storage.cpp ] @@ -29,3 +29,5 @@ diff -up ./libs/pool/test/Jamfile.v2~ ./libs/pool/test/Jamfile.v2 [ compile test_poisoned_macros.cpp ] # + +Diff finished. Tue Jan 20 13:59:16 2015 diff --git a/boost-1.55.0-python-abi_letters.patch b/boost-1.57.0-python-abi_letters.patch similarity index 92% rename from boost-1.55.0-python-abi_letters.patch rename to boost-1.57.0-python-abi_letters.patch index 71fa9bd..7df3ee7 100644 --- a/boost-1.55.0-python-abi_letters.patch +++ b/boost-1.57.0-python-abi_letters.patch @@ -1,5 +1,5 @@ ---- boost_1_55_0/tools/build/v2/tools/python.jam 2013-05-21 06:14:18.000000000 +0200 -+++ boost_1_55_0/tools/build/v2/tools/python.jam 2014-05-29 19:09:12.115413877 +0200 +--- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200 ++++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200 @@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti # using python : 2.3 : /usr/local/bin/python ; # diff --git a/boost-1.55.0-python-libpython_dep.patch b/boost-1.57.0-python-libpython_dep.patch similarity index 59% rename from boost-1.55.0-python-libpython_dep.patch rename to boost-1.57.0-python-libpython_dep.patch index 202f4ec..57bfc26 100644 --- a/boost-1.55.0-python-libpython_dep.patch +++ b/boost-1.57.0-python-libpython_dep.patch @@ -1,7 +1,7 @@ -Index: boost/tools/build/v2/tools/python.jam +Index: boost_1_57_0/tools/build/src/tools/python.jam =================================================================== ---- boost/tools/build/v2/tools/python.jam (revision 50406) -+++ boost/tools/build/v2/tools/python.jam (working copy) +--- boost_1_57_0/tools/build/src/tools/python.jam (revision 50406) ++++ boost_1_57_0/tools/build/src/tools/python.jam (working copy) @@ -994,7 +994,7 @@ else { diff --git a/boost-1.57.0-spirit-unused_typedef.patch b/boost-1.57.0-spirit-unused_typedef.patch new file mode 100644 index 0000000..2829629 --- /dev/null +++ b/boost-1.57.0-spirit-unused_typedef.patch @@ -0,0 +1,19 @@ +diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp +--- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~ 2014-10-13 12:21:40.000000000 +0200 ++++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-01-20 13:25:50.069710766 +0100 +@@ -282,12 +282,12 @@ struct grammar_definition + #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) + typedef impl::grammar_helper_base helper_base_t; + typedef grammar_helper_list helper_list_t; +- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; + + helper_list_t& helpers = + grammartract_helper_list::do_(self); + + # if defined(BOOST_INTEL_CXX_VERSION) ++ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; + for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) + (*i)->undefine(self); + # else + +Diff finished. Tue Jan 20 13:25:53 2015 diff --git a/boost.spec b/boost.spec index e311091..fb9fbd7 100644 --- a/boost.spec +++ b/boost.spec @@ -34,9 +34,9 @@ Name: boost Summary: The free peer-reviewed portable C++ source libraries -Version: 1.55.0 -%define version_enc 1_55_0 -Release: 8%{?dist} +Version: 1.57.0 +%define version_enc 1_57_0 +Release: 1%{?dist} License: Boost and MIT and Python %define toplev_dirname %{name}_%{version_enc} @@ -102,72 +102,27 @@ Patch5: boost-1.48.0-add-bjam-man-page.patch # https://svn.boost.org/trac/boost/ticket/6701 Patch15: boost-1.50.0-pool.patch -# https://svn.boost.org/trac/boost/ticket/8844 -Patch23: boost-1.54.0-bind-static_assert.patch - -# https://svn.boost.org/trac/boost/ticket/8847 -Patch24: boost-1.54.0-concept-unused_typedef.patch - # https://svn.boost.org/trac/boost/ticket/5637 -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/8853 -Patch31: boost-1.54.0-tuple-unused_typedef.patch - -# https://svn.boost.org/trac/boost/ticket/8854 -Patch32: boost-1.54.0-random-unused_typedef.patch - -# https://svn.boost.org/trac/boost/ticket/8856 -Patch33: boost-1.54.0-date_time-unused_typedef.patch -Patch34: boost-1.54.0-date_time-unused_typedef-2.patch +Patch25: boost-1.57.0-mpl-print.patch # https://svn.boost.org/trac/boost/ticket/8870 -Patch35: boost-1.54.0-spirit-unused_typedef.patch -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 +Patch36: boost-1.57.0-spirit-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/8888 Patch49: boost-1.54.0-python-unused_typedef.patch # https://svn.boost.org/trac/boost/ticket/9038 -Patch51: boost-1.54.0-pool-test_linking.patch +Patch51: boost-1.57.0-pool-test_linking.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/8725 -Patch54: boost-1.55.0-program_options-class_attribute.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 - -# https://bugzilla.redhat.com/show_bug.cgi?id=1159960 -Patch58: boost-1.54.0-smart_ptr-shared_ptr_at.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=1177066 -Patch59: boost-1.55.0-atomic-int128_1.patch -Patch60: boost-1.55.0-atomic-int128_2.patch - # https://bugzilla.redhat.com/show_bug.cgi?id=1102667 -Patch61: boost-1.55.0-python-libpython_dep.patch -Patch62: boost-1.55.0-python-abi_letters.patch +Patch61: boost-1.57.0-python-libpython_dep.patch +Patch62: boost-1.57.0-python-abi_letters.patch Patch63: boost-1.55.0-python-test-PyImport_AppendInittab.patch %bcond_with tests @@ -203,6 +158,17 @@ Requires: boost-system%{?_isa} = %{version}-%{release} Run-Time support for Boost.Chrono, a set of useful time utilities. +%package container +Summary: Run-Time component of boost container library +Group: System Environment/Libraries + +%description container + +Boost.Container library implements several well-known containers, +including STL containers. The aim of the library is to offers advanced +features not present in standard containers or to offer the latest +standard draft features for compilers that comply with C++03. + %if %{with context} %package context Summary: Run-Time component of boost context switching library @@ -636,29 +602,12 @@ a number of significant features and is now developed independently %patch4 -p1 %patch5 -p1 %patch15 -p0 -%patch23 -p1 -%patch24 -p1 -%patch25 -p0 -%patch26 -p1 -%patch31 -p0 -%patch32 -p0 -%patch33 -p0 -%patch34 -p1 -%patch35 -p1 +%patch25 -p1 %patch36 -p1 -%patch37 -p1 %patch45 -p1 -%patch46 -p1 %patch49 -p1 %patch51 -p1 %patch53 -p1 -%patch54 -p1 -%patch55 -p1 -%patch56 -p1 -%patch57 -p1 -%patch58 -p1 -%patch59 -p2 -%patch60 -p2 %patch61 -p1 %patch62 -p1 %patch63 -p1 @@ -678,7 +627,7 @@ a number of significant features and is now developed independently : PYTHON3_ABIFLAGS=%{python3_abiflags} %endif -cat >> ./tools/build/v2/user-config.jam << EOF +cat > ./tools/build/src/user-config.jam << EOF # There are many strict aliasing warnings, and it's not feasible to go # through them all at this time. using gcc : : : -fno-strict-aliasing ; @@ -762,7 +711,7 @@ export PATH=/bin${PATH:+:}$PATH %endif echo ============================= build Boost.Build ================== -(cd tools/build/v2 +(cd tools/build ./bootstrap.sh --with-toolset=gcc) %check @@ -831,19 +780,19 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libboost_thread.so install -p -m 644 $(basename %{SOURCE2}) $RPM_BUILD_ROOT%{_libdir}/ echo ============================= install Boost.Build ================== -(cd tools/build/v2 +(cd tools/build ./b2 --prefix=$RPM_BUILD_ROOT%{_prefix} install # Fix some permissions - chmod -x $RPM_BUILD_ROOT%{_datadir}/boost-build/build/alias.py - chmod +x $RPM_BUILD_ROOT%{_datadir}/boost-build/tools/doxproc.py + chmod -x $RPM_BUILD_ROOT%{_datadir}/boost-build/src/build/alias.py + chmod +x $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxproc.py # We don't want to distribute this rm -f $RPM_BUILD_ROOT%{_bindir}/b2 # Not a real file - rm -f $RPM_BUILD_ROOT%{_datadir}/boost-build/build/project.ann.py + rm -f $RPM_BUILD_ROOT%{_datadir}/boost-build/src/build/project.ann.py # Empty file - rm -f $RPM_BUILD_ROOT%{_datadir}/boost-build/tools/doxygen/windows-paths-check.hpp + rm -f $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxygen/windows-paths-check.hpp # Install the manual page - %{__install} -p -m 644 doc/bjam.1 -D $RPM_BUILD_ROOT%{_mandir}/man1/bjam.1 + %{__install} -p -m 644 v2/doc/bjam.1 -D $RPM_BUILD_ROOT%{_mandir}/man1/bjam.1 ) # Install documentation files (HTML pages) within the temporary place @@ -924,6 +873,10 @@ rm -rf $RPM_BUILD_ROOT %postun chrono -p /sbin/ldconfig +%post container -p /sbin/ldconfig + +%postun container -p /sbin/ldconfig + %if %{with context} %post context -p /sbin/ldconfig @@ -1022,6 +975,11 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE_1_0.txt %{_libdir}/libboost_chrono.so.%{sonamever} +%files container +%defattr(-, root, root, -) +%doc LICENSE_1_0.txt +%{_libdir}/libboost_container.so.%{sonamever} + %if %{with context} %files context @@ -1160,6 +1118,7 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/%{name} %{_libdir}/libboost_atomic.so %{_libdir}/libboost_chrono.so +%{_libdir}/libboost_container.so %if %{with context} %{_libdir}/libboost_context.so %{_libdir}/libboost_coroutine.so @@ -1266,6 +1225,34 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/bjam.1* %changelog +* Tue Jan 20 2015 Petr Machata - 1.57.0-1 +- Rebase to 1.57.0 + - Drop patches: + boost-1.54.0-bind-static_assert.patch + boost-1.54.0-concept-unused_typedef.patch + boost-1.54.0-static_warning-unused_typedef.patch + boost-1.54.0-tuple-unused_typedef.patch + boost-1.54.0-random-unused_typedef.patch + boost-1.54.0-date_time-unused_typedef.patch + boost-1.54.0-date_time-unused_typedef-2.patch + boost-1.54.0-spirit-unused_typedef.patch + boost-1.54.0-numeric-unused_typedef.patch + boost-1.54.0-property_tree-unused_typedef.patch + boost-1.55.0-program_options-class_attribute.patch + boost-1.55.0-archive-init_order.patch + boost-1.55.0-xpressive-unused_typedefs.patch + boost-1.55.0-spirit-unused_typedefs.patch + boost-1.54.0-smart_ptr-shared_ptr_at.patch + boost-1.55.0-atomic-int128_1.patch + boost-1.55.0-atomic-int128_2.patch + + - Rebase patches: + boost-1.54.0-mpl-print.patch -> boost-1.57.0-mpl-print.patch + boost-1.54.0-spirit-unused_typedef-2.patch -> boost-1.57.0-spirit-unused_typedef.patch + boost-1.54.0-pool-test_linking.patch -> boost-1.57.0-pool-test_linking.patch + + - Add new subpackages boost-container + * Fri Jan 9 2015 Petr Machata - 1.55.0-8 - Build libboost_python and libboost_python3 such that they depend on their respective libpython's.