[mingw-boost] update to 1.55.0
sailer
sailer at fedoraproject.org
Tue Jul 1 09:40:37 UTC 2014
commit 963c310d957882be31cd1d31c9613d6bd12904a7
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Tue Jul 1 11:40:27 2014 +0200
update to 1.55.0
.gitignore | 1 +
001-coroutine.patch | 19 ---
002-date-time.patch | 19 ---
003-log.patch | 16 --
boost-1.50.0-long-double-1.patch | 12 --
boost-1.50.0-polygon.patch | 11 --
boost-1.53.0-attribute.patch | 57 --------
boost-1.54.0-__GLIBC_HAVE_LONG_LONG.patch | 22 ---
boost-1.54.0-algorithm-unused_typedef.patch | 43 ------
boost-1.54.0-context-execstack.patch | 129 -----------------
boost-1.54.0-graph-unused_typedef.patch | 11 --
boost-1.54.0-math-unused_typedef-2.patch | 52 -------
boost-1.54.0-math-unused_typedef.patch | 15 --
boost-1.54.0-mpi-unused_typedef.patch | 11 --
boost-1.54.0-multiprecision-unused_typedef.patch | 148 --------------------
boost-1.54.0-pool-max_chunks_shadow.patch | 14 ++
boost-1.54.0-pool-test_linking.patch | 31 ++++
boost-1.54.0-unordered-unused_typedef.patch | 14 --
boost-1.54.0-xpressive-unused_typedef.patch | 11 --
boost-1.55.0-archive-init_order.patch | 13 ++
boost-1.55.0-program_options-class_attribute.patch | 14 ++
boost-1.55.0-spirit-unused_typedefs.patch | 15 ++
boost-1.55.0-xpressive-unused_typedefs.patch | 11 ++
mingw-boost.spec | 102 +++++---------
sources | 2 +-
25 files changed, 134 insertions(+), 659 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6e30042..89206ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ boost-1.41.0.cmake0.tar.bz2
/boost_1_50_0.tar.bz2
/boost_1_53_0.tar.bz2
/boost_1_54_0.tar.bz2
+/boost_1_55_0.tar.bz2
diff --git a/boost-1.54.0-pool-max_chunks_shadow.patch b/boost-1.54.0-pool-max_chunks_shadow.patch
new file mode 100644
index 0000000..1a85fce
--- /dev/null
+++ b/boost-1.54.0-pool-max_chunks_shadow.patch
@@ -0,0 +1,14 @@
+diff -up ./boost/pool/pool.hpp~ ./boost/pool/pool.hpp
+--- ./boost/pool/pool.hpp~ 2013-08-21 17:49:56.023296922 +0200
++++ ./boost/pool/pool.hpp 2013-08-22 11:38:01.133912638 +0200
+@@ -361,9 +361,7 @@ class pool: protected simple_segregated_
+ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
+ size_type partition_size = alloc_size();
+ size_type POD_size = math::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
+- size_type max_chunks = (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
+-
+- return max_chunks;
++ return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
+ }
+
+ static void * & nextof(void * const ptr)
diff --git a/boost-1.54.0-pool-test_linking.patch b/boost-1.54.0-pool-test_linking.patch
new file mode 100644
index 0000000..0f749f7
--- /dev/null
+++ b/boost-1.54.0-pool-test_linking.patch
@@ -0,0 +1,31 @@
+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 : : : <tes
+ explicit valgrind_config_check ;
+
+ test-suite pool :
+- [ run test_simple_seg_storage.cpp ]
+- [ run test_pool_alloc.cpp ]
+- [ run pool_msvc_compiler_bug_test.cpp ]
+- [ run test_msvc_mem_leak_detect.cpp ]
+- [ run test_bug_3349.cpp ]
+- [ run test_bug_4960.cpp ]
+- [ run test_bug_1252.cpp ]
+- [ run test_bug_2696.cpp ]
+- [ run test_bug_5526.cpp ]
++ [ run test_simple_seg_storage.cpp : : : <library>/boost/system//boost_system ]
++ [ run test_pool_alloc.cpp : : : <library>/boost/system//boost_system ]
++ [ run pool_msvc_compiler_bug_test.cpp : : : <library>/boost/system//boost_system ]
++ [ run test_msvc_mem_leak_detect.cpp : : : <library>/boost/system//boost_system ]
++ [ run test_bug_3349.cpp : : : <library>/boost/system//boost_system ]
++ [ run test_bug_4960.cpp : : : <library>/boost/system//boost_system ]
++ [ run test_bug_1252.cpp : : : <library>/boost/system//boost_system ]
++ [ run test_bug_2696.cpp : : : <library>/boost/system//boost_system ]
++ [ run test_bug_5526.cpp : : : <library>/boost/system//boost_system ]
+ [ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread <toolset>gcc:<cxxflags>-Wno-attributes <toolset>gcc:<cxxflags>-Wno-missing-field-initializers ]
+- [ run ../example/time_pool_alloc.cpp ]
++ [ run ../example/time_pool_alloc.cpp : : : <library>/boost/system//boost_system ]
+ [ compile test_poisoned_macros.cpp ]
+
+ #
diff --git a/boost-1.55.0-archive-init_order.patch b/boost-1.55.0-archive-init_order.patch
new file mode 100644
index 0000000..7de81ef
--- /dev/null
+++ b/boost-1.55.0-archive-init_order.patch
@@ -0,0 +1,13 @@
+diff -up ./boost/archive/iterators/transform_width.hpp~ ./boost/archive/iterators/transform_width.hpp
+--- ./boost/archive/iterators/transform_width.hpp~ 2013-04-28 18:07:27.000000000 +0200
++++ ./boost/archive/iterators/transform_width.hpp 2014-05-13 18:08:53.683355277 +0200
+@@ -119,8 +119,8 @@ public:
+ transform_width(const transform_width & rhs) :
+ super_t(rhs.base_reference()),
+ m_buffer_out_full(rhs.m_buffer_out_full),
+- m_remaining_bits(rhs.m_remaining_bits),
+ m_buffer_in(rhs.m_buffer_in),
++ m_remaining_bits(rhs.m_remaining_bits),
+ m_end_of_sequence(false)
+ {}
+ };
diff --git a/boost-1.55.0-program_options-class_attribute.patch b/boost-1.55.0-program_options-class_attribute.patch
new file mode 100644
index 0000000..cfd0df4
--- /dev/null
+++ b/boost-1.55.0-program_options-class_attribute.patch
@@ -0,0 +1,14 @@
+diff -up boost_1_55_0/boost/program_options/variables_map.hpp\~ boost_1_55_0/boost/program_options/variables_map.hpp
+--- boost_1_55_0/boost/program_options/variables_map.hpp~ 2012-04-08 12:02:26.000000000 +0200
++++ boost_1_55_0/boost/program_options/variables_map.hpp 2014-05-13 17:49:18.219749093 +0200
+@@ -98,7 +98,7 @@ namespace boost { namespace program_opti
+ void store(const basic_parsed_options<char>& options,
+ variables_map& m, bool);
+
+- friend BOOST_PROGRAM_OPTIONS_DECL class variables_map;
++ friend class BOOST_PROGRAM_OPTIONS_DECL variables_map;
+ };
+
+ /** Implements string->string mapping with convenient value casting
+
+Diff finished. Tue May 13 17:49:22 2014
diff --git a/boost-1.55.0-spirit-unused_typedefs.patch b/boost-1.55.0-spirit-unused_typedefs.patch
new file mode 100644
index 0000000..399d99b
--- /dev/null
+++ b/boost-1.55.0-spirit-unused_typedefs.patch
@@ -0,0 +1,15 @@
+diff -up boost_1_55_0/boost/spirit/home/support/char_set/range_run_impl.hpp\~ boost_1_55_0/boost/spirit/home/support/char_set/range_run_impl.hpp
+--- boost_1_55_0/boost/spirit/home/support/char_set/range_run_impl.hpp~ 2011-01-13 03:11:19.000000000 +0100
++++ boost_1_55_0/boost/spirit/home/support/char_set/range_run_impl.hpp 2014-05-15 18:09:07.326237692 +0200
+@@ -25,9 +25,6 @@ namespace boost { namespace spirit { nam
+ // if *iter intersects with, or is adjacent to, 'range'...
+ if (can_merge(*iter, range))
+ {
+- typedef typename Range::value_type value_type;
+- typedef integer_traits<value_type> integer_traits;
+-
+ // merge range and *iter
+ merge(*iter, range);
+
+
+Diff finished. Thu May 15 18:09:11 2014
diff --git a/boost-1.55.0-xpressive-unused_typedefs.patch b/boost-1.55.0-xpressive-unused_typedefs.patch
new file mode 100644
index 0000000..1365d92
--- /dev/null
+++ b/boost-1.55.0-xpressive-unused_typedefs.patch
@@ -0,0 +1,11 @@
+diff -up ./boost/xpressive/detail/dynamic/parser.hpp~ ./boost/xpressive/detail/dynamic/parser.hpp
+--- ./boost/xpressive/detail/dynamic/parser.hpp~ 2009-09-23 23:53:53.000000000 +0200
++++ ./boost/xpressive/detail/dynamic/parser.hpp 2014-05-13 17:15:47.263001855 +0200
+@@ -328,7 +328,6 @@ inline sequence<BidiIter> make_assert_en
+ template<typename BidiIter, typename Cond, typename Traits>
+ inline sequence<BidiIter> make_assert_word(Cond, Traits const &tr)
+ {
+- typedef typename iterator_value<BidiIter>::type char_type;
+ return detail::make_dynamic<BidiIter>
+ (
+ detail::assert_word_matcher<Cond, Traits>(tr)
diff --git a/mingw-boost.spec b/mingw-boost.spec
index 609d40a..e66a6a8 100644
--- a/mingw-boost.spec
+++ b/mingw-boost.spec
@@ -2,9 +2,9 @@
%global name1 boost
Name: mingw-%{name1}
-Version: 1.54.0
-%global version_enc 1_54_0
-Release: 2%{?dist}
+Version: 1.55.0
+%global version_enc 1_55_0
+Release: 1%{?dist}
Summary: MinGW Windows port of Boost C++ Libraries
%global toplev_dirname %{name1}_%{version_enc}
@@ -15,40 +15,15 @@ URL: http://www.boost.org
Source0: http://downloads.sourceforge.net/%{name1}/%{toplev_dirname}.tar.bz2
# https://svn.boost.org/trac/boost/ticket/6150
-Patch4: boost-1.50.0-fix-non-utf8-files.patch
+Patch4: boost-1.50.0-fix-non-utf8-files.patch
-# Add a manual page for the sole executable, namely bjam, based on the
-# on-line documentation:
+# Add a manual page for bjam, based on the on-line documentation:
# http://www.boost.org/boost-build2/doc/html/bbv2/overview.html
-Patch5: boost-1.48.0-add-bjam-man-page.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=781859
-# The following tickets have still to be fixed by upstream.
-# https://svn.boost.org/trac/boost/ticket/6408
-# https://svn.boost.org/trac/boost/ticket/6410
-# https://svn.boost.org/trac/boost/ticket/6413
-Patch9: boost-1.53.0-attribute.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=783660
-# https://svn.boost.org/trac/boost/ticket/6459 fixed
-Patch10: boost-1.50.0-long-double-1.patch
+Patch5: boost-1.48.0-add-bjam-man-page.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=828856
# https://bugzilla.redhat.com/show_bug.cgi?id=828857
-Patch15: boost-1.50.0-pool.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=977098
-# https://svn.boost.org/trac/boost/ticket/8731
-Patch18: boost-1.54.0-__GLIBC_HAVE_LONG_LONG.patch
-
-# Upstream patches posted as release notes:
-# http://www.boost.org/users/history/version_1_54_0.html
-Patch19: 001-coroutine.patch
-Patch20: 002-date-time.patch
-Patch21: 003-log.patch
-
-# https://svn.boost.org/trac/boost/ticket/8826
-Patch22: boost-1.54.0-context-execstack.patch
+Patch15: boost-1.50.0-pool.patch
# https://svn.boost.org/trac/boost/ticket/8844
Patch23: boost-1.54.0-bind-static_assert.patch
@@ -62,10 +37,6 @@ Patch25: boost-1.54.0-mpl-print.patch
# https://svn.boost.org/trac/boost/ticket/8859
Patch26: boost-1.54.0-static_warning-unused_typedef.patch
-# https://svn.boost.org/trac/boost/ticket/8855
-Patch27: boost-1.54.0-math-unused_typedef.patch
-Patch28: boost-1.54.0-math-unused_typedef-2.patch
-
# https://svn.boost.org/trac/boost/ticket/8853
Patch31: boost-1.54.0-tuple-unused_typedef.patch
@@ -83,33 +54,33 @@ Patch36: boost-1.54.0-spirit-unused_typedef-2.patch
# https://svn.boost.org/trac/boost/ticket/8871
Patch37: boost-1.54.0-numeric-unused_typedef.patch
-# https://svn.boost.org/trac/boost/ticket/8872
-Patch38: boost-1.54.0-multiprecision-unused_typedef.patch
-
-# https://svn.boost.org/trac/boost/ticket/8874
-Patch42: boost-1.54.0-unordered-unused_typedef.patch
-
-# https://svn.boost.org/trac/boost/ticket/8876
-Patch43: boost-1.54.0-algorithm-unused_typedef.patch
-
-# https://svn.boost.org/trac/boost/ticket/8877
-Patch44: boost-1.54.0-graph-unused_typedef.patch
-
# https://svn.boost.org/trac/boost/ticket/8878
Patch45: boost-1.54.0-locale-unused_typedef.patch
# https://svn.boost.org/trac/boost/ticket/8879
Patch46: boost-1.54.0-property_tree-unused_typedef.patch
-# https://svn.boost.org/trac/boost/ticket/8880
-Patch47: boost-1.54.0-xpressive-unused_typedef.patch
-
-# https://svn.boost.org/trac/boost/ticket/8881
-Patch48: boost-1.54.0-mpi-unused_typedef.patch
-
# https://svn.boost.org/trac/boost/ticket/8888
Patch49: boost-1.54.0-python-unused_typedef.patch
+# https://svn.boost.org/trac/boost/ticket/9038
+Patch51: boost-1.54.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://svn.boost.org/trac/boost/ticket/7262
Patch1000: boost-mingw.patch
@@ -207,19 +178,11 @@ pushd win32
# Fixes
%patch4 -p1
%patch5 -p1
-%patch9 -p1
%patch15 -p0
-#patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p0
%patch26 -p1
-%patch27 -p1
-%patch28 -p0
%patch31 -p0
%patch32 -p0
%patch33 -p0
@@ -227,15 +190,15 @@ pushd win32
%patch35 -p1
%patch36 -p1
%patch37 -p1
-%patch38 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
%patch45 -p1
%patch46 -p1
-%patch47 -p1
-%patch48 -p1
%patch49 -p1
+%patch51 -p1
+%patch53 -p1
+%patch54 -p1
+%patch55 -p1
+%patch56 -p1
+%patch57 -p1
%patch1000 -p0 -b .mingw
%patch1001 -p0 -b .interlocked
popd
@@ -647,6 +610,9 @@ mv $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll $RPM_BUILD_ROOT%{mingw64_bindir}
%{mingw64_libdir}/libboost_test_exec_monitor.a
%changelog
+* Mon Jun 30 2014 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.55.0-1
+- update to 1.55.0
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.54.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index b83e24d..329a0a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15cb8c0803064faef0c4ddf5bc5ca279 boost_1_54_0.tar.bz2
+d6eef4b4cacb2183f2bf265a5a03a354 boost_1_55_0.tar.bz2
More information about the scm-commits
mailing list