[Libreoffice-commits] core.git: download.lst external/boost solenv/flatpak-manifest.in

2021-08-10 Thread Stephan Bergmann (via logerrit) 
 download.lst|4 
 external/boost/0001-Fix-include-inside-boost-namespace.patch.2  |   33 
++
 external/boost/0001-Fix-usage-of-deprecated-Boost.Bind-features.patch.2 |   48 
--
 external/boost/UnpackedTarball_boost.mk |4 
 external/boost/boost_1_63_0.undef.warning.patch.1   |8 
-
 solenv/flatpak-manifest.in  |6 
-
 6 files changed, 44 insertions(+), 59 deletions(-)

New commits:
commit 1f6851c6f6d6fee67c56dd4e6e6013ba000eaf84
Author: Stephan Bergmann 
AuthorDate: Tue Aug 10 07:44:53 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 10 09:15:00 2021 +0200

Upgrade external/boost to latest Boost 1.76.0

*   has been 
generated
(on Fedora 34) with

> $ wget 
https://boostorg.jfrog.io/native/main/release/1.76.0/source/boost_1_76_0.tar.bz2
> $ printf 
'f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41 
boost_1_76_0.tar.bz2' | sha256sum -c # cf. 

> boost_1_76_0.tar.bz2: OK
> $ external/boost/repack_tarball.sh boost_1_76_0.tar.bz2
> Unpacking boost_1_76_0.tar.bz2 ...
> Removing unnecessary files ...
> Creating boost_1_76_0.tar.xz ...
> Cleaning up ...
> adfa0ca971c56006a8304b6146d1382e6369815d568f6e6a7440fe29995d51b8  
boost_1_76_0.tar.xz
> Done.

*  external/boost/0001-Fix-include-inside-boost-namespace.patch.2 is 
necessary
to fix

> checking for boost/math/constants/constants.hpp... no
> configure: error: Required boost headers not found.
> make[1]: *** [external/libzmf/ExternalProject_libzmf.mk:28: 
workdir/ExternalProject/libzmf/build] Error 1

with recent libstdc++ 12 trunk (presumably since


"libstdc++: Reduce header dependencies on  and ", and with 
other
standard libraries  was likely already included indirectly 
earlier, so
the include nested in namespace boost::math::tools::meta_programming in the
middle of workdir/UnpackedTarball/boost/boost/math/tools/mp.hpp didn't cause
harm).

Change-Id: I1eee23915fea48bbb383cbeefc4ddfdeaac63e14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120253
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/download.lst b/download.lst
index 618f9f0738e6..f6d3eddc8586 100644
--- a/download.lst
+++ b/download.lst
@@ -10,8 +10,8 @@ export APR_TARBALL := apr-1.5.2.tar.gz
 export APR_UTIL_SHA256SUM := 
976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19
 export APR_UTIL_TARBALL := apr-util-1.5.4.tar.gz
 # please repack the tarball using external/boost/repack_tarball.sh
-export BOOST_SHA256SUM := 
cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b
-export BOOST_TARBALL := boost_1_75_0.tar.xz
+export BOOST_SHA256SUM := 
adfa0ca971c56006a8304b6146d1382e6369815d568f6e6a7440fe29995d51b8
+export BOOST_TARBALL := boost_1_76_0.tar.xz
 export BOX2D_SHA256SUM := 
58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c
 export BOX2D_TARBALL := box2d-2.3.1.tar.gz
 export BREAKPAD_SHA256SUM := 
c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91
diff --git a/external/boost/0001-Fix-include-inside-boost-namespace.patch.2 
b/external/boost/0001-Fix-include-inside-boost-namespace.patch.2
new file mode 100644
index ..ce123dbb4453
--- /dev/null
+++ b/external/boost/0001-Fix-include-inside-boost-namespace.patch.2
@@ -0,0 +1,33 @@
+From 1ec5c98d80de97f9e962c5627e1a0e6096099894 Mon Sep 17 00:00:00 2001
+From: Daniel Scharrer 
+Date: Wed, 28 Jul 2021 19:56:31 +0200
+Subject: [PATCH] Fix #include inside boost namespace
+
+The existing code fails to build if  was not already included.
+---
+ include/boost/math/tools/mp.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/boost/math/tools/mp.hpp b/include/boost/math/tools/mp.hpp
+index 35565646f..dc8440988 100644
+--- a/include/boost/math/tools/mp.hpp
 b/include/boost/math/tools/mp.hpp
+@@ -13,6 +13,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ namespace boost { namespace math { namespace tools { namespace 
meta_programming {
+ 
+@@ -338,7 +339,6 @@ using mp_remove_if_q = mp_remove_if;
+ // Index sequence
+ // Use C++14 index sequence if available
+ #if defined(__cpp_lib_integer_sequence) && (__cpp_lib_integer_sequence >= 
201304)
+-#include 
+ template
+ using index_sequence = std::index_sequence;
+ 
+-- 
+2.31.1
+
diff --git 
a/external/boost/0001-Fix-usage-of-deprecated-Boost.Bind-features.patch.2 
b/external/boost/0001-Fix-usage-of-deprecated-Boost.Bind-features.patch.2
deleted file mode 100644
index 583a9d905214..
---

[Libreoffice-commits] core.git: download.lst external/boost solenv/flatpak-manifest.in

2021-01-06 Thread Stephan Bergmann (via logerrit) 
 download.lst   
  |4 -
 
external/boost/0001-This-bug-was-fixed-in-VC-2013-workaround-no-longer-a.patch.2
 |   40 --
 external/boost/StaticLibrary_boost_date_time.mk
  |2 
 external/boost/StaticLibrary_boost_filesystem.mk   
  |2 
 external/boost/UnpackedTarball_boost.mk
  |9 --
 external/boost/c++20-allocator.patch.0 
  |   24 --
 external/boost/clang-cl.patch.0
  |   28 ---
 external/boost/gcc9.patch.0
  |   10 --
 external/boost/include/boost/property_tree/ptree_fwd.hpp   
  |   31 +++
 solenv/flatpak-manifest.in 
  |6 -
 10 files changed, 38 insertions(+), 118 deletions(-)

New commits:
commit e0f1b5bd94550835c639efda4e4c9a801c78dbe9
Author: Stephan Bergmann 
AuthorDate: Wed Jan 6 15:11:07 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 6 23:01:40 2021 +0100

Upgrade external/boost to latest Boost 1.75.0

*   has been 
generated
(on Fedora 33) with

> $ wget 
https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2
> $ printf 
'953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb 
boost_1_75_0.tar.bz2' | sha256sum -c # cf. 

> boost_1_75_0.tar.bz2: OK
> $ external/boost/repack_tarball.sh boost_1_75_0.tar.bz2
> Unpacking boost_1_75_0.tar.bz2 ...
> Removing unnecessary files ...
> Creating boost_1_75_0.tar.xz ...
> Cleaning up ...
> cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b  
boost_1_75_0.tar.xz
> Done.

*  external/boost/StaticLibrary_boost_date_time.mk:  Even though
date_generators.cpp and greg_weekday.cpp are still present, their function
definitions are now covered by inline function definitions in include files,

> 
workdir/UnpackedTarball/boost/libs/date_time/src/gregorian/greg_weekday.cpp:23:17:
 error: redefinition of 'as_short_string'
>   greg_weekday::as_short_string() const
> ^
> 
workdir/UnpackedTarball/boost/boost/date_time/gregorian/greg_weekday.hpp:52:17: 
note: previous definition is here
> const char* as_short_string() const
> ^

etc. and

> 
workdir/UnpackedTarball/boost/libs/date_time/src/gregorian/date_generators.cpp:23:36:
 error: redefinition of 'nth_as_str'
>   BOOST_DATE_TIME_DECL const char* nth_as_str(int ele)
>^
> workdir/UnpackedTarball/boost/boost/date_time/date_generators.hpp:157:22: 
note: previous definition is here
>   inline const char* nth_as_str(int ele)
>  ^

*  external/boost/StaticLibrary_boost_filesystem.mk now lacked various 
symbols,
as seen when linking external/liborcus' orcus-parser library:

>   "boost::filesystem::emit_error(int, boost::system::error_code*, char 
const*)", referenced from:
[...]
>   "boost::filesystem::emit_error(int, boost::filesystem::path const&, 
boost::system::error_code*, char const*)", referenced from:
[...]
>   "boost::filesystem::emit_error(int, boost::filesystem::path const&, 
boost::filesystem::path const&, boost::system::error_code*, char const*)", 
referenced from:
[...]
>   
"boost::filesystem::filesystem_error::filesystem_error(std::__1::basic_string, std::__1::allocator > const&, 
boost::filesystem::path const&, boost::system::error_code)", referenced from:
[...]
>   
"boost::filesystem::filesystem_error::filesystem_error(std::__1::basic_string, std::__1::allocator > const&, 
boost::filesystem::path const&, boost::filesystem::path const&, 
boost::system::error_code)", referenced from:
[...]
>   "boost::filesystem::filesystem_error::~filesystem_error()", referenced 
from:
[...]
>   "boost::filesystem::detail::dir_itr_close(void*&, void*&)", referenced 
from:
[...]
>   
"boost::filesystem::detail::directory_iterator_construct(boost::filesystem::directory_iterator&,
 boost::filesystem::path const&, unsigned int, boost::system::error_code*)", 
referenced from:
[...]
>   
"boost::filesystem::detail::directory_iterator_increment(boost::filesystem::directory_iterator&,
 boost::system::error_code*)", referenced from:
[...]
>   "typeinfo for boost::filesystem::filesystem_error", referenced from:
[...]

*  No longer sure why external/boost/gcc9.patch.0 from
e7b8728f5c0292a6c6a18e76220b1769ecf25aa3 "external/boost: silence
-Werror=deprecated-copy (GCC trunk towards GCC 9)" was necessary at all, in

[Libreoffice-commits] core.git: download.lst external/boost solenv/flatpak-manifest.in

2020-01-15 Thread David Ostrovsky (via logerrit) 
 download.lst |4 
 external/boost/UnpackedTarball_boost.mk  |3 
 external/boost/boost-android-unified.patch.1 |8 
 external/boost/sse.patch.0   |  533 ---
 external/boost/ubsan.patch.0 |   35 -
 solenv/flatpak-manifest.in   |6 
 6 files changed, 9 insertions(+), 580 deletions(-)

New commits:
commit e355d2dc89963f26e5856be8b324d386e4c564f6
Author: David Ostrovsky 
AuthorDate: Sat Jan 11 09:44:20 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 15 10:27:06 2020 +0100

Bump boost version to 1.71

Change-Id: Ica4aba467aa00236a4d1c5b0411d1ebc657ea4df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86594
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-by: Stephan Bergmann 

diff --git a/download.lst b/download.lst
index d438db7d9375..0fdcf72b1b87 100644
--- a/download.lst
+++ b/download.lst
@@ -6,8 +6,8 @@ export APR_SHA256SUM := 
1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c7
 export APR_TARBALL := apr-1.5.2.tar.gz
 export APR_UTIL_SHA256SUM := 
976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19
 export APR_UTIL_TARBALL := apr-util-1.5.4.tar.gz
-export BOOST_SHA256SUM := 
8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406
-export BOOST_TARBALL := boost_1_69_0.tar.bz2
+export BOOST_SHA256SUM := 
d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee
+export BOOST_TARBALL := boost_1_71_0.tar.bz2
 export BREAKPAD_SHA256SUM := 
7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9
 export BREAKPAD_TARBALL := breakpad.zip
 export BSH_SHA256SUM := 
9e93c73e23aff644b17dfff65674c14150e7f3b38b19635e622235e01c96
diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index 33f2f2cd9b50..acb6d6af6b77 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -17,7 +17,6 @@ boost_patches += boost.utility.Wundef.warnings.patch
 
 boost_patches += boost.noiconv.patch
 
-boost_patches += ubsan.patch.0
 boost_patches += rtti.patch.0
 
 # https://svn.boost.org/trac/boost/ticket/11505
@@ -38,8 +37,6 @@ boost_patches += gcc9.patch.0
 
 boost_patches += msvc2017.patch.0
 
-boost_patches += sse.patch.0
-
 boost_patches += c++20-allocator.patch.0
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
diff --git a/external/boost/boost-android-unified.patch.1 
b/external/boost/boost-android-unified.patch.1
index 46181b862f49..6488bf619e2b 100644
--- a/external/boost/boost-android-unified.patch.1
+++ b/external/boost/boost-android-unified.patch.1
@@ -4,8 +4,8 @@
 template 
 struct is_function : public false_type {};
  
--#if defined(__cpp_noexcept_function_type) && !defined(_MSC_VER)
-+#if defined(__cpp_noexcept_function_type) && !defined(_MSC_VER) && !(defined 
__ANDROID__ && defined __clang__ && __clang_major__ == 5 && __clang_minor__ == 
0 && __clang_patchlevel__ == 300080)
+-#if defined(__cpp_noexcept_function_type) && 
!defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM)
++#if defined(__cpp_noexcept_function_type) && 
!defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM) && !(defined __ANDROID__ && 
defined __clang__ && __clang_major__ == 5 && __clang_minor__ == 0 && 
__clang_patchlevel__ == 300080)
  #define BOOST_TT_NOEXCEPT_PARAM , bool NE
  #define BOOST_TT_NOEXCEPT_DECL noexcept(NE)
  #else
@@ -15,8 +15,8 @@
 template 
 struct is_member_function_pointer : public 
is_member_function_pointer {};
  
--#if defined(_MSVC_LANG) && (_MSVC_LANG >= 201703) 
-+#if (defined(_MSVC_LANG) && (_MSVC_LANG >= 201703)) || (defined __ANDROID__ 
&& defined __clang__ && __clang_major__ == 5 && __clang_minor__ == 0 && 
__clang_patchlevel__ == 300080)
+-#if defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM)
++#if defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM) || (defined __ANDROID__ && 
defined __clang__ && __clang_major__ == 5 && __clang_minor__ == 0 && 
__clang_patchlevel__ == 300080)
 // MSVC can't handle noexcept(b) as a deduced template parameter 
 // so we will have to write everything out :(
  #define BOOST_TT_NOEXCEPT_PARAM
diff --git a/external/boost/sse.patch.0 b/external/boost/sse.patch.0
deleted file mode 100644
index d431c185e7f8..
--- a/external/boost/sse.patch.0
+++ /dev/null
@@ -1,533 +0,0 @@
 boost/type_traits/detail/is_function_cxx_11.hpp
-+++ boost/type_traits/detail/is_function_cxx_11.hpp
-@@ -107,8 +107,10 @@
-template 
-struct is_function : public 
true_type {};
- #endif
-+#if !(defined _M_IX86_FP && _M_IX86_FP == 1) // error C2215: '__vectorcall' 
cannot be used with '/arch:SSE'
-template 
-struct is_function : 
public true_type {};
-+#endif
-// const:
- #ifdef __CLR_VER
-template 
-@@ -120,8 +122,10 @@
-template 
-struct is_function : 
public true_type {};
- #endif
-+#if !(defined _M_IX86_FP && _M_IX86_FP == 1) // error C2215: '__vectorcall' 
cannot be

[Libreoffice-commits] core.git: download.lst external/boost solenv/flatpak-manifest.in

2017-09-18 Thread Stephan Bergmann 
 download.lst   |4 ++--
 external/boost/UnpackedTarball_boost.mk|6 --
 external/boost/boost.type_index.Wundef.warnings.patch  |   12 
 external/boost/boost_1_60_0.undef.warning.patch|   13 ++---
 external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 |   14 --
 external/boost/clang-cl.patch.0|   11 ---
 solenv/flatpak-manifest.in |6 +++---
 7 files changed, 11 insertions(+), 55 deletions(-)

New commits:
commit 9d837f19d1bf4cfbdee528e027f5b72d9b1da73d
Author: Stephan Bergmann 
Date:   Mon Sep 18 17:00:55 2017 +0200

Upgrade to Boost 1.65.1


....
One reason to upgrade is that with 1.63 CppunitTest_tools_test started to 
fail
with -fsanitize=signed-integer-overflow after
331e2e5ed3bf4e0b2c1fab3b7bca836170317827 "long->sal_Int32 in Fraction",

> workdir/UnpackedTarball/boost/boost/integer/common_factor_rt.hpp:300:5: 
runtime error: negation of -2147483648 cannot be represented in type 'int'; 
cast to an unsigned type to negate this value to itself
> #0 0x7f0f99bea71b in 
boost::integer::detail::gcd_optimal_evaluator::operator()(int, int) const 
workdir/UnpackedTarball/boost/boost/integer/common_factor_rt.hpp:300:5
> #1 0x7f0f99bea52a in int boost::integer::detail::gcd_optimal(int 
const&, int const&) 
workdir/UnpackedTarball/boost/boost/integer/common_factor_rt.hpp:372:16
> #2 0x7f0f99be7d70 in int boost::integer::gcd(int const&, int 
const&) workdir/UnpackedTarball/boost/boost/integer/common_factor_rt.hpp:435:12
> #3 0x7f0f99be7620 in boost::rational::normalize() 
workdir/UnpackedTarball/boost/boost/rational.hpp:559:17
> #4 0x7f0f99bdff29 in rational_FromDouble(double) 
tools/source/generic/fract.cxx:449:12
> #5 0x7f0f99bdf8b4 in Fraction::Fraction(double) 
tools/source/generic/fract.cxx:93:25
> #6 0x7f0f9a1bb987 in tools::FractionTest::testMinLongDouble() 
tools/qa/cppunit/test_fract.cxx:79:18
> #7 0x7f0f9a1bddd2 in void std::_Bind::__call(std::tuple<>&&, std::_Index_tuple<0ul>) 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:933:11
> #8 0x7f0f9a1bdbe9 in void std::_Bind::operator()<, void>() 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:991:17
> #9 0x7f0fa5eb53b0 in CppUnit::TestCaseMethodFunctor::operator()() 
const workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:32:5
> #10 0x7f0fa5e1bd1b in 
CppUnit::DefaultProtector::protect(CppUnit::Functor const&, 
CppUnit::ProtectorContext const&) 
workdir/UnpackedTarball/cppunit/src/cppunit/DefaultProtector.cpp:15:12
> #11 0x7f0fa5e8653d in 
CppUnit::ProtectorChain::ProtectFunctor::operator()() const 
workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:25
> #12 0x7f0fa5e7fb7c in 
CppUnit::ProtectorChain::protect(CppUnit::Functor const&, 
CppUnit::ProtectorContext const&) 
workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:86:18
> #13 0x7f0fa5f17fe0 in CppUnit::TestResult::protect(CppUnit::Functor 
const&, CppUnit::Test*, std::__cxx11::basic_string const&) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestResult.cpp:182:28
> #14 0x7f0fa5eb398c in CppUnit::TestCase::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:91:13
> #15 0x7f0fa5eb7887 in 
CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:64:30
> #16 0x7f0fa5eb6a78 in 
CppUnit::TestComposite::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:23:3
> #17 0x7f0fa5eb7887 in 
CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:64:30
> #18 0x7f0fa5eb6a78 in 
CppUnit::TestComposite::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:23:3
> #19 0x7f0fa5f46655 in 
CppUnit::TestRunner::WrappingSuite::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestRunner.cpp:47:27
> #20 0x7f0fa5f16a66 in CppUnit::TestResult::runTest(CppUnit::Test*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestResult.cpp:149:9
> #21 0x7f0fa5f475c6 in CppUnit::TestRunner::run(CppUnit::TestResult&, 
std::__cxx11::basic_string 
const&) workdir/UnpackedTarball/cppunit/src/cppunit/TestRunner.cpp:96:14
> #22 0x534a01 in (anonymous namespace)::ProtectedFixtureFunctor::run() 
const sal/cppunittester/cppunittester.cxx:316:20
>