diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 6 | ||||
| -rw-r--r-- | external/boost/boost.type_index.Wundef.warnings.patch | 12 | ||||
| -rw-r--r-- | external/boost/boost_1_60_0.undef.warning.patch | 13 | ||||
| -rwxr-xr-x | external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 | 14 | ||||
| -rw-r--r-- | external/boost/clang-cl.patch.0 | 11 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 6 |
7 files changed, 11 insertions, 55 deletions
diff --git a/download.lst b/download.lst index c7389c9ba2de..cfded142c696 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 := beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0 -export BOOST_TARBALL := boost_1_63_0.tar.bz2 +export BOOST_SHA256SUM := 9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81 +export BOOST_TARBALL := boost_1_65_1.tar.bz2 export BREAKPAD_SHA256SUM := 7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9 export BREAKPAD_TARBALL := breakpad.zip export BSH_SHA256SUM := 9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96 diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index d6c53401064f..4156bf7c3261 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.type_index.Wundef.warnings.patch - boost_patches += boost.auto_link.patch boost_patches += boost.noiconv.patch @@ -39,10 +37,6 @@ 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 -# Silence unknown-compiler-warning for MSVC version 19.11.25506: -# https://github.com/boostorg/config/pull/177/commits/a0147b73e8bde8f4b2c19c96166353dba8fa9914 -boost_patches += boost_1_63_0.msvs2017.3.warning.patch.1 - $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL))) diff --git a/external/boost/boost.type_index.Wundef.warnings.patch b/external/boost/boost.type_index.Wundef.warnings.patch deleted file mode 100644 index c542924239b7..000000000000 --- a/external/boost/boost.type_index.Wundef.warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru boost.orig/boost/type_index/stl_type_index.hpp boost/boost/type_index/stl_type_index.hpp ---- foo/misc/boost.orig/boost/type_index/stl_type_index.hpp 2015-06-21 22:16:46.000000000 +0200 -+++ foo/misc/boost/boost/type_index/stl_type_index.hpp 2015-07-16 22:55:42.886944806 +0200 -@@ -174,7 +174,7 @@ - - - inline std::size_t stl_type_index::hash_code() const BOOST_NOEXCEPT { --#if _MSC_VER > 1600 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5 && defined(__GXX_EXPERIMENTAL_CXX0X__)) -+#if (defined(_MSC_VER) && _MSC_VER > 1600) || (__GNUC__ == 4 && __GNUC_MINOR__ > 5 && defined(__GXX_EXPERIMENTAL_CXX0X__)) - return data_->hash_code(); - #else - return boost::hash_range(raw_name(), raw_name() + std::strlen(raw_name())); diff --git a/external/boost/boost_1_60_0.undef.warning.patch b/external/boost/boost_1_60_0.undef.warning.patch index df72af63a424..face1bbc4a3e 100644 --- a/external/boost/boost_1_60_0.undef.warning.patch +++ b/external/boost/boost_1_60_0.undef.warning.patch @@ -1,17 +1,16 @@ diff -ur boost.orig/boost/detail/workaround.hpp boost/boost/detail/workaround.hpp --- a/b/boost.orig/boost/detail/workaround.hpp 2015-12-13 13:49:42.000000000 +0100 +++ a/b/boost/boost/detail/workaround.hpp 2016-01-29 15:07:43.427781248 +0100 -@@ -227,6 +227,13 @@ - #else - #define BOOST_INTEL_WORKAROUND_GUARD 0 - #endif -+ +@@ -5,6 +5,12 @@ + #ifndef WORKAROUND_DWA2002126_HPP + #define WORKAROUND_DWA2002126_HPP + +#ifndef BOOST_GCC_VERSION +#define BOOST_GCC_VERSION_WORKAROUND_GUARD 1 +#else +#define BOOST_GCC_VERSION_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 + #include <boost/config/workaround.hpp> + #endif // WORKAROUND_DWA2002126_HPP diff --git a/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 b/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 deleted file mode 100755 index 41557095a5e3..000000000000 --- a/external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru boost.orig/boost/config/compiler/visualc.hpp boost/boost/config/compiler/visualc.hpp ---- boost.orig/boost/config/compiler/visualc.hpp 2016-12-22 13:33:14.000000000 +0100 -+++ boost/boost/config/compiler/visualc.hpp 2017-09-05 21:33:16.462142600 +0200 -@@ -293,8 +293,8 @@ - #endif - - // --// last known and checked version is 19.10.24629 (VC++ 2017 RC): --#if (_MSC_VER > 1910) -+// last known and checked version is 19.11.25506 (VC++ 2017.3): -+#if (_MSC_VER > 1911) - # if defined(BOOST_ASSERT_CONFIG) - # error "Unknown compiler version - please run the configure tests and report the results" - # else diff --git a/external/boost/clang-cl.patch.0 b/external/boost/clang-cl.patch.0 index 85ce47b22dc3..6d07df7983fa 100644 --- a/external/boost/clang-cl.patch.0 +++ b/external/boost/clang-cl.patch.0 @@ -101,14 +101,3 @@ //For compilers supporting auto-tss cleanup //with Boost.Threads lib, use Boost.Threads lib # define BOOST_THREAD_USE_LIB ---- boost/typeof/typeof.hpp -+++ boost/typeof/typeof.hpp -@@ -49,7 +49,7 @@ - # endif - # endif - --#elif defined(__GNUC__) -+#elif defined(__GNUC__) || defined __clang__ - # ifndef BOOST_TYPEOF_EMULATION - # ifndef BOOST_TYPEOF_NATIVE - # define BOOST_TYPEOF_NATIVE diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index ee9489d96d1b..26666b254afd 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -124,10 +124,10 @@ "dest-filename": "external/tarballs/EmojiOneColor-SVGinOT-1.3.tar.gz" }, { - "url": "https://dev-www.libreoffice.org/src/boost_1_63_0.tar.bz2", - "sha256": "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0", + "url": "https://dev-www.libreoffice.org/src/boost_1_65_1.tar.bz2", + "sha256": "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81", "type": "file", - "dest-filename": "external/tarballs/boost_1_63_0.tar.bz2" + "dest-filename": "external/tarballs/boost_1_65_1.tar.bz2" }, { "url": "https://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz", |