[packages/boost] - updated to 1.56.0 (new sonames as usual) - removed obsolete bind-static_assert,concent-unused_type
qboosh
qboosh at pld-linux.org
Sat Oct 11 08:28:24 CEST 2014
commit d20b153a3ad0fc83e5af246c49308f6ed9ec6733
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Oct 11 08:28:44 2014 +0200
- updated to 1.56.0 (new sonames as usual)
- removed obsolete bind-static_assert,concent-unused_typedef,date_time-unused_typedef,date_time-unused_typedef-2,property_tree-unused_typedef,random-unused_typedef,static_warning-unused_typedef,tuple-unused_typedef patches
- updated mpl-print patch
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-mpl-print.patch | 25 +++---
boost-1.54.0-property_tree-unused_typedef.patch | 19 -----
boost-1.54.0-random-unused_typedef.patch | 24 ------
boost-1.54.0-static_warning-unused_typedef.patch | 23 ------
boost-1.54.0-tuple-unused_typedef.patch | 12 ---
boost.spec | 40 +++------
10 files changed, 22 insertions(+), 276 deletions(-)
---
diff --git a/boost.spec b/boost.spec
index 1934418..3973ec8 100644
--- a/boost.spec
+++ b/boost.spec
@@ -10,29 +10,16 @@
Summary: The Boost C++ Libraries
Summary(pl.UTF-8): Biblioteki C++ "Boost"
Name: boost
-Version: 1.55.0
-Release: 3
+Version: 1.56.0
+Release: 1
License: Boost Software License and others
Group: Libraries
Source0: http://downloads.sourceforge.net/boost/%{name}_%{fver}.tar.bz2
-# Source0-md5: d6eef4b4cacb2183f2bf265a5a03a354
+# Source0-md5: a744cf167b05d72335f27c88115f211d
Patch0: %{name}-link.patch
# FC Patches:
-# https://svn.boost.org/trac/boost/ticket/8844
-Patch201: %{name}-1.54.0-bind-static_assert.patch
-# https://svn.boost.org/trac/boost/ticket/8847
-Patch202: %{name}-1.54.0-concept-unused_typedef.patch
# https://svn.boost.org/trac/boost/ticket/5637
Patch203: %{name}-1.54.0-mpl-print.patch
-# https://svn.boost.org/trac/boost/ticket/8859
-Patch204: %{name}-1.54.0-static_warning-unused_typedef.patch
-# https://svn.boost.org/trac/boost/ticket/8853
-Patch207: %{name}-1.54.0-tuple-unused_typedef.patch
-# https://svn.boost.org/trac/boost/ticket/8854
-Patch208: %{name}-1.54.0-random-unused_typedef.patch
-# https://svn.boost.org/trac/boost/ticket/8856
-Patch209: %{name}-1.54.0-date_time-unused_typedef.patch
-Patch210: %{name}-1.54.0-date_time-unused_typedef-2.patch
# https://svn.boost.org/trac/boost/ticket/8870
Patch211: %{name}-1.54.0-spirit-unused_typedef.patch
Patch212: %{name}-1.54.0-spirit-unused_typedef-2.patch
@@ -40,8 +27,6 @@ Patch212: %{name}-1.54.0-spirit-unused_typedef-2.patch
Patch213: %{name}-1.54.0-numeric-unused_typedef.patch
# https://svn.boost.org/trac/boost/ticket/8878
Patch218: %{name}-1.54.0-locale-unused_typedef.patch
-# https://svn.boost.org/trac/boost/ticket/8879
-Patch219: %{name}-1.54.0-property_tree-unused_typedef.patch
# https://svn.boost.org/trac/boost/ticket/8881
Patch221: %{name}-1.54.0-mpi-unused_typedef.patch
# https://svn.boost.org/trac/boost/ticket/8888
@@ -410,19 +395,11 @@ Dokumentacja dla biblioteki Boost C++.
%setup -q -n %{name}_%{fver}
%patch0 -p1
-%patch201 -p1
-%patch202 -p1
%patch203 -p0
-%patch204 -p1
-%patch207 -p0
-%patch208 -p0
-%patch209 -p0
-%patch210 -p1
%patch211 -p1
%patch212 -p1
%patch213 -p1
%patch218 -p1
-%patch219 -p1
%patch221 -p1
%patch222 -p1
%patch224 -p1
@@ -430,14 +407,14 @@ Dokumentacja dla biblioteki Boost C++.
# - don't know how to pass it through (b)jam -s (no way?)
# due to oversophisticated build flags system.
# - pass -fPIC due to <shared-linkable> removal.
-%{__sed} -i "s/<optimization>speed : -O3/<optimization>speed : ${CXXFLAGS:-%rpmcxxflags} -fPIC/" tools/build/v2/tools/gcc.jam
+%{__sed} -i "s/<optimization>speed : -O3/<optimization>speed : ${CXXFLAGS:-%rpmcxxflags} -fPIC/" tools/build/src/tools/gcc.jam
# cleanup -g switch to avoid override debuginfocflags.
-%{__sed} -i 's/<debug-symbols>on : -g/<debug-symbols>on :/' tools/build/v2/tools/gcc.jam
+%{__sed} -i 's/<debug-symbols>on : -g/<debug-symbols>on :/' tools/build/src/tools/gcc.jam
# link against shared expat library.
-%{__sed} -i 's:find-static:find-shared:' libs/graph/build/Jamfile.v2
+#%{__sed} -i 's:find-static:find-shared:' libs/graph/build/Jamfile.v2
-cat << EOF > tools/build/v2/user-config.jam
+cat << EOF > tools/build/src/user-config.jam
using gcc : %{cxx_version} : %{__cxx} ;
EOF
@@ -571,6 +548,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libboost_atomic.so.*.*.*
+%attr(755,root,root) %{_libdir}/libboost_container.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_coroutine.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_iostreams.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_math_*.so.*.*.*
@@ -582,6 +560,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libboost_atomic.so
%attr(755,root,root) %{_libdir}/libboost_chrono.so
+%attr(755,root,root) %{_libdir}/libboost_container.so
%attr(755,root,root) %{_libdir}/libboost_context.so
%attr(755,root,root) %{_libdir}/libboost_coroutine.so
%attr(755,root,root) %{_libdir}/libboost_date_time.so
@@ -612,6 +591,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%{_libdir}/libboost_atomic.a
%{_libdir}/libboost_chrono.a
+%{_libdir}/libboost_container.a
%{_libdir}/libboost_context.a
%{_libdir}/libboost_coroutine.a
%{_libdir}/libboost_date_time.a
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 <boost/config.hpp>
- #include <boost/is_placeholder.hpp>
-+#include <boost/static_assert.hpp>
-
- namespace boost
- {
-@@ -33,8 +34,7 @@ template< int I > struct arg
-
- template< class T > arg( T const & /* t */ )
- {
-- // static assert I == is_placeholder<T>::value
-- typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ];
-+ BOOST_STATIC_ASSERT(I == is_placeholder<T>::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 <boost/preprocessor/cat.hpp>
- # include <boost/concept/detail/backward_compatibility.hpp>
-+# include <boost/static_assert.hpp>
-
- # ifdef BOOST_OLD_CONCEPT_SUPPORT
- # include <boost/concept/detail/has_constraints.hpp>
-@@ -68,7 +69,8 @@ struct requirement_<void(*)(Model)>
- # define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \
- typedef ::boost::concepts::detail::instantiate< \
- &::boost::concepts::requirement_<ModelFnPtr>::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<std::basic_string<charT>, charT> beg(is), eos;
-
-- typedef boost::date_time::all_date_names_put<greg_facet_config, charT> 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<time_type, CharT> custom_time_facet;
-- typedef std::time_put<CharT> std_time_facet;
- std::ostreambuf_iterator<CharT> oitr(os);
-
- if(std::has_facet<custom_time_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<local_date_time, CharT> custom_facet;
-- typedef std::time_put<CharT> std_time_facet;
- std::ostreambuf_iterator<CharT> oitr(os);
- if (std::has_facet<custom_facet>(os.getloc())) {
- std::use_facet<custom_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<ptime, CharT> custom_ptime_facet;
-- typedef std::time_put<CharT> std_ptime_facet;
- std::ostreambuf_iterator<CharT> oitr(os);
- if (std::has_facet<custom_ptime_facet>(os.getloc()))
- std::use_facet<custom_ptime_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<ptime, CharT> custom_ptime_facet;
-- typedef std::time_put<CharT> std_time_facet;
- std::ostreambuf_iterator<CharT> oitr(os);
- if (std::has_facet<custom_ptime_facet>(os.getloc())) {
- std::use_facet<custom_ptime_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<ptime, CharT> custom_ptime_facet;
-- typedef std::time_put<CharT> std_ptime_facet;
- std::ostreambuf_iterator<CharT> oitr(os);
- if (std::has_facet<custom_ptime_facet>(os.getloc()))
- std::use_facet<custom_ptime_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<OutputT> convert_string_type(const std::basic_string<InputT>& inp_str)
- {
-- typedef std::basic_string<InputT> input_type;
- typedef std::basic_string<OutputT> 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<charT> string_type;
- typedef std::vector<string_type> collection_type;
-- typedef std::basic_ostringstream<charT> ostream_type;
- typedef std::ostreambuf_iterator<charT> ostream_iter_type;
- typedef std::basic_ostringstream<charT> stringstream_type;
- typedef std::time_put<charT> time_put_facet_type;
-@@ -86,7 +85,6 @@
- {
- typedef std::basic_string<charT> string_type;
- typedef std::vector<string_type> collection_type;
-- typedef std::basic_ostringstream<charT> ostream_type;
- typedef std::ostreambuf_iterator<charT> ostream_iter_type;
- typedef std::basic_ostringstream<charT> stringstream_type;
- typedef std::time_put<charT> time_put_facet_type;
diff --git a/boost-1.54.0-mpl-print.patch b/boost-1.54.0-mpl-print.patch
index 6c27b14..cbd1493 100644
--- a/boost-1.54.0-mpl-print.patch
+++ b/boost-1.54.0-mpl-print.patch
@@ -2,18 +2,26 @@ Index: boost/mpl/print.hpp
===================================================================
--- boost/mpl/print.hpp (revision 83411)
+++ boost/mpl/print.hpp (working copy)
-@@ -45,22 +45,21 @@
+@@ -44,7 +44,7 @@
: mpl::identity<T>
#if defined(__MWERKS__)
, aux::print_base
-#endif
+#endif
{
- #if defined(BOOST_MSVC)
+ #if defined(__clang__)
+ const int m_x = 1 / (sizeof(T) - sizeof(T));
+@@ -52,15 +52,14 @@
enum { n = sizeof(T) + -1 };
#elif defined(__MWERKS__)
void f(int);
--#else
++#elif defined(__EDG_VERSION__)
++ enum { n = aux::dependent_unsigned<T>::value > -1 };
++#elif defined(BOOST_GCC)
++ enum { n1 };
++ enum { n2 };
++ enum { n = n1 != n2 };
+ #else
- enum {
- n =
-# if defined(__EDG_VERSION__)
@@ -22,16 +30,7 @@ Index: boost/mpl/print.hpp
- sizeof(T) > -1
-# endif
- };
--#endif
-+#elif defined(__EDG_VERSION__)
-+ enum { n = aux::dependent_unsigned<T>::value > -1 };
-+#elif defined(BOOST_GCC)
-+ enum { n1 };
-+ enum { n2 };
-+ enum { n = n1 != n2 };
-+#else
+ enum { n = sizeof(T) > -1 };
-+#endif
+ #endif
};
- #if defined(BOOST_MSVC)
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<Ch> & settings
- )
- {
-- typedef typename std::basic_string<Ch> 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<Ch> Str;
- typedef typename Ptree::const_iterator It;
-
- bool want_pretty = settings.indent_count > 0;
diff --git a/boost-1.54.0-random-unused_typedef.patch b/boost-1.54.0-random-unused_typedef.patch
deleted file mode 100644
index fff4226..0000000
--- a/boost-1.54.0-random-unused_typedef.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: boost/random/generate_canonical.hpp
-===================================================================
---- boost/random/generate_canonical.hpp (revision 85073)
-+++ boost/random/generate_canonical.hpp (working copy)
-@@ -54,7 +54,6 @@
- using std::floor;
- BOOST_ASSERT((g.min)() == 0);
- BOOST_ASSERT((g.max)() == 1);
-- typedef typename URNG::result_type base_result;
- std::size_t digits = std::numeric_limits<RealType>::digits;
- std::size_t engine_bits = detail::generator_bits<URNG>::value();
- std::size_t b = (std::min)(bits, digits);
-Index: boost/random/uniform_real_distribution.hpp
-===================================================================
---- boost/random/uniform_real_distribution.hpp (revision 85073)
-+++ boost/random/uniform_real_distribution.hpp (working copy)
-@@ -36,7 +36,6 @@
- {
- for(;;) {
- typedef T result_type;
-- typedef typename Engine::result_type base_result;
- result_type numerator = static_cast<T>(eng() - (eng.min)());
- result_type divisor = static_cast<T>((eng.max)() - (eng.min)());
- BOOST_ASSERT(divisor > 0);
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 <boost/mpl/bool.hpp>
- #include <boost/mpl/print.hpp>
- #include <boost/mpl/eval_if.hpp>
-+#include <boost/static_assert.hpp>
-
- 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<HT, TT>& c BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) {
- typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE
- apply<cons<HT, TT> > impl;
-- typedef BOOST_DEDUCED_TYPENAME impl::type cons_element;
- return impl::call(c).head;
- }
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/boost.git/commitdiff/d20b153a3ad0fc83e5af246c49308f6ed9ec6733
More information about the pld-cvs-commit
mailing list