[Libreoffice-commits] core.git: boost/boost_1_44_0-clang-warnings.patch boost/boost_1_44_0-gcc4.8.patch boost/boost.endian.patch boost/boost.wconstexpr-not-const.patch.0 boost/boost.wshadow.patch boost/boost.wundef.patch boost/boost.wunused.patch boost/UnpackedTarball_boost.mk download.lst
Tor Lillqvist
tml at iki.fi
Thu Aug 22 23:22:16 PDT 2013
boost/UnpackedTarball_boost.mk | 1
boost/boost.endian.patch | 21 +-----
boost/boost.wconstexpr-not-const.patch.0 | 43 ------------
boost/boost.wshadow.patch | 69 --------------------
boost/boost.wundef.patch | 22 ++++++
boost/boost.wunused.patch | 10 --
boost/boost_1_44_0-clang-warnings.patch | 31 ---------
boost/boost_1_44_0-gcc4.8.patch | 104 -------------------------------
download.lst | 2
9 files changed, 29 insertions(+), 274 deletions(-)
New commits:
commit 4910c54a39703d19f5e36fa9c47938c1033f91e9
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Aug 22 11:56:21 2013 +0300
Update the bundled boost to 1.54
Change-Id: I5704ab1beaae1d28c2ae8d643343185e8aa6a749
Reviewed-on: https://gerrit.libreoffice.org/5582
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index a353b03..591d265 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -44,7 +44,6 @@ boost_patches += boost.transform_width.patch
boost_patches += boost.wundef.patch
boost_patches += boost.wunused.patch
boost_patches += boost.wshadow.patch
-boost_patches += boost.wconstexpr-not-const.patch.0
boost_patches += boost.wdeprecated-register.patch.0
boost_patches += boost.wuninitialized.patch
diff --git a/boost/boost.endian.patch b/boost/boost.endian.patch
index bf129f7..14505e0b 100644
--- a/boost/boost.endian.patch
+++ b/boost/boost.endian.patch
@@ -1,22 +1,13 @@
--- foo/foo/foo/boost/detail/endian.hpp
+++ foo/foo/foo/boost/detail/endian.hpp
-@@ -28,16 +28,16 @@
- #ifndef BOOST_DETAIL_ENDIAN_HPP
- #define BOOST_DETAIL_ENDIAN_HPP
-
+@@ -28,8 +28,8 @@
+ //
+ // Special cases come first:
+ //
+-#if defined (__GLIBC__)
-// GNU libc offers the helpful header <endian.h> which defines
++#if defined (__GLIBC__) || defined(__ANDROID__)
+// GNU libc and Android's bionic offer the helpful header <endian.h> which defines
// __BYTE_ORDER
-
--#if defined (__GLIBC__)
-+#if defined (__GLIBC__) || defined(__ANDROID__)
# include <endian.h>
# if (__BYTE_ORDER == __LITTLE_ENDIAN)
- # define BOOST_LITTLE_ENDIAN
- # elif (__BYTE_ORDER == __BIG_ENDIAN)
- # define BOOST_BIG_ENDIAN
--# elif (__BYTE_ORDER == __PDP_ENDIAN)
-+# elif defined(__PDP_ENDIAN) && (__BYTE_ORDER == __PDP_ENDIAN)
- # define BOOST_PDP_ENDIAN
- # else
- # error Unknown machine endianness detected.
diff --git a/boost/boost.wconstexpr-not-const.patch.0 b/boost/boost.wconstexpr-not-const.patch.0
deleted file mode 100644
index 26049be..0000000
--- a/boost/boost.wconstexpr-not-const.patch.0
+++ /dev/null
@@ -1,43 +0,0 @@
---- boost/chrono/duration.hpp
-+++ boost/chrono/duration.hpp
-@@ -663,36 +663,36 @@
- template <class LhsDuration, class RhsDuration>
- struct duration_eq
- {
-- BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const RhsDuration& rhs)
-+ BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const RhsDuration& rhs) const
- {
- typedef typename common_type<LhsDuration, RhsDuration>::type CD;
- return CD(lhs).count() == CD(rhs).count();
- }
- };
-
- template <class LhsDuration>
- struct duration_eq<LhsDuration, LhsDuration>
- {
-- BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const LhsDuration& rhs)
-+ BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const LhsDuration& rhs) const
- {
- return lhs.count() == rhs.count();
- }
- };
-
- template <class LhsDuration, class RhsDuration>
- struct duration_lt
- {
-- BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const RhsDuration& rhs)
-+ BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const RhsDuration& rhs) const
- {
- typedef typename common_type<LhsDuration, RhsDuration>::type CD;
- return CD(lhs).count() < CD(rhs).count();
- }
- };
-
- template <class LhsDuration>
- struct duration_lt<LhsDuration, LhsDuration>
- {
-- BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const LhsDuration& rhs)
-+ BOOST_CONSTEXPR bool operator()(const LhsDuration& lhs, const LhsDuration& rhs) const
- {
- return lhs.count() < rhs.count();
- }
diff --git a/boost/boost.wshadow.patch b/boost/boost.wshadow.patch
index b336f82..d27feac 100644
--- a/boost/boost.wshadow.patch
+++ b/boost/boost.wshadow.patch
@@ -182,75 +182,6 @@
}
/// \endcond
std::size_t k;
---- foo/foo/foo/boost/smart_ptr/detail/allocate_array_helper.hpp
-+++ foo/foo/foo/boost/smart_ptr/detail/allocate_array_helper.hpp
-@@ -33,10 +33,10 @@
- struct rebind {
- typedef allocate_array_helper<A, T[], U> other;
- };
-- allocate_array_helper(const A& allocator, std::size_t size, T** data)
-- : allocator(allocator),
-- size(sizeof(T) * size),
-- data(data) {
-+ allocate_array_helper(const A& allocator_arg, std::size_t size_arg, T** data_arg)
-+ : allocator(allocator_arg),
-+ size(sizeof(T) * size_arg),
-+ data(data_arg) {
- }
- template<class U>
- allocate_array_helper(const allocate_array_helper<A, T[], U>& other)
-@@ -107,9 +107,9 @@
- struct rebind {
- typedef allocate_array_helper<A, T[N], U> other;
- };
-- allocate_array_helper(const A& allocator, T** data)
-- : allocator(allocator),
-- data(data) {
-+ allocate_array_helper(const A& allocator_arg, T** data_arg)
-+ : allocator(allocator_arg),
-+ data(data_arg) {
- }
- template<class U>
- allocate_array_helper(const allocate_array_helper<A, T[N], U>& other)
---- foo/foo/foo/boost/smart_ptr/detail/array_deleter.hpp
-+++ foo/foo/foo/boost/smart_ptr/detail/array_deleter.hpp
-@@ -20,8 +20,8 @@
- template<typename T>
- class array_deleter<T[]> {
- public:
-- array_deleter(std::size_t size)
-- : size(size),
-+ array_deleter(std::size_t size_arg)
-+ : size(size_arg),
- object(0) {
- }
- ~array_deleter() {
---- foo/foo/foo/boost/smart_ptr/detail/make_array_helper.hpp
-+++ foo/foo/foo/boost/smart_ptr/detail/make_array_helper.hpp
-@@ -31,9 +31,9 @@
- struct rebind {
- typedef make_array_helper<T[], U> other;
- };
-- make_array_helper(std::size_t size, T** data)
-- : size(sizeof(T) * size),
-- data(data) {
-+ make_array_helper(std::size_t size_arg, T** data_arg)
-+ : size(sizeof(T) * size_arg),
-+ data(data_arg) {
- }
- template<class U>
- make_array_helper(const make_array_helper<T[], U>& other)
-@@ -99,8 +99,8 @@
- struct rebind {
- typedef make_array_helper<T[N], U> other;
- };
-- make_array_helper(T** data)
-- : data(data) {
-+ make_array_helper(T** data_arg)
-+ : data(data_arg) {
- }
- template<class U>
- make_array_helper(const make_array_helper<T[N], U>& other)
--- foo/foo/foo/boost/unordered/detail/equivalent.hpp
+++ foo/foo/foo/boost/unordered/detail/equivalent.hpp
@@ -536,9 +536,9 @@
diff --git a/boost/boost.wundef.patch b/boost/boost.wundef.patch
index c4928ed..127d78b 100644
--- a/boost/boost.wundef.patch
+++ b/boost/boost.wundef.patch
@@ -1,3 +1,25 @@
+--- foo/foo/foo/boost/detail/endian.hpp
++++ foo/foo/foo/boost/detail/endian.hpp
+@@ -47,7 +47,7 @@
+ # define BOOST_BYTE_ORDER __BYTE_ORDER
+
+ #elif defined(__NetBSD__) || defined(__FreeBSD__) || \
+- defined(__OpenBSD__) || (__DragonFly__)
++ defined(__OpenBSD__) || (defined(__DragonFly__) && (__DragonFly__))
+ //
+ // BSD has endian.h, see https://svn.boost.org/trac/boost/ticket/6013
+ # if defined(__OpenBSD__)
+--- foo/foo/foo/boost/lexical_cast.hpp
++++ foo/foo/foo/boost/lexical_cast.hpp
+@@ -69,7 +69,7 @@
+ throw_exception(bad_lexical_cast(typeid(Source), typeid(Target)))
+ #endif
+
+-#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
++#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || (defined(GCC_VERSION) && GCC_VERSION > 40700)
+ #define BOOST_LCAST_HAS_INT128
+ #endif
+
--- foo/foo/foo/boost/multi_array/base.hpp
+++ foo/foo/foo/boost/multi_array/base.hpp
@@ -65,7 +65,7 @@
diff --git a/boost/boost.wunused.patch b/boost/boost.wunused.patch
index bd7ae92..8a7cab4 100644
--- a/boost/boost.wunused.patch
+++ b/boost/boost.wunused.patch
@@ -1,13 +1,3 @@
---- foo/foo/foo/boost/math/special_functions/fpclassify.hpp
-+++ foo/foo/foo/boost/math/special_functions/fpclassify.hpp
-@@ -100,6 +100,7 @@
- #ifdef isnan
- return isnan(t);
- #elif defined(BOOST_MATH_DISABLE_STD_FPCLASSIFY) || !defined(BOOST_HAS_FPCLASSIFY)
-+ (void) t;
- return false;
- #else // BOOST_HAS_FPCLASSIFY
- return (BOOST_FPCLASSIFY_PREFIX fpclassify(t) == (int)FP_NAN);
--- foo/foo/foo/boost/multi_array/base.hpp
+++ foo/foo/foo/boost/multi_array/base.hpp
@@ -501,6 +501,7 @@
diff --git a/boost/boost_1_44_0-clang-warnings.patch b/boost/boost_1_44_0-clang-warnings.patch
index c5bccaf..0ab1636 100644
--- a/boost/boost_1_44_0-clang-warnings.patch
+++ b/boost/boost_1_44_0-clang-warnings.patch
@@ -9,17 +9,6 @@
{
return 1;
}
---- misc/boost_1_44_0/boost/token_functions.hpp 2010-06-12 14:06:28.000000000 +0200
-+++ misc/build/boost_1_44_0/boost/token_functions.hpp 2012-06-06 23:12:27.000000000 +0200
-@@ -285,7 +285,7 @@
- template <>
- struct assign_or_plus_equal<std::input_iterator_tag> {
- template<class Iterator, class Token>
-- static void assign(Iterator b, Iterator e, Token &t) { }
-+ static void assign(Iterator, Iterator, Token &) { }
- template<class Token, class Value>
- static void plus_equal(Token &t, const Value &v) {
- t += v;
--- misc/boost_1_44_0/boost/random/lagged_fibonacci.hpp
+++ misc/build/boost_1_44_0/boost/random/lagged_fibonacci.hpp
@@ -16,6 +16,10 @@
@@ -59,23 +48,3 @@
#include <boost/config/no_tr1/cmath.hpp> // std::pow
#include <iostream>
#include <algorithm> // std::equal
---- misc/boost_1_44_0/boost/smart_ptr/detail/make_array_helper.hpp
-+++ misc/build/boost_1_44_0/boost/smart_ptr/detail/make_array_helper.hpp
-@@ -72,7 +72,7 @@
- memory->~Y();
- }
- template<typename U>
-- bool operator==(const make_array_helper<T[], U>& other) const {
-+ bool operator==(const make_array_helper<T[], U>&) const {
- return true;
- }
- template<typename U>
-@@ -138,7 +138,7 @@
- memory->~Y();
- }
- template<typename U>
-- bool operator==(const make_array_helper<T[N], U>& other) const {
-+ bool operator==(const make_array_helper<T[N], U>&) const {
- return true;
- }
- template<typename U>
diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch
index fe23c0c..3039a31 100644
--- a/boost/boost_1_44_0-gcc4.8.patch
+++ b/boost/boost_1_44_0-gcc4.8.patch
@@ -1,49 +1,5 @@
---- a/b/boost/boost/math/special_functions/gamma.hpp 2013-05-31 18:09:38.509792503 +0200
-+++ a/b/boost/boost/math/special_functions/gamma.hpp 2013-05-31 18:09:41.438795355 +0200
-@@ -1360,7 +1360,6 @@
- BOOST_FPU_EXCEPTION_GUARD
- typedef typename tools::promote_args<T1, T2>::type result_type;
- typedef typename policies::evaluation<result_type, Policy>::type value_type;
-- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
- typedef typename policies::normalise<
- Policy,
- policies::promote_float<false>,
-@@ -1489,7 +1488,6 @@
- BOOST_FPU_EXCEPTION_GUARD
- typedef typename tools::promote_args<T1, T2>::type result_type;
- typedef typename policies::evaluation<result_type, Policy>::type value_type;
-- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
- typedef typename policies::normalise<
- Policy,
- policies::promote_float<false>,
-@@ -1520,7 +1518,6 @@
- BOOST_FPU_EXCEPTION_GUARD
- typedef typename tools::promote_args<T1, T2>::type result_type;
- typedef typename policies::evaluation<result_type, Policy>::type value_type;
-- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
- typedef typename policies::normalise<
- Policy,
- policies::promote_float<false>,
-@@ -1551,7 +1548,6 @@
- BOOST_FPU_EXCEPTION_GUARD
- typedef typename tools::promote_args<T1, T2>::type result_type;
- typedef typename policies::evaluation<result_type, Policy>::type value_type;
-- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
- typedef typename policies::normalise<
- Policy,
- policies::promote_float<false>,
---- a/b/boost/boost/math/special_functions/detail/igamma_inverse.hpp 2013-05-31 18:11:23.420936359 +0200
-+++ a/b/boost/boost/math/special_functions/detail/igamma_inverse.hpp 2013-05-31 18:11:24.772938706 +0200
-@@ -341,7 +341,6 @@
- // flag is set, then Q(x) - q and it's derivatives.
- //
- typedef typename policies::evaluation<T, Policy>::type value_type;
-- typedef typename lanczos::lanczos<T, Policy>::type evaluation_type;
- typedef typename policies::normalise<
- Policy,
- policies::promote_float<false>,
--- a/b/boost/boost/math/special_functions/beta.hpp 2013-05-31 18:12:02.036007347 +0200
+++ a/b/boost/boost/math/special_functions/beta.hpp 2013-05-31 18:11:56.260996218 +0200
@@ -1331,7 +1331,6 @@
@@ -82,44 +38,8 @@
result_type numerator = static_cast<T>(eng() - (eng.min)());
result_type divisor = static_cast<T>((eng.max)() - (eng.min)());
BOOST_ASSERT(divisor > 0);
---- a/b/boost/boost/lexical_cast.hpp 2013-05-31 13:52:39.758500819 +0200
-+++ a/b/boost/boost/lexical_cast.hpp 2013-05-31 13:52:43.927514850 +0200
-@@ -865,7 +865,6 @@
- #ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
- BOOST_STATIC_ASSERT(!std::numeric_limits<T>::is_signed);
- #endif
-- typedef typename Traits::int_type int_type;
- CharT const czero = lcast_char_constants<CharT>::zero;
- --end;
- value = 0;
---- a/b/boost/boost/math/special_functions/sign.hpp 2013-05-31 13:53:52.518746080 +0200
-+++ a/b/boost/boost/math/special_functions/sign.hpp 2013-05-31 13:59:08.053810037 +0200
-@@ -110,7 +110,6 @@
- {
- typedef typename detail::fp_traits<T>::type traits;
- typedef typename traits::method method;
-- typedef typename boost::is_floating_point<T>::type fp_tag;
- return detail::signbit_impl(x, method());
- }
-
-@@ -124,7 +123,6 @@
- { //!< \brief return unchanged binary pattern of x, except for change of sign bit.
- typedef typename detail::fp_traits<T>::sign_change_type traits;
- typedef typename traits::method method;
-- typedef typename boost::is_floating_point<T>::type fp_tag;
-
- return detail::changesign_impl(x, method());
- }
--- a/b/boost/boost/math/special_functions/fpclassify.hpp 2013-05-31 14:02:13.660436127 +0200
+++ a/b/boost/boost/math/special_functions/fpclassify.hpp 2013-05-31 14:01:17.372246240 +0200
-@@ -328,7 +328,6 @@
- { //!< \brief return true if floating-point type t is finite.
- typedef typename detail::fp_traits<T>::type traits;
- typedef typename traits::method method;
-- typedef typename boost::is_floating_point<T>::type fp_tag;
- typedef typename tools::promote_args<T>::type value_type;
- return detail::isfinite_impl(static_cast<value_type>(x), method());
- }
@@ -339,7 +338,6 @@
{ //!< \brief return true if floating-point type t is finite.
typedef detail::fp_traits<long double>::type traits;
@@ -128,14 +48,6 @@
typedef long double value_type;
return detail::isfinite_impl(static_cast<value_type>(x), method());
}
-@@ -399,7 +397,6 @@
- {
- typedef typename detail::fp_traits<T>::type traits;
- typedef typename traits::method method;
-- typedef typename boost::is_floating_point<T>::type fp_tag;
- typedef typename tools::promote_args<T>::type value_type;
- return detail::isnormal_impl(static_cast<value_type>(x), method());
- }
@@ -410,7 +407,6 @@
{
typedef detail::fp_traits<long double>::type traits;
@@ -144,14 +56,6 @@
typedef long double value_type;
return detail::isnormal_impl(static_cast<value_type>(x), method());
}
-@@ -488,7 +484,6 @@
- {
- typedef typename detail::fp_traits<T>::type traits;
- typedef typename traits::method method;
-- typedef typename boost::is_floating_point<T>::type fp_tag;
- typedef typename tools::promote_args<T>::type value_type;
- return detail::isinf_impl(static_cast<value_type>(x), method());
- }
@@ -499,7 +494,6 @@
{
typedef detail::fp_traits<long double>::type traits;
@@ -160,14 +64,6 @@
typedef long double value_type;
return detail::isinf_impl(static_cast<value_type>(x), method());
}
-@@ -571,7 +565,6 @@
- { //!< \brief return true if floating-point type t is NaN (Not A Number).
- typedef typename detail::fp_traits<T>::type traits;
- typedef typename traits::method method;
-- typedef typename boost::is_floating_point<T>::type fp_tag;
- return detail::isnan_impl(x, method());
- }
-
@@ -585,7 +578,6 @@
{ //!< \brief return true if floating-point type t is NaN (Not A Number).
typedef detail::fp_traits<long double>::type traits;
diff --git a/download.lst b/download.lst
index f859583..e945cb8 100644
--- a/download.lst
+++ b/download.lst
@@ -20,7 +20,7 @@ export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-
export APACHE_COMMONS_HTTPCLIENT_TARBALL := 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
export APACHE_COMMONS_LANG_TARBALL := 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
export APACHE_COMMONS_LOGGING_TARBALL := 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-export BOOST_TARBALL := a00d22605d5dbcfb4c9936a9b35bc4c2-boost_1_53_0.tar.bz2
+export BOOST_TARBALL := 15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
export BSH_TARBALL := ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
More information about the Libreoffice-commits
mailing list