[boost] update boost to 1.69. Fixes #5023 #4961 (#5059)

* Update boost to 1.69. Fixes #5023

- Remove boost-signal (rationale: deprecated and removed in 1.69)
- Remove boost-hana workaround by xiangfan-ms #4186 #3579 (rationale: 1.69 incorporates required fixes in hana master branch; builds fine in VS2017 15.9)

* [boost-signals] Restore signals from boost 1.68 because it is required by wt

* [boost-vcpkg-helpers] Improve dependency detection

* [boost-iostreams] Revert to cmake build to enable dependencies

* [boost-iostreams] Fix use of zstd in static builds

* [libtorrent] Update to 1.2.0

* [wt] Update to 4.0.5

* [boost-safe-numerics] [boost-vcpkg-helpers] Added safe_numerics; slight mod to regex match

* [hpx] Backport boost 1.69 fixes

* [libtorrent] Clean up cmake file installation

* [boost-type-traits] Fix MSVC arm

4 files changed, 26 insertions, 87 deletions

diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL
index 815a53497..519d08553 100644
--- a/ports/libtorrent/CONTROL
+++ b/ports/libtorrent/CONTROL
@@ -1,4 +1,4 @@
 Source: libtorrent
-Version: 1.1.6-1
+Version: 1.2.0-1
 Description: An efficient feature complete C++ BitTorrent implementation 
-Build-Depends: openssl, boost-system, boost-date-time, boost-chrono, boost-random, boost-asio, boost-crc, boost-config, boost-iterator
+Build-Depends: openssl, boost-system, boost-date-time, boost-chrono, boost-random, boost-asio, boost-crc, boost-config, boost-iterator, boost-scope-exit, boost-multiprecision
diff --git a/ports/libtorrent/add-datetime-to-boost-libs.patch b/ports/libtorrent/add-datetime-to-boost-libs.patch
index 35d8de1cf..1ec65a8f5 100644
--- a/ports/libtorrent/add-datetime-to-boost-libs.patch
+++ b/ports/libtorrent/add-datetime-to-boost-libs.patch
@@ -1,13 +1,16 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 340e38f..1963d90 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -258,7 +258,7 @@ endif()
- 
- # Boost
- if(NOT DEFINED Boost_INCLUDE_DIR OR NOT DEFINED Boost_LIBRARIES)
--	FIND_PACKAGE(Boost REQUIRED COMPONENTS system chrono random)
-+	FIND_PACKAGE(Boost REQUIRED COMPONENTS system date_time chrono random)
- endif()
- include_directories(${Boost_INCLUDE_DIRS})
- target_link_libraries(torrent-rasterbar ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 944602b..9d95446 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -678,9 +678,9 @@ else()

+ endif()

+ 

+ # Boost

+-find_public_dependency(Boost REQUIRED COMPONENTS system)

++find_public_dependency(Boost REQUIRED COMPONENTS system date_time)

+ target_include_directories(torrent-rasterbar PUBLIC ${Boost_INCLUDE_DIRS})

+-target_link_libraries(torrent-rasterbar PUBLIC ${Boost_SYSTEM_LIBRARY})

++target_link_libraries(torrent-rasterbar PUBLIC ${Boost_LIBRARIES})

+ 

+ if (exceptions)

+ 	if (MSVC)

diff --git a/ports/libtorrent/boost-167.patch b/ports/libtorrent/boost-167.patch
deleted file mode 100644
index 279d517d5..000000000
--- a/ports/libtorrent/boost-167.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/include/libtorrent/ip_filter.hpp b/include/libtorrent/ip_filter.hpp

-index dac1cab..0b29c64 100644

---- a/include/libtorrent/ip_filter.hpp

-+++ b/include/libtorrent/ip_filter.hpp

-@@ -42,6 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.

- 

- #include <boost/limits.hpp>

- #include <boost/utility.hpp>

-+#include <boost/next_prior.hpp>

- #include <boost/cstdint.hpp>

- #include <boost/tuple/tuple.hpp>

- 

-diff --git a/src/kademlia/routing_table.cpp b/src/kademlia/routing_table.cpp

-index 1ac00de..1d11617 100644

---- a/src/kademlia/routing_table.cpp

-+++ b/src/kademlia/routing_table.cpp

-@@ -53,6 +53,7 @@ POSSIBILITY OF SUCH DAMAGE.

- 

- #include <boost/cstdint.hpp>

- #include <boost/bind.hpp>

-+#include <boost/next_prior.hpp>

- 

- #include "libtorrent/aux_/disable_warnings_pop.hpp"

- 

-diff --git a/src/torrent.cpp b/src/torrent.cpp

-index feacfa4..7b2b920 100644

---- a/src/torrent.cpp

-+++ b/src/torrent.cpp

-@@ -46,6 +46,7 @@ POSSIBILITY OF SUCH DAMAGE.

- 

- #include <boost/bind.hpp>

- #include <boost/make_shared.hpp>

-+#include <boost/next_prior.hpp>

- #if TORRENT_USE_I2P

- #  include <boost/algorithm/string/predicate.hpp>

- #endif

-diff --git a/test/test_ip_filter.cpp b/test/test_ip_filter.cpp

-index 21ac404..40e3cd5 100644

---- a/test/test_ip_filter.cpp

-+++ b/test/test_ip_filter.cpp

-@@ -32,6 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.

- 

- #include "libtorrent/ip_filter.hpp"

- #include <boost/utility.hpp>

-+#include <boost/next_prior.hpp>

- 

- #include "test.hpp"

- #include "settings.hpp"

diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake
index 792fe1dee..fb84c9794 100644
--- a/ports/libtorrent/portfile.cmake
+++ b/ports/libtorrent/portfile.cmake
@@ -3,25 +3,14 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO arvidn/libtorrent
-    REF libtorrent-1_1_6
-    SHA512 528034e63330d3c6910ab9db34a2a543618961c0095ecb8f865065516c341d063cba92aed2904b80aa0d0ef65df1b91c400f69d16defad787ff1ffb5edd09e37
+    REF libtorrent_1_2_0
+    SHA512 2dae77f32cf3da388edece7e64b8d9cf359cca735a101d96bb18fb06573fd1d84c303e5bebd370f637d7c73010ea2d99e38748b2259ce02ae8f0dbc0c4f01518
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/add-datetime-to-boost-libs.patch
-        ${CMAKE_CURRENT_LIST_DIR}/boost-167.patch
+    PATCHES add-datetime-to-boost-libs.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBTORRENT_SHARED)
 
-file(READ "${SOURCE_PATH}/include/libtorrent/export.hpp" _contents)
-string(REPLACE "<boost/config/select_compiler_config.hpp>" "<boost/config/detail/select_compiler_config.hpp>" _contents "${_contents}")
-string(REPLACE "<boost/config/select_platform_config.hpp>" "<boost/config/detail/select_platform_config.hpp>" _contents "${_contents}")
-file(WRITE "${SOURCE_PATH}/include/libtorrent/export.hpp" "${_contents}")
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA # Disable this option if project cannot be built with Ninja
@@ -33,22 +22,17 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    # Put shared libraries into the proper directory
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/torrent-rasterbar.dll ${CURRENT_PACKAGES_DIR}/bin/torrent-rasterbar.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/torrent-rasterbar.dll ${CURRENT_PACKAGES_DIR}/debug/bin/torrent-rasterbar.dll)
-
     # Defines for shared lib
-    file(READ ${CURRENT_PACKAGES_DIR}/include/libtorrent/export.hpp EXPORT_H)
+    file(READ ${CURRENT_PACKAGES_DIR}/include/libtorrent/aux_/export.hpp EXPORT_H)
     string(REPLACE "defined TORRENT_BUILDING_SHARED" "1" EXPORT_H "${EXPORT_H}")
-    file(WRITE ${CURRENT_PACKAGES_DIR}/include/libtorrent/export.hpp "${EXPORT_H}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/include/libtorrent/aux_/export.hpp "${EXPORT_H}")
 endif()
 
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/LibtorrentRasterbar TARGET_PATH share/libtorrentrasterbar)
+
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libtorrent)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libtorrent/LICENSE ${CURRENT_PACKAGES_DIR}/share/libtorrent/copyright)
 
 # Do not duplicate include files
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/cmake)