[Libreoffice-commits] core.git: download.lst external/boost

2023-04-17 Thread Stephan Bergmann (via logerrit) 
 download.lst |4 ++--
 external/boost/StaticLibrary_boost_locale.mk |1 +
 external/boost/boost.between.warning.patch   |8 
 external/boost/boost.fallback.encoding.patch |   16 +++-
 4 files changed, 18 insertions(+), 11 deletions(-)

New commits:
commit 8daa8eef06fa485f5271503921585a3fbef26567
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 13:27:27 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 18:59:32 2023 +0200

Upgrade external/boost to latest Boost 1.82.0

 has been 
generated (on
Fedora 38) with

> $ wget 
https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.bz2
> $ printf 
'a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6 
boost_1_82_0.tar.bz2' | sha256sum -c # cf. 

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

* Updating StaticLibrary_boost_locale.mk is needed to avoid
> 
workdir/UnpackedTarball/boost/libs/locale/src/boost/locale/util/locale_data.cpp:137:
 error: undefined reference to 
'boost::locale::util::normalize_encoding(std::__cxx11::basic_string, std::allocator > const&)'

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

diff --git a/download.lst b/download.lst
index 3257a3d06caa..284d73d2ff70 100644
--- a/download.lst
+++ b/download.lst
@@ -9,8 +9,8 @@ ABW_TARBALL := libabw-0.1.3.tar.xz
 # so that git cherry-pick
 # will not run into conflicts
 # please repack the tarball using external/boost/repack_tarball.sh
-BOOST_SHA256SUM := 
1deb0a5a9e33a6626fcaa1d2efd4c0e74ca2b0eea87c1559e3917f3066b633d6
-BOOST_TARBALL := boost_1_81_0.tar.xz
+BOOST_SHA256SUM := 
e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de
+BOOST_TARBALL := boost_1_82_0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/boost/StaticLibrary_boost_locale.mk 
b/external/boost/StaticLibrary_boost_locale.mk
index 03e3bbc76b66..1193867a6d0e 100644
--- a/external/boost/StaticLibrary_boost_locale.mk
+++ b/external/boost/StaticLibrary_boost_locale.mk
@@ -44,6 +44,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,boost_locale,\
UnpackedTarball/boost/libs/locale/src/boost/locale/std/std_backend \

UnpackedTarball/boost/libs/locale/src/boost/locale/util/codecvt_converter \
UnpackedTarball/boost/libs/locale/src/boost/locale/util/default_locale \
+   UnpackedTarball/boost/libs/locale/src/boost/locale/util/encoding \
UnpackedTarball/boost/libs/locale/src/boost/locale/util/gregorian \
UnpackedTarball/boost/libs/locale/src/boost/locale/util/info \
UnpackedTarball/boost/libs/locale/src/boost/locale/util/locale_data \
diff --git a/external/boost/boost.between.warning.patch 
b/external/boost/boost.between.warning.patch
index 8c9ba65a1d39..349a9065ce62 100644
--- a/external/boost/boost.between.warning.patch
+++ b/external/boost/boost.between.warning.patch
@@ -1,6 +1,14 @@
 diff -ru boost.orig/boost/libs/locale/src/encoding/codepage.cpp 
boost/boost/libs/locale/src/encoding/codepage.cpp
 --- foo/misc/boost.orig/libs/locale/src/encoding/codepage.cpp
 +++ foo/misc/boost/libs/locale/src/boost/locale/encoding/codepage.cpp
+@@ -8,6 +8,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "boost/locale/encoding/conv.hpp"
+ #if BOOST_LOCALE_USE_WIN32_API
 @@ -58,6 +58,9 @@
  return cvt->convert(begin, end);
  #endif
diff --git a/external/boost/boost.fallback.encoding.patch 
b/external/boost/boost.fallback.encoding.patch
index 3ad39c47b638..8aa5ed6d1276 100644
--- a/external/boost/boost.fallback.encoding.patch
+++ b/external/boost/boost.fallback.encoding.patch
@@ -1,13 +1,11 @@
 --- foo/misc/boost.orig/libs/locale/src/util/locale_data.cpp.new   
2022-02-17 22:41:27.730549039 +
 +++ foo/misc/boost/libs/locale/src/boost/locale/util/locale_data.cpp
-@@ -18,8 +18,8 @@
- language = "C";
- country.clear();
- variant.clear();
--encoding = "us-ascii";
--utf8 = false;
-+encoding = "UTF-8";
-+utf8 = true;
- parse_from_lang(locale_name);
+@@ -50,6 +50,8 @@
+ bool locale_data::parse(const std::string& locale_name)
+ {
+ reset();
++encoding_ = "UTF-8";
++utf8_ = true;
+ return parse_from_lang(locale_name);
  }

[Libreoffice-commits] core.git: download.lst external/boost

2023-01-04 Thread Stephan Bergmann (via logerrit) 
 download.lst   
  |4 
 
external/boost/0001-Avoid-boost-phoenix-placeholders-uarg1.10-ODR-violat.patch.2
 |   27 ++
 
external/boost/0001-Change-mpl-integral_c-to-boost-integral_constant-to-.patch.2
 |   91 --
 external/boost/UnpackedTarball_boost.mk
  |   10 -
 external/boost/boost.between.warning.patch 
  |   16 -
 external/boost/boost.fallback.encoding.patch   
  |4 
 external/boost/boost.noiconv.patch 
  |   78 
 external/boost/libc++.patch.0  
  |   12 -
 external/boost/windows-no-utf8-locales.patch.0 
  |   20 --
 9 files changed, 81 insertions(+), 181 deletions(-)

New commits:
commit ed259e5efe432386b54c553cbc644b3b64976852
Author: Stephan Bergmann 
AuthorDate: Wed Jan 4 17:57:45 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 5 07:14:18 2023 +

Upgrade external/boost to latest Boost 1.81.0

 has been 
generated (on
Fedora 37) with

> $ wget 
https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.bz2
> $ printf 
'71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa 
boost_1_81_0.tar.bz2' | sha256sum -c # cf. 

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

* external/boost/windows-no-utf8-locales.patch.0, introduced with
  f046fed2782f0d4244aff719ba70a56399a2583a "Don't ever attempt to 
initialise a
  std::locale with a UTF-8 locale on Windows", was presumably obsoleted by
  

  "Use UTF-16 <-> UTF-8 codecvt on Windows".

* external/boost/libc++.patch.0 was obsoleted by
  

  "The std lib unary/binary_function base classes are deprecated/removed 
from
  libcpp15."

* 
external/boost/0001-Change-mpl-integral_c-to-boost-integral_constant-to-.patch.2
  was obsoleted by
  

  "Change mpl::integral_c to boost::integral_constant to avoid Clang 16 
errors
  when constructing out of range enums (refs #24, boostorg/mpl#69)".

* 
external/boost/0001-Avoid-boost-phoenix-placeholders-uarg1.10-ODR-violat.patch.2
  is needed to e.g. avoid
> 
./.libs/libetonyek_internal.a(libetonyek_internal_la-KEY1DivElement.o):(.bss+0x3e):
 multiple definition of `boost::phoenix::placeholders::uarg1'; 
./.libs/libetonyek_internal.a(libetonyek_internal_la-IWORKFormula.o):(.bss+0x3e):
 first defined here
  etc. while building ExternalProject_libetonyek, caused by
  

  "std::tuple support (Resolving #103) (#104)".

Change-Id: I48773166d0c50f2850d8bb37fa6215d9e5c0d51d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145044
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/download.lst b/download.lst
index 6cfc19a0573b..c41e59d336fb 100644
--- a/download.lst
+++ b/download.lst
@@ -9,8 +9,8 @@ ABW_TARBALL := libabw-0.1.3.tar.xz
 # so that git cherry-pick
 # will not run into conflicts
 # please repack the tarball using external/boost/repack_tarball.sh
-BOOST_SHA256SUM := 
322e567e98c466c0aa0e380ed8c647552fe4af48998648428f1b5f0c8eff4666
-BOOST_TARBALL := boost_1_80_0.tar.xz
+BOOST_SHA256SUM := 
1deb0a5a9e33a6626fcaa1d2efd4c0e74ca2b0eea87c1559e3917f3066b633d6
+BOOST_TARBALL := boost_1_81_0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/boost/0001-Avoid-boost-phoenix-placeholders-uarg1.10-ODR-violat.patch.2
 
b/external/boost/0001-Avoid-boost-phoenix-placeholders-uarg1.10-ODR-violat.patch.2
new file mode 100644
index ..e0989727fb5a
--- /dev/null
+++ 
b/external/boost/0001-Avoid-boost-phoenix-placeholders-uarg1.10-ODR-violat.patch.2
@@ -0,0 +1,27 @@
+From 50973dc10ea16931245ea61a00b2ce9041acc5ba Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann 
+Date: Wed, 4 Jan 2023 17:33:31 +0100
+Subject: [PATCH] Avoid boost::phoenix::placeholders::uarg1..10 ODR violations
+
+Those variables, defined in an include file, had external linkage, causing ODR
+violations.  Make them const to implicitly give them

[Libreoffice-commits] core.git: download.lst external/boost

2022-08-19 Thread Stephan Bergmann (via logerrit) 
 download.lst|4 -
 external/boost/StaticLibrary_boost_filesystem.mk|1 
 external/boost/StaticLibrary_boost_locale.mk|   53 ++--
 external/boost/boost.between.warning.patch  |2 
 external/boost/boost.fallback.encoding.patch|2 
 external/boost/boost.noiconv.patch  |2 
 external/boost/include/boost/container/flat_map.hpp |   32 
 external/boost/windows-no-utf8-locales.patch.0  |4 -
 8 files changed, 69 insertions(+), 31 deletions(-)

New commits:
commit 3a04cfe27b433a6be22fff39212e2432f91f8747
Author: Stephan Bergmann 
AuthorDate: Fri Aug 19 10:17:24 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 19 13:42:41 2022 +0200

Upgrade external/boost to latest Boost 1.80.0

 has been 
generated (on
Fedora 36) with

> $ wget 
https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.bz2
> $ printf 
'1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 
boost_1_80_0.tar.bz2' | sha256sum -c # cf. 

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

* In StaticLibrary_boost_filesystem,


"Updated protection of remove_all against CVE-2022-21658 on POSIX" had
introduced uses of certain POSIX *at functions (like utimensat) 
conditionally on
some new BOOST_FILESYSTEM_HAS_POSIX_AT_APIS, to be discovered by
workdir/UnpackedTarball/boost/libs/filesystem/CMakeLists.txt which we don't 
run.
At least AT_NO_AUTOMOUNT, as used in
workdir/UnpackedTarball/boost/libs/filesystem/src/operations.cpp, appears 
to be
unavailable on the macOS baseline, but otherwise assume that all that POSIX
functionality is available on all other non-Windows baselines and hardcode 
that
in external/boost/StaticLibrary_boost_filesystem.mk.  (If it turns out that 
we
need to exclude some more platforms there, we /might/ need to backport


"Fixed a missing include on POSIX systems that don't support *at APIs" from 
the
develop branch towards Boost 1.81.)

* In StaticLibrary_boost_locale,


"Support systems without implicit include path" had moved source files 
around
(and then would have failed with

> 
workdir/UnpackedTarball/boost/libs/locale/src/boost/locale/shared/mo_lambda.cpp:7:10:
 fatal error: 'boost/locale/shared/mo_lambda.hpp' file not found
> #include "boost/locale/shared/mo_lambda.hpp"
>  ^~~

etc. without the additional -I option).

* Some Clang builds would have started to fail with

> In file included from desktop/qa/unit/desktop-lok-init.cxx:19:
> In file included from desktop/inc/lib/init.hxx:20:
> In file included from 
workdir/UnpackedTarball/boost/boost/container/flat_map.hpp:26:
> workdir/UnpackedTarball/boost/boost/container/new_allocator.hpp:168:12: 
error: '__cpp_sized_deallocation' is not defined, evaluates to 0 
[-Werror,-Wundef]
>   # if __cpp_sized_deallocation
>^

so add another external/boost/include/ wrapper.

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

diff --git a/download.lst b/download.lst
index facceed1caaf..012163625b95 100644
--- a/download.lst
+++ b/download.lst
@@ -6,8 +6,8 @@
 export ABW_SHA256SUM := 
e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
 export ABW_TARBALL := libabw-0.1.3.tar.xz
 # please repack the tarball using external/boost/repack_tarball.sh
-export BOOST_SHA256SUM := 
2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc
-export BOOST_TARBALL := boost_1_79_0.tar.xz
+export BOOST_SHA256SUM := 
322e567e98c466c0aa0e380ed8c647552fe4af48998648428f1b5f0c8eff4666
+export BOOST_TARBALL := boost_1_80_0.tar.xz
 export BOX2D_SHA256SUM := 
d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2
 export BOX2D_TARBALL := box2d-2.4.1.tar.gz
 export BREAKPAD_SHA256SUM := 
c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91
diff --git a/external/boost/StaticLibrary_boost_filesystem.mk 
b/external/boost/StaticLibrary_boost_filesystem.mk
index

[Libreoffice-commits] core.git: download.lst external/boost

2022-05-05 Thread Stephan Bergmann (via logerrit) 
 download.lst   |4 ++--
 external/boost/UnpackedTarball_boost.mk|3 ---
 external/boost/boost.utility.Wundef.warnings.patch |   11 ---
 3 files changed, 2 insertions(+), 16 deletions(-)

New commits:
commit 869a5897cfe8de5f69b2a72f296a443467907c02
Author: Stephan Bergmann 
AuthorDate: Thu May 5 16:58:18 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Thu May 5 21:39:05 2022 +0200

Upgrade external/boost to latest Boost 1.79.0

 has been 
generated (on
Fedora 35) with

> $ wget 
https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2
> $ printf 
'475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39 
boost_1_79_0.tar.bz2' | sha256sum -c # cf. 

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

boost.utility.Wundef.warnings.patch was obsoleted by


"Use #ifdef to test for BOOST_MSVC."

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

diff --git a/download.lst b/download.lst
index 5299b7b11a3b..c648a5323edb 100644
--- a/download.lst
+++ b/download.lst
@@ -6,8 +6,8 @@
 export ABW_SHA256SUM := 
e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
 export ABW_TARBALL := libabw-0.1.3.tar.xz
 # please repack the tarball using external/boost/repack_tarball.sh
-export BOOST_SHA256SUM := 
0df00d3699c2c7c7fd490c5e165a3e72641861ea5d26428de2f008fb9a75659f
-export BOOST_TARBALL := boost_1_78_0.tar.xz
+export BOOST_SHA256SUM := 
2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc
+export BOOST_TARBALL := boost_1_79_0.tar.xz
 export BOX2D_SHA256SUM := 
d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2
 export BOX2D_TARBALL := box2d-2.4.1.tar.gz
 export BREAKPAD_SHA256SUM := 
c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91
diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index 96bf85583673..91a0e264a926 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -12,9 +12,6 @@ boost_patches :=
 #https://svn.boost.org/trac/boost/ticket/6142
 boost_patches += boost.6142.warnings.patch.1
 
-# https://svn.boost.org/trac/boost/ticket/9903
-boost_patches += boost.utility.Wundef.warnings.patch
-
 boost_patches += boost.noiconv.patch
 boost_patches += boost.between.warning.patch
 boost_patches += boost.fallback.encoding.patch
diff --git a/external/boost/boost.utility.Wundef.warnings.patch 
b/external/boost/boost.utility.Wundef.warnings.patch
deleted file mode 100644
index 034709e26033..
--- a/external/boost/boost.utility.Wundef.warnings.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 foo/foo/foo/boost/utility/result_of.hpp
-+++ foo/foo/foo/boost/utility/result_of.hpp
-@@ -72,7 +72,7 @@
- // There doesn't seem to be any other way to turn this off such that the 
presence of
- // the user-defined operator,() below doesn't cause spurious warning all over 
the place,
- // so unconditionally turn it off.
--#if BOOST_MSVC
-+#if defined(BOOST_MSVC) && BOOST_MSVC
- #  pragma warning(disable: 4913) // user defined binary operator ',' exists 
but no overload could convert all operands, default built-in binary operator 
',' used
- #endif
-

[Libreoffice-commits] core.git: download.lst external/boost

2022-02-25 Thread Stephan Bergmann (via logerrit) 
 download.lst|4 ++--
 external/boost/UnpackedTarball_boost.mk |1 -
 external/boost/boost_1_60_0.undef.warning.patch |   16 
 3 files changed, 2 insertions(+), 19 deletions(-)

New commits:
commit 48119cf42acef33dedcbba92d3bfb8cf8c9938d1
Author: Stephan Bergmann 
AuthorDate: Fri Feb 25 08:45:17 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Feb 25 13:28:27 2022 +0100

Upgrade external/boost to latest Boost 1.78.0

 has been 
generated (on
Fedora 35) with

> $ wget 
https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2
> --2022-02-24 12:05:39--  
https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2
> $ printf 
'8681f175d4bdb26c5665793eef08490d7758529330f98d3b29dd0735bccc 
boost_1_78_0.tar.bz2' | sha256sum -c # cf. 

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

external/boost/boost_1_60_0.undef.warning.patch was obsoleted by


"Define __clang_major___WORKAROUND_GUARD"

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

diff --git a/download.lst b/download.lst
index 7102ed63a3b1..38b9ded0ee4d 100644
--- a/download.lst
+++ b/download.lst
@@ -6,8 +6,8 @@
 export ABW_SHA256SUM := 
e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
 export ABW_TARBALL := libabw-0.1.3.tar.xz
 # please repack the tarball using external/boost/repack_tarball.sh
-export BOOST_SHA256SUM := 
9b334d6c6d7af5a0687280788cd8398b8e0b472cd88e52bbc3c3ef11d98e
-export BOOST_TARBALL := boost_1_77_0.tar.xz
+export BOOST_SHA256SUM := 
0df00d3699c2c7c7fd490c5e165a3e72641861ea5d26428de2f008fb9a75659f
+export BOOST_TARBALL := boost_1_78_0.tar.xz
 export BOX2D_SHA256SUM := 
d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2
 export BOX2D_TARBALL := box2d-2.4.1.tar.gz
 export BREAKPAD_SHA256SUM := 
c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91
diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index 9e6a12bc4116..96bf85583673 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -28,7 +28,6 @@ boost_patches += boost_1_59_0.property_tree.wreturn-type.patch
 
 boost_patches += clang-cl.patch.0
 
-boost_patches += boost_1_60_0.undef.warning.patch
 boost_patches += boost_1_63_0.undef.warning.patch.1
 
 boost_patches += windows-no-utf8-locales.patch.0
diff --git a/external/boost/boost_1_60_0.undef.warning.patch 
b/external/boost/boost_1_60_0.undef.warning.patch
deleted file mode 100644
index 1e72d4e17a90..
--- a/external/boost/boost_1_60_0.undef.warning.patch
+++ /dev/null
@@ -1,16 +0,0 @@
 a/b/boost/boost/config/workaround.hpp
-+++ a/b/boost/boost/config/workaround.hpp
-@@ -237,6 +237,13 @@
- #else
- #define BOOST_INTEL_WORKAROUND_GUARD 0
- #endif
-+
-+#ifndef __clang_major__
-+#define __clang_major___WORKAROUND_GUARD 1
-+#else
-+#define __clang_major___WORKAROUND_GUARD 0
-+#endif
-+
- // Always define to zero, if it's used it'll be defined my MPL:
- #define BOOST_MPL_CFG_GCC_WORKAROUND_GUARD 0
-

[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

2020-03-18 Thread Luboš Luňák (via logerrit) 
 download.lst |5 +--
 external/boost/repack_tarball.sh |   60 +++
 2 files changed, 63 insertions(+), 2 deletions(-)

New commits:
commit 996f0e6a0f39434e6e1b1b450262d97af60d663d
Author: Luboš Luňák 
AuthorDate: Mon Mar 2 12:57:42 2020 +0100
Commit: Luboš Luňák 
CommitDate: Wed Mar 18 12:21:23 2020 +0100

repack the boost tarball to be smaller and faster

The tarball is almost 100MiB and it unpacks to roughly 0.75GiB,
because it contains tons of generated html docs and other stuff that
is not needed for building. Unpacking it on Cygwin takes several
minutes (done in parallel, but still) and even on Linux the unpacking
takes longer than the actual compilation.

Change-Id: Ied9f3059530f4e9a856170ec3fcc304631ff8e0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89825
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/download.lst b/download.lst
index 9a8a6681c0e2..9983fc0386b1 100644
--- a/download.lst
+++ b/download.lst
@@ -6,8 +6,9 @@ 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 := 
d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee
-export BOOST_TARBALL := boost_1_71_0.tar.bz2
+# please repack the tarball using external/boost/repack_tarball.sh
+export BOOST_SHA256SUM := 
35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543
+export BOOST_TARBALL := boost_1_71_0.tar.xz
 export BREAKPAD_SHA256SUM := 
7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9
 export BREAKPAD_TARBALL := breakpad.zip
 export BSH_SHA256SUM := 
9e93c73e23aff644b17dfff65674c14150e7f3b38b19635e622235e01c96
diff --git a/external/boost/repack_tarball.sh b/external/boost/repack_tarball.sh
new file mode 100755
index ..ed27875f6def
--- /dev/null
+++ b/external/boost/repack_tarball.sh
@@ -0,0 +1,60 @@
+#! /bin/sh
+
+# Repack the boost tarball as xz (much faster to unpack) and remove
+# a lot of needless files such as generated html docs.
+
+tarball="$1"
+
+if test -z "$tarball" -o ! -f "$tarball"; then
+echo "Usage: $0 "
+exit 1
+fi
+
+tmpdir=$(mktemp -d)
+
+if ! test -d "$tmpdir"; then
+echo mktemp failed
+exit 1
+fi
+
+echo Unpacking "$tarball" ...
+tar x -C "$tmpdir" -f "$tarball"
+if test $? -ne 0; then
+echo tar x failed
+rm -rf "$tmpdir"
+exit 1
+fi
+
+echo Removing unnecessary files ...
+find "$tmpdir" \( -name doc -o -name test -o -name example \) -type d -prune 
-print0 | xargs -0 rm -r
+if test $? -ne 0; then
+echo file removal failed
+rm -rf "$tmpdir"
+exit 1
+fi
+
+name="$(basename "$tarball" | sed 's/\.tar.*$//').tar.xz"
+dir=$(ls "$tmpdir")
+
+echo Creating "$name" ...
+# To make the tarball reproducible, use a timestamp of a file inside the 
tarball (they all seem to have the same mtime).
+if ! test -f "$tmpdir/$dir/README.md"; then
+echo timestamp retrieval failed, check the script
+rm -rf "$tmpdir"
+exit 1
+fi
+# Many of the options are to make the tarball reproducible.
+LC_ALL=C tar c -C "$tmpdir" --xz -f "$(pwd)/$name" --format=gnu --sort=name 
--owner=0 --group=0 --mode=go=rX,u=rwX --mtime "$tmpdir/$dir/README.md" "$dir"
+if test $? -ne 0; then
+echo tar c failed
+rm -rf "$tmpdir"
+exit 1
+fi
+
+echo Cleaning up ...
+rm -rf "$tmpdir"
+
+sha256sum "$name"
+
+echo Done.
+exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[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 sfx2/source ucb/Library_ucpcmis1.mk

2019-01-14 Thread Libreoffice Gerrit user 
 download.lst |4 
 external/boost/UnpackedTarball_boost.mk  |3 
 external/boost/boost-android-unified.patch.1 |   46 +-
 external/boost/boost.noiconv.patch   |6 
 external/boost/clang-cl.patch.0  |   18 
 external/boost/include/boost/uuid/sha1.hpp   |   28 -
 external/boost/msvc2017.patch.0  |   22 -
 external/boost/rtti.patch.0  |9 
 external/boost/sse.patch.0   |  533 +++
 sfx2/source/appl/shutdownicon.cxx|2 
 ucb/Library_ucpcmis1.mk  |   11 
 11 files changed, 572 insertions(+), 110 deletions(-)

New commits:
commit 23a8d5ffbbe58761b89f590f0735abccd69a3681
Author: Stephan Bergmann 
AuthorDate: Fri Jan 11 17:40:17 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jan 15 08:24:05 2019 +0100

Upgrade external/boost to Boost 1.69.0

 is a copy of

,
SHA256 hash as given at .

* removed from external/boost/include/boost/ those files that are no longer
  present in workdir/UnpackedTarball/boost/boost/

* the shrunk external/boost/rtti.patch.0 can probably be removed completely 
in a
  follow-up commit

* the patch to libs/filesystem/src/operations.cpp in
  external/boost/boost-android-unified.patch.1 no longer applied, and 
appears to
  be no longer necessary anyway (seeing a working build without it of
  --with-distro=LibreOfficeAndroid and NDK r16b); but with the non-standard
  Clang 5.0.300080 from NDK r16b, the build now caused failures like

> 
workdir/UnpackedTarball/boost/boost/type_traits/detail/is_function_cxx_11.hpp:36:11:
 error: class template partial specialization contains a template parameter 
that cannot be deduced; this partial specialization will never be used 
[-Wunusable-partial-specialization]
>struct is_function : public true_type {};
>   
^
> 
workdir/UnpackedTarball/boost/boost/type_traits/detail/is_function_cxx_11.hpp:35:38:
 note: non-deducible template parameter 'NE'
>template 
>  ^
> 
workdir/UnpackedTarball/boost/boost/type_traits/detail/is_function_cxx_11.hpp:22:40:
 note: expanded from macro 'BOOST_TT_NOEXCEPT_PARAM'
> #define BOOST_TT_NOEXCEPT_PARAM , bool NE
>^

  showing that that version of Clang has the same problem handling 
noexcept(b)
  as a deduced template parameter as MSVC has, as already supported by the 
code

* new external/boost/sse.patch.0 needed on Windows x86 to silence errors 
like

> 
C:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\workdir\UnpackedTarball\boost\boost/type_traits/detail/is_function_cxx_11.hpp(111):
 error C2215: '__vectorcall' cannot be used with '/arch:SSE'

  (); according to
  : "_M_IX86_FP Defined as an integer literal value that 
indicates
  the /arch compiler option that was set, or the default. This macro is 
always
  defined when the compilation target is an x86 processor. Otherwise, 
undefined.
  When defined, the value is: [...] 1 if the /arch:SSE compiler option was 
set."
  and we specify /arch:SSE explicitly for Windows x86 since
  8bd6bf93b7711a7ac7c5cbd7c3bb980481570ebd "fdo#82430: configure: MSVC 
build:
  avoid using SSE2 instructions"

* boost::logic::tribool conversion operator to bool is explicit now

Change-Id: Iea49560d734f545539f062dce46740fbf812dd84
Reviewed-on: https://gerrit.libreoffice.org/66189
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/download.lst b/download.lst
index d6d35ed7d422..d43cdf06f27d 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 := 
5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9
-export BOOST_TARBALL := boost_1_66_0.tar.bz2
+export BOOST_SHA256SUM := 
8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406
+export BOOST_TARBALL := boost_1_69_0.tar.bz2
 export BREAKPAD_SHA256SUM := 
7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9
 export BREAKPAD_TARBALL := breakpad.zip
 export BSH_SHA256SUM := 
9e93c73e23aff644b17dfff65674c14150e7f3b38b19635e622235e01c96
diff --git

[Libreoffice-commits] core.git: download.lst external/boost external/libcmis filter/Library_svgfilter.mk sdext/Library_pdfimport.mk solenv/gbuild

2018-01-22 Thread Michael Stahl 
 download.lst  |4 +-
 external/boost/UnpackedTarball_boost.mk   |2 -
 external/boost/boost.auto_link.patch  |   46 ---
 external/boost/clang-cl.patch.0   |   50 --
 external/libcmis/StaticLibrary_libcmis.mk |4 ++
 filter/Library_svgfilter.mk   |1 
 sdext/Library_pdfimport.mk|1 
 solenv/gbuild/platform/com_GCC_defs.mk|5 +++
 8 files changed, 13 insertions(+), 100 deletions(-)

New commits:
commit 41abd684a6d1f3da71084fd854f66e22cb171b9d
Author: Michael Stahl 
Date:   Fri Jan 19 12:31:06 2018 +0100

boost: upgrade to release 1.66.0

This claims to support Visual Studio 2017.4, but not the current
2017.5.

* remove boost.auto_link.patch; it does not apply; not sure why we
  need this if we can just define BOOST_ALL_NO_LIB
  (see commit 7f2e168421c3cd928a31a52a8b5afe97e931d3ba)
* remove some hunks from clang-cl.patch.0 that look fixed upstream
* add a global workaround for spurious GCC warning:
  oox/source/drawingml/shape.cxx:921:54: error:
  ‘oShadowColor.boost::optional_detail::tc_optional_base::m_storage’
  may be used uninitialized in this function
  [-Werror=maybe-uninitialized]
   aFormat.Color = *oShadowColor;

Change-Id: I1eb1d8b66554a84a7d7269f1faaa98695fe2f501
Reviewed-on: https://gerrit.libreoffice.org/48187
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index ae825299d6cf..f932b7a3b242 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 := 
9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81
-export BOOST_TARBALL := boost_1_65_1.tar.bz2
+export BOOST_SHA256SUM := 
5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9
+export BOOST_TARBALL := boost_1_66_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 44ee759141e5..21136ed2aec0 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -20,8 +20,6 @@ boost_patches += boost.multi_array.C4510.warnings.patch
 # https://svn.boost.org/trac/boost/ticket/9903
 boost_patches += boost.utility.Wundef.warnings.patch
 
-boost_patches += boost.auto_link.patch
-
 boost_patches += boost.noiconv.patch
 
 boost_patches += ubsan.patch.0
diff --git a/external/boost/boost.auto_link.patch 
b/external/boost/boost.auto_link.patch
deleted file mode 100644
index ed60dec66e8d..
--- a/external/boost/boost.auto_link.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ru boost.orig/boost/config/auto_link.hpp boost/boost/config/auto_link.hpp
 foo/misc/boost.orig/boost/config/auto_link.hpp 2015-05-07 
19:11:52.0 +0200
-+++ foo/misc/boost/boost/config/auto_link.hpp  2015-07-18 22:34:14.371946475 
+0200
-@@ -367,42 +367,6 @@
- #  define BOOST_LIB_PREFIX "lib"
- #endif
- 
--//
--// now include the lib:
--//
--#if defined(BOOST_LIB_NAME) \
--  && defined(BOOST_LIB_PREFIX) \
--  && defined(BOOST_LIB_TOOLSET) \
--  && defined(BOOST_LIB_THREAD_OPT) \
--  && defined(BOOST_LIB_RT_OPT) \
--  && defined(BOOST_LIB_VERSION)
--
--#ifdef BOOST_AUTO_LINK_TAGGED
--#  pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) 
BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib")
--#  ifdef BOOST_LIB_DIAGNOSTIC
--# pragma message ("Linking to lib file: " BOOST_LIB_PREFIX 
BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib")
--#  endif
--#elif defined(BOOST_AUTO_LINK_NOMANGLE)
--#  pragma comment(lib, BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib")
--#  ifdef BOOST_LIB_DIAGNOSTIC
--# pragma message ("Linking to lib file: " BOOST_STRINGIZE(BOOST_LIB_NAME) 
".lib")
--#  endif
--#elif defined(BOOST_LIB_BUILDID)
--#  pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" 
BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION 
"-" BOOST_STRINGIZE(BOOST_LIB_BUILDID) ".lib")
--#  ifdef BOOST_LIB_DIAGNOSTIC
--# pragma message ("Linking to lib file: " BOOST_LIB_PREFIX 
BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT 
BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION "-" BOOST_STRINGIZE(BOOST_LIB_BUILDID) 
".lib")
--#  endif
--#else
--#  pragma comment(lib, BOOST_LIB_PREFIX

[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
>

[Libreoffice-commits] core.git: download.lst external/boost

2017-02-03 Thread David Tardon 
 download.lst |4 
 external/boost/UnpackedTarball_boost.mk  |5 
 external/boost/boost.gcc47679.patch  |   20 +-
 external/boost/boost_1_59_0.property_tree.wreturn-type.patch |   21 +-
 external/boost/boost_1_60_0.android.undef.warning.patch  |   16 --
 external/boost/boost_1_60_0.quadmath.patch   |   86 ---
 external/boost/boost_1_60_0.undef.warning.patch  |   63 ++--
 external/boost/boost_1_63_0.undef.warning.patch.1|   12 +
 external/boost/clang-cl.patch.0  |   33 
 external/boost/rtti.patch.0  |   10 -
 10 files changed, 56 insertions(+), 214 deletions(-)

New commits:
commit 2c1ae441892da3a40cde3a7a796e97cbe9f1da2a
Author: David Tardon 
Date:   Wed Feb 1 12:49:48 2017 +0100

upload boost 1.63.0

Change-Id: I7f896bb9650f68626b4bcfe96c9c41fafeab436a
Reviewed-on: https://gerrit.libreoffice.org/33827
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/download.lst b/download.lst
index d5ecfcb..7f48a49 100644
--- a/download.lst
+++ b/download.lst
@@ -6,8 +6,8 @@ export APR_MD5SUM := 98492e965963f852ab29f9e61b2ad700
 export APR_TARBALL := apr-1.5.2.tar.gz
 export APR_UTIL_MD5SUM := 866825c04da827c6e5f53daff5569f42
 export APR_UTIL_TARBALL := apr-util-1.5.4.tar.gz
-export BOOST_MD5SUM := 65a840e1a0b13a558ff19eeb2c4f0cbe
-export BOOST_TARBALL := boost_1_60_0.tar.bz2
+export BOOST_MD5SUM := 1c837ecd990bb022d07e7aab32b09847
+export BOOST_TARBALL := boost_1_63_0.tar.bz2
 export BREAKPAD_TARBALL := breakpad.zip
 export BREAKPAD_MD5SUM := 415ce291aa6f2ee1d5db7b62bf62ade8
 export BSH_TARBALL := beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index 604f882..813e663 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -34,11 +34,8 @@ boost_patches += 
boost_1_59_0.property_tree.wreturn-type.patch
 
 boost_patches += clang-cl.patch.0
 
-# This patch was already applied upstream
-# 
https://github.com/boostorg/math/commit/74ff2db959c5fa75bec770c41ed2951a740fe936
-boost_patches += boost_1_60_0.quadmath.patch
 boost_patches += boost_1_60_0.undef.warning.patch
-boost_patches += boost_1_60_0.android.undef.warning.patch
+boost_patches += boost_1_63_0.undef.warning.patch.1
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
diff --git a/external/boost/boost.gcc47679.patch 
b/external/boost/boost.gcc47679.patch
index 06cbd0f..38a8be7 100644
--- a/external/boost/boost.gcc47679.patch
+++ b/external/boost/boost.gcc47679.patch
@@ -1,16 +1,16 @@
-diff -ru boost.orig/boost/optional/optional.hpp 
boost/boost/optional/optional.hpp
 foo/misc/boost.orig/boost/optional/optional.hpp2015-07-18 
11:27:36.168127029 +0200
-+++ foo/misc/boost/boost/optional/optional.hpp 2015-07-18 20:36:13.777997833 
+0200
-@@ -53,6 +53,8 @@
- 
- #include 
+diff -ru boost.orig/boost/optional/detail/optional_aligned_storage.hpp 
boost/boost/optional/detail/optional_aligned_storage.hpp
+--- foo/misc/boost.orig/boost/optional/detail/optional_aligned_storage.hpp 
2015-07-18 11:27:36.168127029 +0200
 foo/misc/boost/boost/optional/detail/optional_aligned_storage.hpp  
2015-07-18 20:36:13.777997833 +0200
+@@ -14,6 +14,8 @@
+ #ifndef 
BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_ALIGNED_STORAGE_AJK_12FEB2016_HPP
+ #define 
BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_ALIGNED_STORAGE_AJK_12FEB2016_HPP
  
 +#include 
 +
- #if (defined BOOST_NO_CXX11_RVALUE_REFERENCES) || (defined 
BOOST_OPTIONAL_CONFIG_NO_RVALUE_REFERENCES)
- #define BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES
- #endif
-@@ -134,6 +136,11 @@
+ namespace boost {
+ 
+ namespace optional_detail {
+@@ -39,6 +41,11 @@ class aligned_storage
  
public:
  
diff --git a/external/boost/boost_1_59_0.property_tree.wreturn-type.patch 
b/external/boost/boost_1_59_0.property_tree.wreturn-type.patch
index bc718ef..1673e4b 100644
--- a/external/boost/boost_1_59_0.property_tree.wreturn-type.patch
+++ b/external/boost/boost_1_59_0.property_tree.wreturn-type.patch
@@ -1,15 +1,14 @@
 aka MSVC warning C4715: not all control paths return a value
 
-diff -ru 
boost.org/boost/property_tree/detail/json_parser/standard_callbacks.hpp 
boost/boost/property_tree/detail/json_parser/standard_callbacks.hpp
 
foo/misc/boost.org/boost/property_tree/detail/json_parser/standard_callbacks.hpp
   2015-07-07 14:20:48.0 +0200
-+++ 
foo/misc/boost/boost/property_tree/detail/json_parser/standard_callbacks.hpp
   2015-07-22 08:35:07.764263463 +0200
+diff -ru 
boost.org/boost/property_tree/json_parser/detail/standard_callbacks.hpp 
boost/boost/property_tree/json_parser/detail/standard_callbacks.hpp
+---

[Libreoffice-commits] core.git: download.lst external/boost

2016-01-30 Thread David Ostrovsky 
 download.lst  |4 
 external/boost/UnpackedTarball_boost.mk   |   19 
 external/boost/boost.boost_static_assert_unused_attribute.patch.0 |   11 
 external/boost/boost.ptr_container.Wextra.warnings.patch  |   12 
 external/boost/boost.ptr_container.Wignored-qualifiers.warnings.patch |   11 
 external/boost/boost.ptr_container.Wshadow.warnings.patch |  181 
---
 external/boost/boost.ptr_container.Wunused-parameter.warnings.patch   |   23 
 external/boost/boost.signals2.unused.parameters.patch |   20 
 external/boost/boost.wdeprecated-auto_ptr.patch.0 |  237 
--
 external/boost/boost_1_60_0.quadmath.patch|   86 
+++
 external/boost/boost_1_60_0.undef.warning.patch   |   48 ++
 11 files changed, 143 insertions(+), 509 deletions(-)

New commits:
commit 70d49424b8b54ee80676495fe49a7d3eb1f805c0
Author: David Ostrovsky 
Date:   Fri Jan 29 16:12:30 2016 +0100

Bump boost version to 1.60

Change-Id: I9c6e55e2e09d72f6d02c985955ca84b59628ed15
Reviewed-on: https://gerrit.libreoffice.org/21903
Tested-by: Jenkins 
Reviewed-by: David Ostrovsky 
Tested-by: David Ostrovsky 

diff --git a/download.lst b/download.lst
index aedb01e..bb13908 100644
--- a/download.lst
+++ b/download.lst
@@ -6,8 +6,8 @@ export APR_MD5SUM := eff9d741b0999a9bbab96862dd2a2a3d
 export APR_TARBALL := apr-1.4.8.tar.gz
 export APR_UTIL_MD5SUM := 71a11d037240b292f824ba1eb537b4e3
 export APR_UTIL_TARBALL := apr-util-1.5.3.tar.gz
-export BOOST_MD5SUM := 6aa9a5c6a4ca1016edd0ed1178e3cb87
-export BOOST_TARBALL := boost_1_59_0.tar.bz2
+export BOOST_MD5SUM := 65a840e1a0b13a558ff19eeb2c4f0cbe
+export BOOST_TARBALL := boost_1_60_0.tar.bz2
 export BSH_TARBALL := ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip
 export BZIP2_TARBALL := 00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz
 export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index b3a9c3a..ef65937 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -29,14 +29,6 @@ boost_patches += 
boost.multi_array.Wunused-local-typedefs.warnings.patch
 boost_patches += boost.preprocessor.Wundef.warnings.patch
 # https://svn.boost.org/trac/boost/ticket/9892
 boost_patches += boost.property_tree.Wshadow.warnings.patch.1
-# https://svn.boost.org/trac/boost/ticket/9894
-boost_patches += boost.ptr_container.Wshadow.warnings.patch
-# https://svn.boost.org/trac/boost/ticket/9895
-boost_patches += boost.ptr_container.Wignored-qualifiers.warnings.patch
-# https://svn.boost.org/trac/boost/ticket/9896
-boost_patches += boost.ptr_container.Wextra.warnings.patch
-# https://svn.boost.org/trac/boost/ticket/9897
-boost_patches += boost.ptr_container.Wunused-parameter.warnings.patch
 # fixed upstream
 boost_patches += boost.random.Wunused-local-typedefs.warnings.patch
 # https://svn.boost.org/trac/boost/ticket/9900
@@ -52,7 +44,6 @@ boost_patches += boost.utility.Wundef.warnings.patch
 # Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
 ifeq (GCC,$(COM))
 boost_patches += boost_1_44_0-unused-parameters.patch
-boost_patches += boost.signals2.unused.parameters.patch
 endif
 
 # Clang warnings:
@@ -61,9 +52,7 @@ boost_patches += boost_1_44_0-clang-warnings.patch
 boost_patches += boost.auto_link.patch
 boost_patches += boost.std.move.patch
 boost_patches += boost.wunused.patch
-boost_patches += boost.wdeprecated-auto_ptr.patch.0
 boost_patches += boost.signal2.Wshadow.warnings.patch
-boost_patches += boost.boost_static_assert_unused_attribute.patch.0
 
 boost_patches += ubsan.patch.0
 boost_patches += rtti.patch.0
@@ -85,9 +74,15 @@ boost_patches += boost_1_59_0.multi_array.wshadow.patch
 # https://svn.boost.org/trac/boost/ticket/11501
 boost_patches += boost_1_59_0.property_tree.wreturn-type.patch
 
-boost_patches += clang-cl.patch.0
+# TODO(davido): port the patch if needed to 1.60
+#boost_patches += clang-cl.patch.0
 boost_patches += gcc6-warnings.patch.0
 
+# This patch was already applied upstream
+# 
https://github.com/boostorg/math/commit/74ff2db959c5fa75bec770c41ed2951a740fe936
+boost_patches += boost_1_60_0.quadmath.patch
+boost_patches += boost_1_60_0.undef.warning.patch
+
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
diff --git a/external/boost/boost.boost_static_assert_unused_attribute.patch.0 
b/external/boost/boost.boost_static_assert_unused_attribute.patch.0
deleted file mode 100644
index ef54a7f..000
--- a/external/boost/boost.boost_static_assert_unused_attribute.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@

[Libreoffice-commits] core.git: download.lst external/boost

2015-08-29 Thread David Ostrovsky 
 download.lst   
 |3 
 external/boost/UnpackedTarball_boost.mk
 |   13 -
 external/boost/boost.concept_check.Wunused-local-typedefs.warnings.patch.1 
 |   13 -
 external/boost/boost.preprocessor.Wundef.warnings.patch
 |   12 -
 external/boost/boost.spirit.Wunused-local-typedefs.warnings.patch  
 |   11 -
 external/boost/boost_1_44_0-unused-parameters.patch
 |   42 ++---
 
external/boost/boost_1_59_0.move.Bool-type-collision.4f9c2b62fbdcf5995ecf50a2ecf2494048a6696d.patch
 |   44 -
 external/boost/boost_1_59_0.signal2.wshadow.patch  
 |   63 
 external/boost/boost_1_59_0.system.no.deprecated.patch 
 |   74 ++
 external/boost/boost_1_59_0.type_index.wshadow.patch   
 |   15 --
 external/boost/boost_1_59_0.unique_ptr.wshadow.patch   
 |   14 -
 11 files changed, 99 insertions(+), 205 deletions(-)

New commits:
commit 9a6cdce37e601b1406c71fef16ad9b315045c9da
Author: David Ostrovsky da...@ostrovsky.org
Date:   Thu Aug 27 10:18:19 2015 +0200

Bump boost to 1.59 final release

Change-Id: Id71e098dd2356043d2b5fee0736ebfedb5c8c1cd
Reviewed-on: https://gerrit.libreoffice.org/18050
Reviewed-by: David Ostrovsky da...@ostrovsky.org
Tested-by: David Ostrovsky da...@ostrovsky.org

diff --git a/download.lst b/download.lst
index 8b1d7d2..9382aef 100644
--- a/download.lst
+++ b/download.lst
@@ -15,7 +15,8 @@ export APR_MD5SUM := eff9d741b0999a9bbab96862dd2a2a3d
 export APR_TARBALL := apr-1.4.8.tar.gz
 export APR_UTIL_MD5SUM := 71a11d037240b292f824ba1eb537b4e3
 export APR_UTIL_TARBALL := apr-util-1.5.3.tar.gz
-export BOOST_TARBALL := 
9804305aae0c9de9f8cfc02e3de75167-boost_1_59_0_b1_rc1.tar.bz2
+export BOOST_MD5SUM := 6aa9a5c6a4ca1016edd0ed1178e3cb87
+export BOOST_TARBALL := boost_1_59_0.tar.bz2
 export BSH_TARBALL := ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip
 export BZIP2_TARBALL := 00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz
 export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
diff --git a/external/boost/UnpackedTarball_boost.mk 
b/external/boost/UnpackedTarball_boost.mk
index 732b564..54899c4 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -70,8 +70,6 @@ boost_patches += rtti.patch.0
 
 # https://svn.boost.org/trac/boost/ticket/11505
 boost_patches += boost_1_59_0.mpl.config.wundef.patch
-# https://svn.boost.org/trac/boost/ticket/11503
-boost_patches += boost_1_59_0.type_index.wshadow.patch
 # https://svn.boost.org/trac/boost/ticket/11502
 boost_patches += boost_1_59_0.property_tree.wtype-limits.patch
 # https://svn.boost.org/trac/boost/ticket/11507
@@ -82,19 +80,12 @@ boost_patches += boost_1_59_0.iostreams.wshadow.patch
 boost_patches += boost_1_59_0.iostreams.wunused.patch
 # https://svn.boost.org/trac/boost/ticket/11506
 boost_patches += boost_1_59_0.rational.wshadow.patch
-# https://svn.boost.org/trac/boost/ticket/11510
-boost_patches += boost_1_59_0.unique_ptr.wshadow.patch
-# fixed upstream
-# https://svn.boost.org/trac/boost/ticket/11500
-boost_patches += 
boost_1_59_0.move.Bool-type-collision.4f9c2b62fbdcf5995ecf50a2ecf2494048a6696d.patch
 # https://svn.boost.org/trac/boost/ticket/11511
 boost_patches += boost_1_59_0.multi_array.wshadow.patch
-# https://svn.boost.org/trac/boost/ticket/11512
-boost_patches += boost_1_59_0.signal2.wshadow.patch
 # https://svn.boost.org/trac/boost/ticket/11501
 boost_patches += boost_1_59_0.property_tree.wreturn-type.patch
-# fixed upstream by bdcd06c4cc1971d763e528b8cb1d0f16fcc5ecf4
-boost_patches += boost.concept_check.Wunused-local-typedefs.warnings.patch.1
+# https://svn.boost.org/trac/boost/ticket/11597
+boost_patches += boost_1_59_0.system.no.deprecated.patch
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
 
diff --git 
a/external/boost/boost.concept_check.Wunused-local-typedefs.warnings.patch.1 
b/external/boost/boost.concept_check.Wunused-local-typedefs.warnings.patch.1
deleted file mode 100644
index c85fc7e..000
--- a/external/boost/boost.concept_check.Wunused-local-typedefs.warnings.patch.1
+++ /dev/null
@@ -1,13 +0,0 @@
-Fixed differently upstream by commit bdcd06c4cc1971d763e528b8cb1d0f16fcc5ecf4
-
 boost/boost/concept/detail/general.hpp.orig2015-07-31 
14:03:08.184447736 +0200
-+++ boost/boost/concept/detail/general.hpp 2015-07-31 14:03:10.048447591 
+0200
-@@ -67,7 +67,7 @@
- 
- // Version check from https://svn.boost.org/trac/boost/changeset/82886
- // (boost/static_assert.hpp)
--#if defined(__GNUC__)  ((__GNUC__  4) || ((__GNUC__

[Libreoffice-commits] core.git: download.lst external/boost solenv/gbuild

2015-07-30 Thread David Ostrovsky 
 download.lst   
 |2 
 external/boost/UnpackedTarball_boost.mk
 |   68 
 external/boost/boost.7551.unusedvars.patch 
 |   10 
 external/boost/boost.9397.warnings.patch.0 
 |   91 -
 external/boost/boost.auto_link.patch   
 |   12 
 external/boost/boost.bind.Wunused-local-typedefs.warnings.patch
 |   11 
 external/boost/boost.concept_check.C4100.warnings.patch
 |   19 
 external/boost/boost.concept_check.Wunused-local-typedefs.warnings.patch   
 |   13 
 external/boost/boost.date_time.Wunused-local-typedefs.warnings.patch   
 |  101 -
 external/boost/boost.endian.patch  
 |   11 
 external/boost/boost.gcc47679.patch
 |   86 -
 external/boost/boost.loplugin.patch
 |   19 
 external/boost/boost.math.Wdeprecated-register.patch.0 
 |   36 
 external/boost/boost.math.Wunused-local-typedefs.warnings.patch
 |   34 
 external/boost/boost.multi_array.C4510.warnings.patch  
 |9 
 external/boost/boost.multi_array.Wshadow.warnings.patch.2  
 |   46 
 external/boost/boost.multi_array.Wundef.warnings.patch 
 |   11 
 external/boost/boost.multi_array.Wunused-local-typedefs.warnings.patch 
 |5 
 external/boost/boost.multi_index.Wshadow.warnings.patch.1  
 |   94 -
 external/boost/boost.predef.Wundef.warnings.patch  
 |   11 
 external/boost/boost.preprocessor.Wundef.warnings.patch
 |  111 +
 external/boost/boost.property_tree.Wshadow.warnings.patch.1
 |  137 -
 external/boost/boost.property_tree.Wtype-limits.warnings.patch.1   
 |   41 
 external/boost/boost.random.Wshadow.warnings.patch 
 |  277 ---
 external/boost/boost.random.Wunused-local-typedefs.warnings.patch  
 |   27 
 external/boost/boost.spirit.Wunused-local-typedefs.warnings.patch  
 |   34 
 external/boost/boost.std.move.patch
 |   13 
 external/boost/boost.transform_width.patch 
 |   11 
 external/boost/boost.tuple.Wunused-local-typedefs.warnings.patch   
 |   10 
 external/boost/boost.unordered.Wshadow.warnings.patch  
 |  146 -
 external/boost/boost.uuid.Wshadow.warnings.patch   
 |   24 
 external/boost/boost.vc2012.patch  
 |   25 
 external/boost/boost.wdeprecated-auto_ptr.patch.0  
 |   98 -
 external/boost/boost.windows.patch 
 |   12 
 external/boost/boost_1_44_0-unused-parameters.patch
 |  841 ++
 external/boost/boost_1_59_0.iostreams.wshadow.patch
 |  197 ++
 external/boost/boost_1_59_0.iostreams.wunused.patch
 |   12 
 
external/boost/boost_1_59_0.move.Bool-type-collision.4f9c2b62fbdcf5995ecf50a2ecf2494048a6696d.patch
 |   44 
 external/boost/boost_1_59_0.mpl.config.wundef.patch
 |   11 
 external/boost/boost_1_59_0.multi_array.wshadow.patch  
 |  505 ++
 external/boost/boost_1_59_0.property_tree.wreturn-type.patch   
 |   13 
 external/boost/boost_1_59_0.property_tree.wshadow.patch
 |   83 
 external/boost/boost_1_59_0.property_tree.wtype-limits.patch   
 |   19 
 external/boost/boost_1_59_0.rational.wshadow.patch 
 |   12 
 external/boost/boost_1_59_0.signal2.wshadow.patch  
 |   63