mirror of
https://abf.rosa.ru/djam/boost.git
synced 2025-04-11 08:44:17 +00:00
Automatic import for version 1.49.0
This commit is contained in:
parent
c9f95d9f65
commit
056e9cf098
3 changed files with 13 additions and 64 deletions
2
.abf.yml
2
.abf.yml
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
"boost_1_48_0.tar.bz2": 27aced5086e96c6f7b2b684bda2bd515e115da35
|
||||
"boost_1_49_0.tar.bz2": 26a52840e9d12f829e3008589abf0a925ce88524
|
||||
|
|
|
@ -1,56 +0,0 @@
|
|||
--- trunk/boost/foreach_fwd.hpp (revision 62661)
|
||||
+++ trunk/boost/foreach_fwd.hpp (revision 75540)
|
||||
@@ -15,4 +15,6 @@
|
||||
#define BOOST_FOREACH_FWD_HPP
|
||||
|
||||
+#include <utility> // for std::pair
|
||||
+
|
||||
// This must be at global scope, hence the uglified name
|
||||
enum boost_foreach_argument_dependent_lookup_hack
|
||||
@@ -26,4 +28,7 @@
|
||||
namespace foreach
|
||||
{
|
||||
+ template<typename T>
|
||||
+ std::pair<T, T> in_range(T begin, T end);
|
||||
+
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// boost::foreach::tag
|
||||
@@ -47,4 +52,22 @@
|
||||
} // namespace foreach
|
||||
|
||||
+// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131
|
||||
+namespace BOOST_FOREACH
|
||||
+{
|
||||
+ using foreach::in_range;
|
||||
+ using foreach::tag;
|
||||
+
|
||||
+ template<typename T>
|
||||
+ struct is_lightweight_proxy
|
||||
+ : foreach::is_lightweight_proxy<T>
|
||||
+ {};
|
||||
+
|
||||
+ template<typename T>
|
||||
+ struct is_noncopyable
|
||||
+ : foreach::is_noncopyable<T>
|
||||
+ {};
|
||||
+
|
||||
+} // namespace BOOST_FOREACH
|
||||
+
|
||||
} // namespace boost
|
||||
|
||||
--- trunk/boost/foreach.hpp (revision 75077)
|
||||
+++ trunk/boost/foreach.hpp (revision 75540)
|
||||
@@ -166,5 +166,5 @@
|
||||
// at the global namespace for your type.
|
||||
template<typename T>
|
||||
-inline boost::foreach::is_lightweight_proxy<T> *
|
||||
+inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *
|
||||
boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
|
||||
|
||||
@@ -191,5 +191,5 @@
|
||||
// at the global namespace for your type.
|
||||
template<typename T>
|
||||
-inline boost::foreach::is_noncopyable<T> *
|
||||
+inline boost::BOOST_FOREACH::is_noncopyable<T> *
|
||||
boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
|
||||
|
19
boost.spec
19
boost.spec
|
@ -10,12 +10,12 @@
|
|||
|
||||
Summary: Portable C++ libraries
|
||||
Name: boost
|
||||
Version: 1.48.0
|
||||
Release: %mkrel 2
|
||||
Version: 1.49.0
|
||||
Release: 1
|
||||
License: Boost
|
||||
Group: Development/C++
|
||||
URL: http://boost.org/
|
||||
Source0: http://sourceforge.net/projects/boost/files/boost/%{version}/boost_1_48_0.tar.bz2
|
||||
Source0: http://sourceforge.net/projects/boost/files/boost/%{version}/boost_%(echo %version |sed -e 's,\.,_,g').tar.bz2
|
||||
%if %cmake_build
|
||||
BuildRequires: cmake
|
||||
%else
|
||||
|
@ -27,8 +27,6 @@ Patch0: boost-use-cxxflags.patch
|
|||
Patch1: boost-1.48.0-cmakeify-full.patch
|
||||
# (leonardoc) this patch comes from fedora
|
||||
Patch2: boost-1.47.0-exceptions.patch
|
||||
# (abondrov) https://svn.boost.org/trac/boost/ticket/6131
|
||||
Patch3: boost-1.48.0-fix-boost-foreach.patch
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: zlib-devel
|
||||
|
@ -185,6 +183,8 @@ done
|
|||
rm -f %{buildroot}%{_libdir}/*-d.* %{buildroot}%{_libdir}/*-d-mt.*
|
||||
# Remove cmake configuration files used to build the Boost libraries
|
||||
rm -f %{buildroot}%{_libdir}/Boost*.cmake
|
||||
# Fix packaged backup files in examples
|
||||
find . %buildroot -name "*.*~" |xargs rm -f
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
@ -219,7 +219,12 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Nov 29 2011 Andrey Bondrov <abondrov@mandriva.org> 1.48.0-2mdv2012.0
|
||||
* 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
|
||||
|
||||
|
@ -227,7 +232,7 @@ rm -rf %{buildroot}
|
|||
+ Revision: 734884
|
||||
- New release
|
||||
|
||||
* Tue Sep 06 2011 Leonardo Coelho <leonardoc@mandriva.com> 1.47.0-1
|
||||
* 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
|
||||
|
|
Loading…
Add table
Reference in a new issue