Updated to 1.53.0

This commit is contained in:
Aleksey Yermakov 2013-02-20 13:48:12 +04:00
parent 7dbceaf3af
commit d785fb7322
7 changed files with 31 additions and 39540 deletions

View file

@ -1,2 +1,2 @@
sources:
"boost_1_50_0.tar.bz2": ee06f89ed472cf369573f8acf9819fbc7173344e
"boost_1_53_0.tar.bz2": e6dd1b62ceed0a51add3dda6f3fc3ce0f636a7f3

View file

@ -1,128 +0,0 @@
Index: boost/unordered/detail/equivalent.hpp
===================================================================
--- boost/unordered/detail/equivalent.hpp (revision 79442)
+++ boost/unordered/detail/equivalent.hpp (revision 79443)
@@ -37,7 +37,7 @@
#if BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT
template <BOOST_UNORDERED_EMPLACE_TEMPLATE>
- grouped_node(BOOST_UNORDERED_EMPLACE_ARGS) :
+ explicit grouped_node(BOOST_UNORDERED_EMPLACE_ARGS) :
node_base(),
group_prev_(),
hash_(0)
@@ -49,6 +49,10 @@
~grouped_node() {
boost::unordered::detail::destroy(this->value_ptr());
}
+
+ grouped_node(grouped_node const&) {
+ assert(false);
+ }
#else
grouped_node() :
node_base(),
@@ -61,6 +65,9 @@
{
group_prev_ = self;
}
+
+ private:
+ grouped_node& operator=(grouped_node const&);
};
template <typename T>
@@ -77,7 +84,7 @@
#if BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT
template <BOOST_UNORDERED_EMPLACE_TEMPLATE>
- grouped_ptr_node(BOOST_UNORDERED_EMPLACE_ARGS) :
+ explicit grouped_ptr_node(BOOST_UNORDERED_EMPLACE_ARGS) :
bucket_base(),
group_prev_(0),
hash_(0)
@@ -89,6 +96,10 @@
~grouped_ptr_node() {
boost::unordered::detail::destroy(this->value_ptr());
}
+
+ grouped_ptr_node(grouped_ptr_node const&) {
+ assert(false);
+ }
#else
grouped_ptr_node() :
bucket_base(),
@@ -101,6 +112,9 @@
{
group_prev_ = self;
}
+
+ private:
+ grouped_ptr_node& operator=(grouped_ptr_node const&);
};
// If the allocator uses raw pointers use grouped_ptr_node
Index: boost/unordered/detail/unique.hpp
===================================================================
--- boost/unordered/detail/unique.hpp (revision 79442)
+++ boost/unordered/detail/unique.hpp (revision 79443)
@@ -38,7 +38,7 @@
#if BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT
template <BOOST_UNORDERED_EMPLACE_TEMPLATE>
- unique_node(BOOST_UNORDERED_EMPLACE_ARGS) :
+ explicit unique_node(BOOST_UNORDERED_EMPLACE_ARGS) :
node_base(),
hash_(0)
{
@@ -49,6 +49,10 @@
~unique_node() {
boost::unordered::detail::destroy(this->value_ptr());
}
+
+ unique_node(unique_node const&) {
+ BOOST_ASSERT(false);
+ }
#else
unique_node() :
node_base(),
@@ -59,6 +63,9 @@
void init(link_pointer)
{
}
+
+ private:
+ unique_node& operator=(unique_node const&);
};
template <typename T>
@@ -74,7 +81,7 @@
#if BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT
template <BOOST_UNORDERED_EMPLACE_TEMPLATE>
- ptr_node(BOOST_UNORDERED_EMPLACE_ARGS) :
+ explicit ptr_node(BOOST_UNORDERED_EMPLACE_ARGS) :
bucket_base(),
hash_(0)
{
@@ -85,6 +92,10 @@
~ptr_node() {
boost::unordered::detail::destroy(this->value_ptr());
}
+
+ ptr_node(ptr_node const&) {
+ BOOST_ASSERT(false);
+ }
#else
ptr_node() :
bucket_base(),
@@ -95,6 +106,9 @@
void init(link_pointer)
{
}
+
+ private:
+ ptr_node& operator=(ptr_node const&);
};
// If the allocator uses raw pointers use ptr_node

File diff suppressed because one or more lines are too long

View file

@ -1,24 +1,3 @@
diff -urp boost_1_48_0~/boost/asio/buffers_iterator.hpp boost_1_48_0/boost/asio/buffers_iterator.hpp
--- boost_1_48_0~/boost/asio/buffers_iterator.hpp 2012-01-16 16:15:26.550239797 +0100
+++ boost_1_48_0/boost/asio/buffers_iterator.hpp 2012-01-16 16:17:45.880243120 +0100
@@ -128,7 +128,7 @@ public:
/// Construct an iterator representing the beginning of the buffers' data.
static buffers_iterator begin(const BufferSequence& buffers)
#if BOOST_WORKAROUND(__GNUC__, == 4) && BOOST_WORKAROUND(__GNUC_MINOR__, == 3)
- __attribute__ ((noinline))
+ __attribute__ ((__noinline__))
#endif
{
buffers_iterator new_iter;
@@ -148,7 +148,7 @@ public:
/// Construct an iterator representing the end of the buffers' data.
static buffers_iterator end(const BufferSequence& buffers)
#if BOOST_WORKAROUND(__GNUC__, == 4) && BOOST_WORKAROUND(__GNUC_MINOR__, == 3)
- __attribute__ ((noinline))
+ __attribute__ ((__noinline__))
#endif
{
buffers_iterator new_iter;
diff -urp boost_1_48_0~/boost/config/compiler/gcc.hpp boost_1_48_0/boost/config/compiler/gcc.hpp
--- boost_1_48_0~/boost/config/compiler/gcc.hpp 2012-01-16 16:15:14.643239525 +0100
+++ boost_1_48_0/boost/config/compiler/gcc.hpp 2012-01-16 16:21:24.072247987 +0100
@ -71,20 +50,8 @@ diff -urp boost_1_48_0~/boost/random/detail/integer_log2.hpp boost_1_48_0/boost/
#elif defined(BOOST_MSVC)
#define BOOST_RANDOM_DETAIL_CONSTEXPR __forceinline
#elif defined(__GNUC__) && __GNUC__ >= 4
-#define BOOST_RANDOM_DETAIL_CONSTEXPR __attribute__((const)) __attribute__((always_inline))
+#define BOOST_RANDOM_DETAIL_CONSTEXPR __attribute__((__const__)) __attribute__((__always_inline__))
-#define BOOST_RANDOM_DETAIL_CONSTEXPR inline __attribute__((const)) __attribute__((always_inline))
+#define BOOST_RANDOM_DETAIL_CONSTEXPR inline __attribute__((__const__)) __attribute__((__always_inline__))
#else
#define BOOST_RANDOM_DETAIL_CONSTEXPR inline
#endif
diff -urp boost_1_48_0~/boost/xpressive/detail/core/adaptor.hpp boost_1_48_0/boost/xpressive/detail/core/adaptor.hpp
--- boost_1_48_0~/boost/xpressive/detail/core/adaptor.hpp 2012-01-16 16:15:32.315239932 +0100
+++ boost_1_48_0/boost/xpressive/detail/core/adaptor.hpp 2012-01-16 16:17:54.024243179 +0100
@@ -41,7 +41,7 @@ struct xpression_adaptor
&& ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
// Ugh, gcc has an optimizer bug which elides this c'tor call
// resulting in pure virtual function calls.
- __attribute__((noinline))
+ __attribute__((__noinline__))
#endif
: xpr_(xpr)
{

View file

@ -1,11 +0,0 @@
--- /usr/include/boost/polygon/polygon.hpp.orig 2012-01-26 01:05:15.934998805 +0800
+++ /usr/include/boost/polygon/polygon.hpp 2012-01-26 01:13:10.547000000 +0800
@@ -24,6 +24,8 @@
#include "transform.hpp"
#include "detail/transform_detail.hpp"
+#include "detail/polygon_sort_adaptor.hpp"
+
//interval
#include "interval_data.hpp"
#include "interval_traits.hpp"

View file

@ -1,23 +0,0 @@
diff -up /home/petr/tmp/blefuj.cc\~ /home/petr/tmp/blefuj.cc
--- boost_1_46_0_beta1/libs/signals/src/named_slot_map.cpp~ 2011-02-03 20:28:07.000000000 +0100
+++ boost_1_46_0_beta1/libs/signals/src/named_slot_map.cpp 2011-02-03 20:51:29.000000000 +0100
@@ -47669,7 +47669,7 @@ void named_slot_map::disconnect(const st
i->first.disconnect();
i = next;
}
- groups.erase(group);
+ groups.erase(const_group_iterator (group));
}
}
@@ -47692,7 +47692,7 @@ void named_slot_map::remove_disconnected
}
// Clear out empty groups
- if (empty(g)) groups.erase(g++);
+ if (empty(g)) groups.erase(const_group_iterator (g++));
else ++g;
}
}
Diff finished. Thu Feb 3 20:51:41 2011

View file

@ -13,50 +13,39 @@
Summary: Portable C++ libraries
Name: boost
Version: 1.50.0
Release: 4
Version: 1.53.0
Release: 1
License: Boost
Group: Development/C++
URL: http://boost.org/
Source0: http://sourceforge.net/projects/boost/files/boost/%{version}/boost_%(echo %version |sed -e 's,\.,_,g').tar.bz2
# Upstream patch to fixes a bug when compiled using a C++11 compiler
Patch0: http://www.boost.org/patches/1_50_0/001-unordered.patch
# The patch may break c++03, and there is therefore no plan yet to include
# it upstream: https://svn.boost.org/trac/boost/ticket/4999
Patch2: boost-1.50.0-signals-erase.patch
# https://svn.boost.org/trac/boost/ticket/6150
Patch4: boost-1.50.0-fix-non-utf8-files.patch
Patch1: 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:
# http://www.boost.org/boost-build2/doc/html/bbv2/overview.html
Patch5: boost-1.48.0-add-bjam-man-page.patch
Patch2: boost-1.48.0-add-bjam-man-page.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=756005
# https://svn.boost.org/trac/boost/ticket/6131
Patch7: boost-1.50.0-foreach.patch
Patch3: boost-1.50.0-foreach.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/6406 fixed, but only in Boost-1.51.0
# https://svn.boost.org/trac/boost/ticket/6408
# https://svn.boost.org/trac/boost/ticket/6410
# https://svn.boost.org/trac/boost/ticket/6413
# https://svn.boost.org/trac/boost/ticket/6415
Patch9: boost-1.50.0-attribute.patch
# https://svn.boost.org/trac/boost/ticket/6408 - random
# https://svn.boost.org/trac/boost/ticket/6410 - optional
# https://svn.boost.org/trac/boost/ticket/6413 - gil
Patch4: boost-1.50.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
# https://bugzilla.redhat.com/show_bug.cgi?id=784654
Patch12: boost-1.50.0-polygon.patch
Patch5: boost-1.50.0-long-double-1.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
Patch6: boost-1.50.0-pool.patch
BuildRequires: bzip2-devel
BuildRequires: python-devel
@ -72,11 +61,11 @@ libraries. The emphasis is on libraries which work well with the C++
Standard Library. This package contains only the shared libraries
needed for running programs using Boost.
%ifarch %arm %mips
%define boostlibs date_time filesystem graph iostreams math_c99 math_c99f math_tr1 math_tr1f prg_exec_monitor program_options python regex serialization signals system thread unit_test_framework wave wserialization random chrono locale timer
%else
%define boostlibs date_time filesystem graph iostreams math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l prg_exec_monitor program_options python regex serialization signals system thread unit_test_framework wave wserialization random chrono locale timer
%define boostlibs atomic context date_time filesystem graph iostreams math_c99 math_c99f math_tr1 math_tr1f prg_exec_monitor program_options python regex serialization signals system thread unit_test_framework wave wserialization random chrono locale timer
%else
%define boostlibs atomic context date_time filesystem graph iostreams math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l prg_exec_monitor program_options python regex serialization signals system thread unit_test_framework wave wserialization random chrono locale timer
%endif
# (Anssi 01/2010) dashes are converted to underscores for macros ($lib2);
@ -162,15 +151,12 @@ same place as the documentation.
%prep
%setup -q -n boost_%{packver}
%patch0 -p0
%patch1 -p1
%patch2 -p1
%patch3 -p2
%patch4 -p1
%patch5 -p1
%patch7 -p2
%patch9 -p1
%patch10 -p1
%patch12 -p3
%patch15 -p0
%patch6 -p0
# Preparing the docs
mkdir packagedoc
@ -196,7 +182,7 @@ find libs -type f \( -name "*.?pp" ! -path "*test*" ! -path "*src*" ! -path "*to
./%{boost_bjam} --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir} install
# (Anssi 01/2010) add compatibility symlinks:
# (Anssi 01/2010) add compatibility symlinks:
for file in %{buildroot}%{_libdir}/*.so; do
cp -a $file ${file%.so}-mt.so
done
@ -229,249 +215,12 @@ find . %buildroot -name "*.*~" |xargs rm -f
%doc examples/*
%changelog
* The Oct 04 2012 Alexander Kazancev <kazancas@mandriva.org> 1.50.0-2
- sync with fedora and mageia packages
- build force with python and icu
- build mt flavour
* Mon Jul 02 2012 Crispin Boylan <crisb@mandriva.org> 1.50.0-1
+ Revision: 807763
- New release
* Sat Apr 07 2012 Bernhard Rosenkraenzer <bero@bero.eu> 1.49.0-2
+ Revision: 789742
- Rebuild for icu 49.x
* Sat Mar 31 2012 Bernhard Rosenkraenzer <bero@bero.eu> 1.49.0-1
+ Revision: 788431
- Update to 1.49.0
- Fix up rpmlint errors
* Tue Nov 29 2011 Andrey Bondrov <abondrov@mandriva.org> 1.48.0-2
+ Revision: 735431
- Add patch from upstream to fix problem with forearch in 1.48
* Mon Nov 28 2011 Crispin Boylan <crisb@mandriva.org> 1.48.0-1
+ Revision: 734884
- New release
* Tue Sep 06 2011 Leonardo Coelho <leonardoc@mandriva.org> 1.47.0-1
+ Revision: 698384
- bump new version
- add exceptions to treat boost throw_exception
+ Matthew Dawkins <mattydaw@mandriva.org>
- fix bootlibs macro on arm/mips
* Sun Jun 05 2011 Funda Wang <fwang@mandriva.org> 1.46.1-6
+ Revision: 682806
- rebuild for new icu
* Sun May 22 2011 Oden Eriksson <oeriksson@mandriva.com> 1.46.1-5
+ Revision: 677149
- rebuild
* Sat Apr 16 2011 Tomasz Pawel Gajc <tpg@mandriva.org> 1.46.1-4
+ Revision: 653309
- rebuild
* Tue Mar 15 2011 Funda Wang <fwang@mandriva.org> 1.46.1-3
+ Revision: 644952
- add patch from upstream to fix lightsprk build
* Mon Mar 14 2011 Funda Wang <fwang@mandriva.org> 1.46.1-2
+ Revision: 644525
- rebuild for new icu
* Sun Mar 13 2011 Funda Wang <fwang@mandriva.org> 1.46.1-1
+ Revision: 644409
- new version 1.46.1
- add cmake patch from fedora, and synced cmake build conditioned
- drop merged patch
* Tue Nov 02 2010 Crispin Boylan <crisb@mandriva.org> 1.44.0-4mdv2011.0
+ Revision: 592080
- Patch 1 to fix boost issue #4598
* Fri Oct 29 2010 Funda Wang <fwang@mandriva.org> 1.44.0-3mdv2011.0
+ Revision: 590114
- rebuild for new python
* Thu Sep 02 2010 Thierry Vignaud <tv@mandriva.org> 1.44.0-2mdv2011.0
+ Revision: 575199
- let the doc subpackage be noarch
* Sun Aug 22 2010 Emmanuel Andry <eandry@mandriva.org> 1.44.0-1mdv2011.0
+ Revision: 572035
- New version 1.44.0
* Wed Aug 04 2010 Funda Wang <fwang@mandriva.org> 1.43.0-2mdv2011.0
+ Revision: 565900
- patch1 not needed
+ Luis Medinas <lmedinas@mandriva.org>
- Fix static-devel symlinks.
+ Matthew Dawkins <mattydaw@mandriva.org>
- new version 1.43.0
added random to pkgs list
* Sun Mar 21 2010 Funda Wang <fwang@mandriva.org> 1.42.0-3mdv2010.1
+ Revision: 526045
- rebuild for new icu
* Tue Feb 23 2010 Crispin Boylan <crisb@mandriva.org> 1.42.0-2mdv2010.1
+ Revision: 509861
- Add serialization patch from svn fixes crash on exit when using dlopen libs
+ Anssi Hannula <anssi@mandriva.org>
- rebuild for new boost
* Mon Feb 08 2010 Anssi Hannula <anssi@mandriva.org> 1.42.0-1mdv2010.1
+ Revision: 501872
- new version
- conditionally bring back support for building with bjam (there is no
cmake-enabled version of 1.42.0 available)
- drop patches applied upstream (mapnik.patch, fix-serialization.patch)
- build only multithreaded versions of the libraries
- split the libraries into their own subpackages to minimize installation
footprint on user systems
* Thu Feb 04 2010 Jérôme Brenier <incubusss@mandriva.org> 1.41.0-3mdv2010.1
+ Revision: 501005
- add one patch to fix serialization to build easystroke (from upstream)
* Wed Feb 03 2010 Funda Wang <fwang@mandriva.org> 1.41.0-2mdv2010.1
+ Revision: 500157
- add fedora patch to satisfy mapnik build
* Wed Feb 03 2010 Funda Wang <fwang@mandriva.org> 1.41.0-1mdv2010.1
+ Revision: 499854
- BR xsltproc
- New version 1.41.0 (cmake build based)
- drop all build patches as cmake can deal with all things :D
- revert to SONAME=VERSION, keep same with Fedora :(
+ Olivier Blin <blino@mandriva.org>
- simplify long-double check
- fix build on ARM and MIPS, they don't really have long double (from Arnaud Patard)
* Thu Aug 20 2009 Helio Chissini de Castro <helio@mandriva.com> 1.39.0-2mdv2010.0
+ Revision: 418718
- Added patch to fix pyside compilation. This is included in boost-to-be 1.4.0 official near release
* Sat Aug 15 2009 Emmanuel Andry <eandry@mandriva.org> 1.39.0-1mdv2010.0
+ Revision: 416502
- disable BR openmpi-devel, as it's not welcome in main
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
- build with graphml support
- build with mpi support
- fix file permissions for -devel package
- replace patch that sets %%optflags with a new one that takes an environment
variable in stead (P0)
- set same ABI major as Fedora and provide compatibility symlinks for "old"
soname fashion. This should hopefully help decrease the amount of packages
linked against older library versions (P1)
- sync with some fedora patches
- new release: 1.39.1
* Mon Mar 02 2009 Emmanuel Andry <eandry@mandriva.org> 1.38.0-2mdv2009.1
+ Revision: 346986
- New version 1.38.0
- drop P5 (merged upstream)
* Fri Jan 16 2009 Tomasz Pawel Gajc <tpg@mandriva.org> 1.37.0-4mdv2009.1
+ Revision: 330353
- Patch6: fix wrong BOOST_NO_EXCEPTIONS define placement (upstream bug #2469)
* Fri Dec 26 2008 Funda Wang <fwang@mandriva.org> 1.37.0-3mdv2009.1
+ Revision: 319262
- link with libpython
* Tue Dec 23 2008 Funda Wang <fwang@mandriva.org> 1.37.0-2mdv2009.1
+ Revision: 317920
- use correct license
* Sat Dec 20 2008 Tomasz Pawel Gajc <tpg@mandriva.org> 1.37.0-1mdv2009.1
+ Revision: 316499
- use _disable_ld_no_undefined 1 (lof of python stuff)
- Patch2: rediff
- don't export optflags, better to sed them in
- use %%ldflags
- update to new version 1.37.0
* Mon Aug 18 2008 Per Øyvind Karlsen <peroyvind@mandriva.org> 1.36.0-1mdv2009.0
+ Revision: 273337
- new release
- drop P6 (merged upstream)
- compile with -O3
* Mon Jul 14 2008 Oden Eriksson <oeriksson@mandriva.com> 1.35.0-3mdv2009.0
+ Revision: 234634
- rebuild
+ Pixel <pixel@mandriva.com>
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
* Thu May 29 2008 David Walluck <walluck@mandriva.org> 1.35.0-2mdv2009.0
+ Revision: 212839
- patch for gcc 4.3 serialization fix
- patch for gcc 4.3 date_time fix
* Tue May 20 2008 Oden Eriksson <oeriksson@mandriva.com> 1.35.0-1mdv2009.0
+ Revision: 209510
- 1.35.0
- rediffed the patches
- drop upstream implemented patches (CVE-2008-0171+0172 is applied)
- fix the find logig (thanks anssi)
* Tue May 20 2008 Oden Eriksson <oeriksson@mandriva.com> 1.34.1-5mdv2009.0
+ Revision: 209434
- added P5 from fedora (gcc43 patch)
* Sat Feb 09 2008 Anssi Hannula <anssi@mandriva.org> 1.34.1-4mdv2008.1
+ Revision: 164328
- fix CVE-2008-0171 and CVE-2008-0172 (P0, #37412)
+ Olivier Blin <blino@mandriva.org>
- restore BuildRoot
+ Thierry Vignaud <tv@mandriva.org>
- kill re-definition of %%buildroot on Pixel's request
* Fri Nov 30 2007 Anssi Hannula <anssi@mandriva.org> 1.34.1-3mdv2008.1
+ Revision: 114034
- provide libboost_thread.so devel symlink for compatibility
+ Tomasz Pawel Gajc <tpg@mandriva.org>
- add more explicit provides for devel pkg
* Thu Nov 01 2007 Anssi Hannula <anssi@mandriva.org> 1.34.1-2mdv2008.1
+ Revision: 104690
- use version as major as per upstream and debian
- remove boost-configure.patch, modifies irrelevant file
- remove boost-gcc-soname.patch, did not work as intended and is now
unnecessary
- use --layout=system to drop gcc version from soname and remove the
need for manual include move hack
- add patch from boost ml to include version in library name with
--layout=system (boost-layout-system.patch)
- build with libicu
- drop obsolete hacks and comments
- use proper bjam flags (build single- and multi-threaded versions,
release variants only, parallel build)
- ensure major correctness in filelist
* Tue Sep 04 2007 David Walluck <walluck@mandriva.org> 1.34.1-1mdv2008.1
+ Revision: 78984
- 1.34.1
- new lib policy
- rename examples subpackage
- take patches from Fedora
* Fri Jul 06 2007 Adam Williamson <awilliamson@mandriva.org> 1.33.1-6mdv2008.0
+ Revision: 49245
- add patch6 (atomicity.h has moved in recent GCC)
* Thu Oct 4 2012 akdengi <kazancas@mandriva.ru>
+ Commit: 4db83f4
- return Mandriva Cooker spec. Drop cmake build
* Thu Oct 4 2012 akdengi <kazancas@mandriva.ru>
+ Commit: 017e8a5
- sync with fedora and mageia