From e4c6cbeb68998472ef14afab4baa74f428975927fce62c6fd66f20d4ba369ada Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 19 Mar 2013 06:51:50 +0000 Subject: [PATCH 1/4] Accepting request 159900 from home:DarkSS:stuff Fixed up update to ver. 1.53.0. Great thanks to namtrac for remarks! OBS-URL: https://build.opensuse.org/request/show/159900 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=98 --- baselibs.conf | 34 +- boost-chrono_add_function_return.patch | 12 - boost-fix_documentation.patch | 256 -------------- boost-time_utc.patch | 318 ------------------ boost.changes | 22 ++ boost.spec | 47 ++- boost_1_49_0.tar.bz2 | 3 - boost_1_49_pdf.tar.bz2 | 3 - boost_1_53_0.tar.bz2 | 3 + ...1_49_man.tar.bz2 => boost_1_53_man.tar.bz2 | 0 boost_1_53_pdf.tar.bz2 | 3 + 11 files changed, 82 insertions(+), 619 deletions(-) delete mode 100644 boost-chrono_add_function_return.patch delete mode 100644 boost-fix_documentation.patch delete mode 100644 boost-time_utc.patch delete mode 100644 boost_1_49_0.tar.bz2 delete mode 100644 boost_1_49_pdf.tar.bz2 create mode 100644 boost_1_53_0.tar.bz2 rename boost_1_49_man.tar.bz2 => boost_1_53_man.tar.bz2 (100%) create mode 100644 boost_1_53_pdf.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index ab893c1..f736776 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,18 +1,20 @@ package boost-devel requires -boost- -libboost_date_time1_49_0 -libboost_filesystem1_49_0 -libboost_graph1_49_0 -libboost_iostreams1_49_0 -libboost_math1_49_0 -libboost_mpi1_49_0 -libboost_test1_49_0 -libboost_program_options1_49_0 -libboost_python1_49_0 -libboost_random1_49_0 -libboost_serialization1_49_0 -libboost_signals1_49_0 -libboost_system1_49_0 -libboost_thread1_49_0 -libboost_wave1_49_0 -libboost_regex1_49_0 +libboost_atomic1_53_0 +libboost_context1_53_0 +libboost_date_time1_53_0 +libboost_filesystem1_53_0 +libboost_graph1_53_0 +libboost_iostreams1_53_0 +libboost_math1_53_0 +libboost_mpi1_53_0 +libboost_test1_53_0 +libboost_program_options1_53_0 +libboost_python1_53_0 +libboost_random1_53_0 +libboost_serialization1_53_0 +libboost_signals1_53_0 +libboost_system1_53_0 +libboost_thread1_53_0 +libboost_wave1_53_0 +libboost_regex1_53_0 diff --git a/boost-chrono_add_function_return.patch b/boost-chrono_add_function_return.patch deleted file mode 100644 index be08043..0000000 --- a/boost-chrono_add_function_return.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp -=================================================================== ---- boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp.orig 2011-11-26 01:49:13.000000000 +0100 -+++ boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp 2012-03-13 19:34:38.197168044 +0100 -@@ -213,6 +213,7 @@ process_system_cpu_clock::time_point pro - else - { - BOOST_ASSERT(0 && "Boost::Chrono - Internal Error"); -+ return time_point(); - } - } - } diff --git a/boost-fix_documentation.patch b/boost-fix_documentation.patch deleted file mode 100644 index a9e592f..0000000 --- a/boost-fix_documentation.patch +++ /dev/null @@ -1,256 +0,0 @@ -Index: boost/accumulators/framework/accumulator_set.hpp -=================================================================== ---- boost/accumulators/framework/accumulator_set.hpp.orig 2012-03-13 17:20:43.831945305 +0100 -+++ boost/accumulators/framework/accumulator_set.hpp 2012-03-13 17:22:18.819680809 +0100 -@@ -234,7 +234,6 @@ struct accumulator_set - - /////////////////////////////////////////////////////////////////////////////// - /// Accumulation -- /// \param a1 Optional named parameter to be passed to all the accumulators - void operator ()() - { - this->visit( -@@ -244,6 +243,7 @@ struct accumulator_set - ); - } - -+ /// \param a1 Optional named parameter to be passed to all the accumulators - template - void operator ()(A1 const &a1) - { -Index: boost/accumulators/framework/extractor.hpp -=================================================================== ---- boost/accumulators/framework/extractor.hpp.orig 2012-03-13 17:20:43.831945305 +0100 -+++ boost/accumulators/framework/extractor.hpp 2012-03-13 17:22:18.819680809 +0100 -@@ -94,7 +94,6 @@ struct extractor - }; - - /// Extract the result associated with Feature from the accumulator set -- /// \param acc The accumulator set object from which to extract the result - template - typename detail::extractor_result::type - operator ()(Arg1 const &arg1) const -@@ -106,6 +105,7 @@ struct extractor - - /// \overload - /// -+ /// \param acc The accumulator set object from which to extract the result - /// \param a1 Optional named parameter to be passed to the accumulator's result() function. - template - typename detail::extractor_result::type -Index: boost/algorithm/string/finder.hpp -=================================================================== ---- boost/algorithm/string/finder.hpp.orig 2012-03-13 17:20:43.831945305 +0100 -+++ boost/algorithm/string/finder.hpp 2012-03-13 17:22:18.819680809 +0100 -@@ -43,7 +43,6 @@ namespace boost { - The result is given as an \c iterator_range delimiting the match. - - \param Search A substring to be searched for. -- \param Comp An element comparison predicate - \return An instance of the \c first_finder object - */ - template -@@ -62,6 +61,7 @@ namespace boost { - //! "First" finder - /*! - \overload -+ \param Comp An element comparison predicate - */ - template - inline detail::first_finderF< -@@ -84,7 +84,6 @@ namespace boost { - The result is given as an \c iterator_range delimiting the match. - - \param Search A substring to be searched for. -- \param Comp An element comparison predicate - \return An instance of the \c last_finder object - */ - template -@@ -102,6 +101,7 @@ namespace boost { - //! "Last" finder - /*! - \overload -+ \param Comp An element comparison predicate - */ - template - inline detail::last_finderF< -@@ -124,7 +124,6 @@ namespace boost { - - \param Search A substring to be searched for. - \param Nth An index of the match to be find -- \param Comp An element comparison predicate - \return An instance of the \c nth_finder object - */ - template -@@ -144,6 +143,7 @@ namespace boost { - //! "Nth" finder - /*! - \overload -+ \param Comp An element comparison predicate - */ - template - inline detail::nth_finderF< -@@ -230,7 +230,6 @@ namespace boost { - - \param Begin Beginning of the range - \param End End of the range -- \param Range The range. - \return An instance of the \c range_finger object - */ - template< typename ForwardIteratorT > -@@ -245,6 +244,7 @@ namespace boost { - //! "Range" finder - /*! - \overload -+ \param Range The range. - */ - template< typename ForwardIteratorT > - inline detail::range_finderF -Index: boost/algorithm/string/formatter.hpp -=================================================================== ---- boost/algorithm/string/formatter.hpp.orig 2012-03-13 17:20:43.831945305 +0100 -+++ boost/algorithm/string/formatter.hpp 2012-03-13 17:22:18.819680809 +0100 -@@ -76,8 +76,6 @@ namespace boost { - Constructs an \c empty_formatter. Empty formatter always returns an empty - sequence. - -- \param Input container used to select a correct value_type for the -- resulting empty_container<>. - \return An instance of the \c empty_formatter object. - */ - template -Index: boost/date_time/dst_rules.hpp -=================================================================== ---- boost/date_time/dst_rules.hpp.orig 2012-03-13 17:20:43.831945305 +0100 -+++ boost/date_time/dst_rules.hpp 2012-03-13 17:22:18.820680785 +0100 -@@ -94,7 +94,7 @@ namespace boost { - * @param dst_start_offset Time offset within day for dst boundary - * @param dst_end_day Ending day of dst for the given locality - * @param dst_end_offset Time offset within day given in dst for dst boundary -- * @param dst_length lenght of dst adjusment -+ * @param dst_length_minutes length of dst adjustment - * @retval The time is either ambiguous, invalid, in dst, or not in dst - */ - static time_is_dst_result -Index: boost/date_time/strings_from_facet.hpp -=================================================================== ---- boost/date_time/strings_from_facet.hpp.orig 2012-03-13 17:20:43.831945305 +0100 -+++ boost/date_time/strings_from_facet.hpp 2012-03-13 17:22:18.820680785 +0100 -@@ -21,8 +21,9 @@ namespace boost { namespace date_time { - * all the month strings from a locale. This is handy when building - * custom date parsers or formatters that need to be localized. - * -- *@param charT The type of char to use when gathering typically char -- * or wchar_t. -+ *! charT The type of char to use when gathering, typically char -+ * or wchar_t. -+ * - *@param locale The locale to use when gathering the strings - *@param short_strings True(default) to gather short strings, - * false for long strings. -@@ -71,8 +72,9 @@ gather_month_strings(const std::locale& - * 'Sunday'. This is handy when building custom date parsers or - * formatters that need to be localized. - * -- *@param charT The type of char to use when gathering typically char -- * or wchar_t. -+ *! charT The type of char to use when gathering, typically char -+ * or wchar_t. -+ * - *@param locale The locale to use when gathering the strings - *@param short_strings True(default) to gather short strings, - * false for long strings. -Index: boost/date_time/time_zone_names.hpp -=================================================================== ---- boost/date_time/time_zone_names.hpp.orig 2012-03-13 17:20:43.832945281 +0100 -+++ boost/date_time/time_zone_names.hpp 2012-03-13 17:22:18.820680785 +0100 -@@ -43,7 +43,7 @@ namespace date_time { - * name: Pacific Standard Time and the abbreviated name: PST. - * During daylight savings there are additional names: - * Pacific Daylight Time and PDT. -- *@parm CharT Allows class to support different character types -+ *@param CharT Allows the class to support different character types - */ - template - class time_zone_names_base -Index: boost/intrusive/linear_slist_algorithms.hpp -=================================================================== ---- boost/intrusive/linear_slist_algorithms.hpp.orig 2012-03-13 17:20:43.832945281 +0100 -+++ boost/intrusive/linear_slist_algorithms.hpp 2012-03-13 17:22:18.820680785 +0100 -@@ -60,9 +60,9 @@ class linear_slist_algorithms - - #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) - -- //! Effects: Constructs an non-used list element, putting the next -+ //! Effects: Constructs n non-used list element, putting the next - //! pointer to null: -- //! NodeTraits::get_next(this_node) == node_ptr() -+ //! NodeTraits::get_next(this_node) == 0 - //! - //! Complexity: Constant - //! -Index: boost/mpi/collectives.hpp -=================================================================== ---- boost/mpi/collectives.hpp.orig 2012-03-13 17:20:43.832945281 +0100 -+++ boost/mpi/collectives.hpp 2012-03-13 17:22:18.820680785 +0100 -@@ -219,10 +219,6 @@ all_to_all(const communicator& comm, con - * non-roots will reshape the objects held in their proxies based on - * the skeleton sent from the root. - * -- * @param n When supplied, the number of values that the pointer @p -- * values points to, for broadcasting an array of values. The value -- * of @p n must be the same for all processes in @p comm. -- * - * @param root The rank/process ID of the process that will be - * transmitting the value. - */ -@@ -231,6 +227,10 @@ void broadcast(const communicator& comm, - - /** - * \overload -+ * @param n When supplied, the number of values that the pointer @p -+ * values points to, for broadcasting an array of values. The value -+ * of @p n must be the same for all processes in @p comm. -+ * - */ - template - void broadcast(const communicator& comm, T* values, int n, int root); -Index: boost/mpi/operations.hpp -=================================================================== ---- boost/mpi/operations.hpp.orig 2012-03-13 17:20:43.832945281 +0100 -+++ boost/mpi/operations.hpp 2012-03-13 17:22:18.820680785 +0100 -@@ -13,7 +13,7 @@ - * This header provides a mapping from function objects to @c MPI_Op - * constants used in MPI collective operations. It also provides - * several new function object types not present in the standard @c -- * header that have direct mappings to @c MPI_Op. -+ * <functional> header that have direct mappings to @c MPI_Op. - */ - #ifndef BOOST_MPI_IS_MPI_OP_HPP - #define BOOST_MPI_IS_MPI_OP_HPP -Index: boost/program_options/value_semantic.hpp -=================================================================== ---- boost/program_options/value_semantic.hpp.orig 2012-03-13 17:20:43.832945281 +0100 -+++ boost/program_options/value_semantic.hpp 2012-03-13 17:22:18.820680785 +0100 -@@ -385,7 +385,7 @@ namespace boost { namespace program_opti - typed_value* - wvalue(T* v); - -- /** Works the same way as the 'value' function, but the created -+ /** Works the same way as the 'value<bool>' function, but the created - value_semantic won't accept any explicit value. So, if the option - is present on the command line, the value will be 'true'. - */ -Index: libs/mpi/doc/mpi.qbk -=================================================================== ---- libs/mpi/doc/mpi.qbk.orig 2012-03-13 17:20:43.832945281 +0100 -+++ libs/mpi/doc/mpi.qbk 2012-03-13 17:22:18.821680761 +0100 -@@ -1846,7 +1846,7 @@ routine, e.g., - - `skeleton_proxy` objects can be received on the other end via `recv()`, - which stores a newly-created instance of your data structure with the --same "shape" as the sender in its `"object` attribute: -+same "shape" as the sender in its `object` attribute: - - shape = mpi.world.recv(0, 0) - my_data_structure = shape.object diff --git a/boost-time_utc.patch b/boost-time_utc.patch deleted file mode 100644 index 92157e5..0000000 --- a/boost-time_utc.patch +++ /dev/null @@ -1,318 +0,0 @@ -From: https://svn.boost.org/trac/boost/changeset/78802 - -Message: - Thread: fix TIME_UTC, WINVER, constexpr for tags, and don't use local files - -Only the TIME_UTC_ change is taken - -Index: boost_1_49_0/boost/thread/xtime.hpp -=================================================================== ---- boost_1_49_0.orig/boost/thread/xtime.hpp -+++ boost_1_49_0/boost/thread/xtime.hpp -@@ -2,7 +2,7 @@ - // William E. Kempf - // Copyright (C) 2007-8 Anthony Williams - // --// Distributed under the Boost Software License, Version 1.0. (See accompanying -+// 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) - - #ifndef BOOST_XTIME_WEK070601_HPP -@@ -20,7 +20,7 @@ namespace boost { - - enum xtime_clock_types - { -- TIME_UTC=1 -+ TIME_UTC_=1 - // TIME_TAI, - // TIME_MONOTONIC, - // TIME_PROCESS, -@@ -53,14 +53,14 @@ struct xtime - boost::posix_time::microseconds((nsec+500)/1000); - #endif - } -- -+ - }; - - inline xtime get_xtime(boost::system_time const& abs_time) - { - xtime res; - boost::posix_time::time_duration const time_since_epoch=abs_time-boost::posix_time::from_time_t(0); -- -+ - res.sec=static_cast(time_since_epoch.total_seconds()); - res.nsec=static_cast(time_since_epoch.fractional_seconds()*(1000000000/time_since_epoch.ticks_per_second())); - return res; -@@ -68,7 +68,7 @@ inline xtime get_xtime(boost::system_tim - - inline int xtime_get(struct xtime* xtp, int clock_type) - { -- if (clock_type == TIME_UTC) -+ if (clock_type == TIME_UTC_) - { - *xtp=get_xtime(get_system_time()); - return clock_type; -@@ -81,7 +81,7 @@ inline int xtime_cmp(const xtime& xt1, c - { - if (xt1.sec == xt2.sec) - return (int)(xt1.nsec - xt2.nsec); -- else -+ else - return (xt1.sec > xt2.sec) ? 1 : -1; - } - -Index: boost_1_49_0/libs/thread/example/starvephil.cpp -=================================================================== ---- boost_1_49_0.orig/libs/thread/example/starvephil.cpp -+++ boost_1_49_0/libs/thread/example/starvephil.cpp -@@ -50,7 +50,7 @@ public: - << "very hot ..." << std::endl; - } - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 3; - boost::thread::sleep(xt); - m_chickens += value; -@@ -85,7 +85,7 @@ void chef() - std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl; - } - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 2; - boost::thread::sleep(xt); - { -@@ -111,7 +111,7 @@ struct phil - if (m_id > 0) - { - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 3; - boost::thread::sleep(xt); - } -Index: boost_1_49_0/libs/thread/example/tennis.cpp -=================================================================== ---- boost_1_49_0.orig/libs/thread/example/tennis.cpp -+++ boost_1_49_0/libs/thread/example/tennis.cpp -@@ -1,7 +1,7 @@ - // Copyright (C) 2001-2003 - // William E. Kempf - // --// Distributed under the Boost Software License, Version 1.0. (See accompanying -+// 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 -@@ -104,7 +104,7 @@ int main(int argc, char* argv[]) - boost::thread thrdb(thread_adapter(&player, (void*)PLAYER_B)); - - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 1; - boost::thread::sleep(xt); - { -Index: boost_1_49_0/libs/thread/example/thread.cpp -=================================================================== ---- boost_1_49_0.orig/libs/thread/example/thread.cpp -+++ boost_1_49_0/libs/thread/example/thread.cpp -@@ -14,7 +14,7 @@ struct thread_alarm - void operator()() - { - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += m_secs; - - boost::thread::sleep(xt); -Index: boost_1_49_0/libs/thread/example/xtime.cpp -=================================================================== ---- boost_1_49_0.orig/libs/thread/example/xtime.cpp -+++ boost_1_49_0/libs/thread/example/xtime.cpp -@@ -10,7 +10,7 @@ - int main(int argc, char* argv[]) - { - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 1; - boost::thread::sleep(xt); // Sleep for 1 second - } -Index: boost_1_49_0/libs/thread/src/pthread/thread.cpp -=================================================================== ---- boost_1_49_0.orig/libs/thread/src/pthread/thread.cpp -+++ boost_1_49_0/libs/thread/src/pthread/thread.cpp -@@ -23,7 +23,7 @@ - #include - #endif - --#include "timeconv.inl" -+#include - - namespace boost - { -@@ -354,7 +354,7 @@ namespace boost - cond.timed_wait(lock, xt); - # endif - xtime cur; -- xtime_get(&cur, TIME_UTC); -+ xtime_get(&cur, TIME_UTC_); - if (xtime_cmp(xt, cur) <= 0) - return; - } -@@ -369,7 +369,7 @@ namespace boost - BOOST_VERIFY(!pthread_yield()); - # else - xtime xt; -- xtime_get(&xt, TIME_UTC); -+ xtime_get(&xt, TIME_UTC_); - sleep(xt); - # endif - } -Index: boost_1_49_0/libs/thread/src/pthread/timeconv.inl -=================================================================== ---- boost_1_49_0.orig/libs/thread/src/pthread/timeconv.inl -+++ boost_1_49_0/libs/thread/src/pthread/timeconv.inl -@@ -20,8 +20,8 @@ const int NANOSECONDS_PER_MICROSECOND = - inline void to_time(int milliseconds, boost::xtime& xt) - { - int res = 0; -- res = boost::xtime_get(&xt, boost::TIME_UTC); -- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; -+ res = boost::xtime_get(&xt, boost::TIME_UTC_); -+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; - - xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); - xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) * -@@ -56,8 +56,8 @@ inline void to_timespec_duration(const b - { - boost::xtime cur; - int res = 0; -- res = boost::xtime_get(&cur, boost::TIME_UTC); -- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; -+ res = boost::xtime_get(&cur, boost::TIME_UTC_); -+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; - - if (boost::xtime_cmp(xt, cur) <= 0) - { -@@ -87,8 +87,8 @@ inline void to_duration(boost::xtime xt, - { - boost::xtime cur; - int res = 0; -- res = boost::xtime_get(&cur, boost::TIME_UTC); -- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; -+ res = boost::xtime_get(&cur, boost::TIME_UTC_); -+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; - - if (boost::xtime_cmp(xt, cur) <= 0) - milliseconds = 0; -@@ -109,8 +109,8 @@ inline void to_microduration(boost::xtim - { - boost::xtime cur; - int res = 0; -- res = boost::xtime_get(&cur, boost::TIME_UTC); -- BOOST_ASSERT(res == boost::TIME_UTC); (void)res; -+ res = boost::xtime_get(&cur, boost::TIME_UTC_); -+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res; - - if (boost::xtime_cmp(xt, cur) <= 0) - microseconds = 0; -Index: boost_1_49_0/libs/thread/src/win32/timeconv.inl -=================================================================== ---- boost_1_49_0.orig/libs/thread/src/win32/timeconv.inl -+++ boost_1_49_0/libs/thread/src/win32/timeconv.inl -@@ -17,8 +17,8 @@ const int NANOSECONDS_PER_MICROSECOND = - inline void to_time(int milliseconds, boost::xtime& xt) - { - int res = 0; -- res = boost::xtime_get(&xt, boost::TIME_UTC); -- assert(res == boost::TIME_UTC); -+ res = boost::xtime_get(&xt, boost::TIME_UTC_); -+ assert(res == boost::TIME_UTC_); - - xt.sec += (milliseconds / MILLISECONDS_PER_SECOND); - xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) * -@@ -54,8 +54,8 @@ inline void to_timespec_duration(const b - { - boost::xtime cur; - int res = 0; -- res = boost::xtime_get(&cur, boost::TIME_UTC); -- assert(res == boost::TIME_UTC); -+ res = boost::xtime_get(&cur, boost::TIME_UTC_); -+ assert(res == boost::TIME_UTC_); - - if (boost::xtime_cmp(xt, cur) <= 0) - { -@@ -85,8 +85,8 @@ inline void to_duration(boost::xtime xt, - { - boost::xtime cur; - int res = 0; -- res = boost::xtime_get(&cur, boost::TIME_UTC); -- assert(res == boost::TIME_UTC); -+ res = boost::xtime_get(&cur, boost::TIME_UTC_); -+ assert(res == boost::TIME_UTC_); - - if (boost::xtime_cmp(xt, cur) <= 0) - milliseconds = 0; -@@ -107,8 +107,8 @@ inline void to_microduration(boost::xtim - { - boost::xtime cur; - int res = 0; -- res = boost::xtime_get(&cur, boost::TIME_UTC); -- assert(res == boost::TIME_UTC); -+ res = boost::xtime_get(&cur, boost::TIME_UTC_); -+ assert(res == boost::TIME_UTC_); - - if (boost::xtime_cmp(xt, cur) <= 0) - microseconds = 0; -Index: boost_1_49_0/libs/thread/test/test_xtime.cpp -=================================================================== ---- boost_1_49_0.orig/libs/thread/test/test_xtime.cpp -+++ boost_1_49_0/libs/thread/test/test_xtime.cpp -@@ -17,8 +17,8 @@ void test_xtime_cmp() - { - boost::xtime xt1, xt2, cur; - BOOST_CHECK_EQUAL( -- boost::xtime_get(&cur, boost::TIME_UTC), -- static_cast(boost::TIME_UTC)); -+ boost::xtime_get(&cur, boost::TIME_UTC_), -+ static_cast(boost::TIME_UTC_)); - - xt1 = xt2 = cur; - xt1.nsec -= 1; -@@ -42,14 +42,14 @@ void test_xtime_get() - boost::xtime orig, cur, old; - BOOST_CHECK_EQUAL( - boost::xtime_get(&orig, -- boost::TIME_UTC), static_cast(boost::TIME_UTC)); -+ boost::TIME_UTC_), static_cast(boost::TIME_UTC_)); - old = orig; - - for (int x=0; x < 100; ++x) - { - BOOST_CHECK_EQUAL( -- boost::xtime_get(&cur, boost::TIME_UTC), -- static_cast(boost::TIME_UTC)); -+ boost::xtime_get(&cur, boost::TIME_UTC_), -+ static_cast(boost::TIME_UTC_)); - BOOST_CHECK(boost::xtime_cmp(cur, orig) >= 0); - BOOST_CHECK(boost::xtime_cmp(cur, old) >= 0); - old = cur; -Index: boost_1_49_0/libs/thread/test/util.inl -=================================================================== ---- boost_1_49_0.orig/libs/thread/test/util.inl -+++ boost_1_49_0/libs/thread/test/util.inl -@@ -28,8 +28,8 @@ inline boost::xtime delay(int secs, int - const int NANOSECONDS_PER_MILLISECOND = 1000000; - - boost::xtime xt; -- if (boost::TIME_UTC != boost::xtime_get (&xt, boost::TIME_UTC)) -- BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC"); -+ if (boost::TIME_UTC_ != boost::xtime_get (&xt, boost::TIME_UTC_)) -+ BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC_"); - - nsecs += xt.nsec; - msecs += nsecs / NANOSECONDS_PER_MILLISECOND; diff --git a/boost.changes b/boost.changes index 2e96b07..a3cb521 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sat Mar 16 11:35:15 UTC 2013 - dap.darkness@gmail.com + +- Update to 1.53.0. Major changes since 1.49.0: + + New libraries: + * Algorithm: A collection of useful generic algorithms. + * Context: Context switching library. + * Functional/OverloadedFunction: Overload different functions. + * LocalFunction: Program functions locally, within other functions. + * Utility/IdentityType: Wrap types within round parenthesis. + + For a detailed descriptions see + http://www.boost.org/users/history/version_1_50_0.html + http://www.boost.org/users/history/version_1_51_0.html + http://www.boost.org/users/history/version_1_52_0.html + +- Delete unneeded patches: + * boost-chrono_add_function_return.patch + * boost-fix_documentation.patch + * boost-time_utc.patch + ------------------------------------------------------------------- Wed Feb 27 18:34:09 UTC 2013 - dmueller@suse.com diff --git a/boost.spec b/boost.spec index 3adcb62..a53b6ce 100644 --- a/boost.spec +++ b/boost.spec @@ -16,10 +16,10 @@ # -%define ver 1.49.0 -%define file_version 1_49_0 -%define short_version 1_49 -%define lib_appendix 1_49_0 +%define ver 1.53.0 +%define file_version 1_53_0 +%define short_version 1_53 +%define lib_appendix 1_53_0 #Only define to 1 to generate the man pages %define build_docs 0 @@ -90,7 +90,7 @@ Summary: Boost C++ Libraries License: BSL-1.0 Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 1.49.0 +Version: 1.53.0 Release: 0 Source0: %{name}_%{file_version}.tar.bz2 Source1: boost-rpmlintrc @@ -103,9 +103,6 @@ Patch2: boost-no_type_punning.patch Patch8: boost-no_segfault_in_Regex_filter.patch Patch20: boost-strict_aliasing.patch Patch50: boost-use_std_xml_catalog.patch -Patch51: boost-fix_documentation.patch -Patch52: boost-chrono_add_function_return.patch -Patch53: boost-time_utc.patch Recommends: %{all_libs} %define _docdir %{_datadir}/doc/packages/boost-%{version} @@ -195,6 +192,25 @@ This package contains the documentation of the boost dynamic libraries in PDF format. %endif +%package -n libboost_atomic%{lib_appendix} +Summary: Run-Time component of boost atomic library +Group: System/Libraries +Requires: boost-license%{lib_appendix} + +%description -n libboost_atomic%{lib_appendix} +Run-Time support for Boost.Atomic, a library that provides atomic data types +and operations on these data types, as well as memory ordering constraints +required for coordinating multiple threads through atomic variables. + +%package -n libboost_context%{lib_appendix} +Summary: Run-Time component of boost context switching library +Group: System/Libraries +Requires: boost-license%{lib_appendix} + +%description -n libboost_context%{lib_appendix} +Run-Time support for Boost.Context, a foundational library that +provides a sort of cooperative multitasking on a single thread. + %package -n libboost_date_time%{lib_appendix} Summary: Boost::Date.Time Runtime libraries Group: System/Libraries @@ -380,9 +396,6 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} #%%patch19 %patch20 %patch50 -%patch51 -%patch52 -%patch53 -p1 #stupid build machinery copies .orig files find . -name \*.orig -exec rm {} + @@ -545,6 +558,8 @@ rm -f %{buildroot}%{_libdir}/*.a %fdupes %buildroot %endif +%post -n libboost_atomic%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_context%{lib_appendix} -p /sbin/ldconfig %post -n libboost_date_time%{lib_appendix} -p /sbin/ldconfig %post -n libboost_filesystem%{lib_appendix} -p /sbin/ldconfig %post -n libboost_iostreams%{lib_appendix} -p /sbin/ldconfig @@ -569,6 +584,8 @@ rm -f %{buildroot}%{_libdir}/*.a %post -n libboost_locale%{lib_appendix} -p /sbin/ldconfig %post -n libboost_timer%{lib_appendix} -p /sbin/ldconfig +%postun -n libboost_atomic%{lib_appendix} -p /sbin/ldconfig +%postun -n libboost_context%{lib_appendix} -p /sbin/ldconfig %postun -n libboost_date_time%{lib_appendix} -p /sbin/ldconfig %postun -n libboost_filesystem%{lib_appendix} -p /sbin/ldconfig %postun -n libboost_iostreams%{lib_appendix} -p /sbin/ldconfig @@ -599,6 +616,14 @@ rm -f %{buildroot}%{_libdir}/*.a #%%doc %%{_docdir}/NEWS %doc %{_docdir}/LICENSE_1_0.txt +%files -n libboost_atomic%{lib_appendix} +%defattr(-, root, root, -) +%{_libdir}/libboost_atomic*.so.* + +%files -n libboost_context%{lib_appendix} +%defattr(-, root, root, -) +%{_libdir}/libboost_context*.so.* + %files -n libboost_date_time%{lib_appendix} %defattr(-, root, root, -) %{_libdir}/libboost_date_time*.so.* diff --git a/boost_1_49_0.tar.bz2 b/boost_1_49_0.tar.bz2 deleted file mode 100644 index 02fee54..0000000 --- a/boost_1_49_0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd748a7f5507a7e7af74f452e1c52a64e651ed1f7263fce438a06641d2180d3c -size 48499961 diff --git a/boost_1_49_pdf.tar.bz2 b/boost_1_49_pdf.tar.bz2 deleted file mode 100644 index 85551a0..0000000 --- a/boost_1_49_pdf.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:017871c6bdfea38c190f8585190698de5c1ef65b2c7ec5f68cdb321807949720 -size 31345645 diff --git a/boost_1_53_0.tar.bz2 b/boost_1_53_0.tar.bz2 new file mode 100644 index 0000000..dea2d30 --- /dev/null +++ b/boost_1_53_0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196 +size 55765258 diff --git a/boost_1_49_man.tar.bz2 b/boost_1_53_man.tar.bz2 similarity index 100% rename from boost_1_49_man.tar.bz2 rename to boost_1_53_man.tar.bz2 diff --git a/boost_1_53_pdf.tar.bz2 b/boost_1_53_pdf.tar.bz2 new file mode 100644 index 0000000..1bf8db1 --- /dev/null +++ b/boost_1_53_pdf.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e65284286fdecdad5c87c0e6e10bb33fd9fd5c9b13a256c9cb3d966cdffb8cf4 +size 37656976 From 3cbb718e07d3379189cddf6e4ae5253acf68e213084f79627976be8c0e8c1d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 21 Mar 2013 09:20:58 +0000 Subject: [PATCH 2/4] Accepting request 160388 from home:m_meister:branches:openSUSE:Factory - Added url as source. Please see http://en.opensuse.org/SourceUrls OBS-URL: https://build.opensuse.org/request/show/160388 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=99 --- boost.changes | 6 ++++++ boost.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/boost.changes b/boost.changes index a3cb521..bad75c5 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 21 08:13:17 UTC 2013 - mmeister@suse.com + +- Added url as source. + Please see http://en.opensuse.org/SourceUrls + ------------------------------------------------------------------- Sat Mar 16 11:35:15 UTC 2013 - dap.darkness@gmail.com diff --git a/boost.spec b/boost.spec index a53b6ce..a9d65d9 100644 --- a/boost.spec +++ b/boost.spec @@ -92,7 +92,7 @@ Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 1.53.0 Release: 0 -Source0: %{name}_%{file_version}.tar.bz2 +Source0: http://downloads.sourceforge.net/project/boost/boost/1.53.0/%{name}_%{file_version}.tar.bz2 Source1: boost-rpmlintrc Source2: %{name}_%{short_version}_man.tar.bz2 Source3: %{name}_%{short_version}_pdf.tar.bz2 From a4b6095cc374c5f6b1b83dc539670b4f25021f38f8850c2727f3ae87f88bb28e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 22 Mar 2013 10:54:26 +0000 Subject: [PATCH 3/4] - Rename manpages to avoid conflict with other packages OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=100 --- boost.changes | 5 +++++ boost.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/boost.changes b/boost.changes index bad75c5..c710d02 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 22 10:36:57 UTC 2013 - idonmez@suse.com + +- Rename manpages to avoid conflict with other packages + ------------------------------------------------------------------- Thu Mar 21 08:13:17 UTC 2013 - mmeister@suse.com diff --git a/boost.spec b/boost.spec index a9d65d9..ad363f0 100644 --- a/boost.spec +++ b/boost.spec @@ -520,8 +520,10 @@ for lib in ${blibs}; do done popd -#install the man pages +# install the man pages rm -rf doc/man/man3/boost::units::operator +mv doc/man/man3/path.3 doc/man/man3/boost::property_tree::path.3 +mv doc/man/man3/string.3 doc/man/man3/boost::container::string.3 for sec in 3 7 9; do install -d %buildroot/%{_mandir}/man${sec} From ef9f1558cf02cae66650ec56b6b55cf68f3bc0a5571d0e61540079204d1945a7 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Wed, 3 Apr 2013 12:23:35 +0000 Subject: [PATCH 4/4] - Apply upstream patch that fixes the ppc64 code in boost::context (boost#8374): boost-fix_ppc64_asm.patch OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=101 --- boost-fix_ppc64_asm.patch | 46 +++++++++++++++++++++++++++++++++++++++ boost.changes | 6 +++++ boost.spec | 6 ++--- 3 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 boost-fix_ppc64_asm.patch diff --git a/boost-fix_ppc64_asm.patch b/boost-fix_ppc64_asm.patch new file mode 100644 index 0000000..058126c --- /dev/null +++ b/boost-fix_ppc64_asm.patch @@ -0,0 +1,46 @@ +From: Oliver Kowalke +Date: 2013-04-03 14:12:25+02:00 +Subject: Fix ppc64 assembler code in context +Upstream: boost#8374 + + +Compiling libs/context/src/asm/make_ppc64_sysv_elf_gas.S failed with: + +libs/context/src/asm/make_ppc64_sysv_elf_gas.S: Assembler messages: +libs/context/src/asm/make_ppc64_sysv_elf_gas.S:102: Error: operand out of range (59 is not between 0 and 31) +libs/context/src/asm/make_ppc64_sysv_elf_gas.S:108: Error: operand out of range (64 is not between 0 and 31) +libs/context/src/asm/make_ppc64_sysv_elf_gas.S:131: Error: syntax error; found @', expected ,' +libs/context/src/asm/make_ppc64_sysv_elf_gas.S:131: Error: junk at end of line: `@plt' + +--- + libs/context/src/asm/make_ppc64_sysv_elf_gas.S | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +Index: libs/context/src/asm/make_ppc64_sysv_elf_gas.S +=================================================================== +--- libs/context/src/asm/make_ppc64_sysv_elf_gas.S.orig 2012-11-30 08:38:52.000000000 +0100 ++++ libs/context/src/asm/make_ppc64_sysv_elf_gas.S 2013-04-03 14:10:43.651126381 +0200 +@@ -99,13 +99,13 @@ make_fcontext: + + # call align_stack, R3 contains address at 16 byte boundary after return + # == pointer to fcontext_t and address of context stack +- rlwinm %r3, %r3, 0, 0, 59 ++ clrrdi %r3, %r3, 4 + + std %r0, 184(%r3) # save address of context stack (base) in fcontext_t + std %r4, 192(%r3) # save context stack size in fcontext_t + std %r5, 176(%r3) # save address of context function in fcontext_t + +- subf %r0, %r3, 64 # 64 bytes on stack for parameter area (== 8 registers) ++ subi %r0, %r3, 64 # 64 bytes on stack for parameter area (== 8 registers) + std %r0, 152(%r3) # save the stack base + + mflr %r0 # load LR +@@ -128,5 +128,6 @@ finish: + stwu %r1, -32(%r1) # allocate stack space, SP % 16 == 0 + + li %r3, 0 # set return value to zero +- bl _exit@plt # exit application ++ bl _exit # exit application ++ nop + .size .make_fcontext, .-.make_fcontext diff --git a/boost.changes b/boost.changes index c710d02..0905813 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 3 14:20:58 CEST 2013 - pth@suse.de + +- Apply upstream patch that fixes the ppc64 code in boost::context + (boost#8374): boost-fix_ppc64_asm.patch + ------------------------------------------------------------------- Fri Mar 22 10:36:57 UTC 2013 - idonmez@suse.com diff --git a/boost.spec b/boost.spec index ad363f0..3f87a77 100644 --- a/boost.spec +++ b/boost.spec @@ -103,6 +103,8 @@ Patch2: boost-no_type_punning.patch Patch8: boost-no_segfault_in_Regex_filter.patch Patch20: boost-strict_aliasing.patch Patch50: boost-use_std_xml_catalog.patch +#PATCH-FIX-UPSTREAM Fix erroneous assembler code for ppc64 [boost#8374] +Patch51: boost-fix_ppc64_asm.patch Recommends: %{all_libs} %define _docdir %{_datadir}/doc/packages/boost-%{version} @@ -392,11 +394,9 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch1 %patch2 %patch8 -#%%patch9 -#%%patch19 %patch20 %patch50 - +%patch51 #stupid build machinery copies .orig files find . -name \*.orig -exec rm {} +