[boost] update to 1.75.0 (#15090)

5 files changed, 53 insertions, 178 deletions

diff --git a/ports/telnetpp/CONTROL b/ports/telnetpp/CONTROL
index 3118d13bc..f768eb84d 100644
--- a/ports/telnetpp/CONTROL
+++ b/ports/telnetpp/CONTROL
@@ -1,8 +1,8 @@
 Source: telnetpp

-Version: 2.0-4

+Version: 2.1.2

 Homepage: https://github.com/KazDragon/telnetpp

 Description: Telnet++ is an implementation of the Telnet Session Layer protocol using C++14

-Build-Depends: boost-container, boost-signals2, boost-variant, gsl-lite, boost-exception

+Build-Depends: boost-range, boost-container, boost-signals2, boost-variant, gsl-lite, boost-exception

 Default-Features: zlib

 Supports: !uwp

 

diff --git a/ports/telnetpp/fix-build-error.patch b/ports/telnetpp/fix-build-error.patch
deleted file mode 100644
index d72ced01e..000000000
--- a/ports/telnetpp/fix-build-error.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 09b4f9b..6f72c41 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -22,8 +22,8 @@ message("Building Telnet++ with zlib: ${TELNETPP_WITH_ZLIB}")
- message("Building Telnet++ with code coverage: ${TELNETPP_COVERAGE}")
- message("Building Telnet++ with sanitizers: ${TELNETPP_SANITIZE}")
- 
--include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
--conan_basic_setup(TARGETS NO_OUTPUT_DIRS)
-+find_package(gsl-lite REQUIRED)
-+find_package(Boost REQUIRED COMPONENTS container)
- 
- # The required C++ Standard for Telnet++ is C++14.
- set(CMAKE_CXX_STANDARD 14)
-@@ -154,18 +154,24 @@ add_library(telnetpp
-     ${TELNETPP_PRIVATE_INCLUDE_FILES}
- )
- 
-+if (BUILD_SHARED_LIBS)
-+    add_definitions(-Dtelnetpp_EXPORTS)
-+else()
-+    add_definitions(-DTELNETPP_STATIC_DEFINE)
-+endif()
-+
- target_link_libraries(telnetpp
-     PUBLIC
--        CONAN_PKG::gsl-lite
--        CONAN_PKG::boost_container
--        CONAN_PKG::boost_signals2
--        CONAN_PKG::boost_variant
-+        gsl::gsl-lite
-+        Boost::boost
-+        Boost::container
- )
- 
- if (TELNETPP_WITH_ZLIB)
-+    find_package(ZLIB REQUIRED)
-     target_link_libraries(telnetpp
-         PRIVATE
--            CONAN_PKG::zlib
-+            ZLIB::ZLIB
-     )
- endif()
- 
-@@ -179,8 +185,7 @@ set_target_properties(telnetpp
- target_include_directories(telnetpp
-     PUBLIC
-         $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
--        $<INSTALL_INTERFACE:include/telnetpp-${TELNETPP_VERSION}>
--        "${Boost_INCLUDE_DIRS}"
-+        $<INSTALL_INTERFACE:include>
- )
- 
- generate_export_header(telnetpp
-@@ -197,17 +202,19 @@ install(
-         telnetpp
-     EXPORT
-         telnetpp-config
-+    RUNTIME DESTINATION
-+        bin
-     ARCHIVE DESTINATION
--        lib/telnetpp-${TELNETPP_VERSION}
-+        lib
-     LIBRARY DESTINATION
--        lib/telnetpp-${TELNETPP_VERSION}
-+        lib
- )
- 
- install(
-     DIRECTORY
-         include/
-     DESTINATION
--        include/telnetpp-${TELNETPP_VERSION}
-+        include
- )
- 
- export(
-@@ -221,7 +228,7 @@ install(
-     EXPORT
-         telnetpp-config
-     DESTINATION
--        lib/telnetpp-${TELNETPP_VERSION}
-+        share/telnetpp
- )
- 
- include(CMakePackageConfigHelpers)
-@@ -236,7 +243,7 @@ install(
-     FILES
-         "${CMAKE_CURRENT_BINARY_DIR}/telnetpp-config-version.cmake"
-     DESTINATION
--        lib/telnetpp-${TELNETPP_VERSION}
-+        share/telnetpp
- )
- 
- if (TELNETPP_WITH_TESTS)
-diff --git a/include/telnetpp/core.hpp b/include/telnetpp/core.hpp
-index 2362fac..8710d36 100644
---- a/include/telnetpp/core.hpp
-+++ b/include/telnetpp/core.hpp
-@@ -1,7 +1,7 @@
- #pragma once
- 
- #include "telnetpp/detail/export.hpp"
--#include <gsl-lite.h>
-+#include <gsl/gsl-lite.hpp>
- #include <string>
- #include <cstdint>
- 
-diff --git a/src/options/msdp/detail/decoder.cpp b/src/options/msdp/detail/decoder.cpp
-index c0b7906..e725693 100644
---- a/src/options/msdp/detail/decoder.cpp
-+++ b/src/options/msdp/detail/decoder.cpp
-@@ -1,5 +1,6 @@
- #include "telnetpp/options/msdp/detail/decoder.hpp"
- #include "telnetpp/options/msdp/detail/protocol.hpp"
-+#include <vector>
- #include <cassert>
- #include <functional>
- 
diff --git a/ports/telnetpp/fix-install-paths.patch b/ports/telnetpp/fix-install-paths.patch
new file mode 100644
index 000000000..5e2bdd550
--- /dev/null
+++ b/ports/telnetpp/fix-install-paths.patch
@@ -0,0 +1,48 @@
+ CMakeLists.txt | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 09722a9..7bf9952 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -277,18 +277,18 @@ install(
+     EXPORT
+         telnetpp-config
+     ARCHIVE DESTINATION
+-        lib/telnetpp-${TELNETPP_VERSION}
++        lib
+     RUNTIME DESTINATION
+-        lib/telnetpp-${TELNETPP_VERSION}
++        bin
+     LIBRARY DESTINATION
+-        lib/telnetpp-${TELNETPP_VERSION}
++        lib
+ )
+ 
+ install(
+     DIRECTORY
+         include/
+     DESTINATION
+-        include/telnetpp-${TELNETPP_VERSION}
++        include
+ )
+ 
+ export(
+@@ -302,7 +302,7 @@ install(
+     EXPORT
+         telnetpp-config
+     DESTINATION
+-        lib/telnetpp-${TELNETPP_VERSION}
++        share/telnetpp
+ )
+ 
+ include(CMakePackageConfigHelpers)
+@@ -317,7 +317,7 @@ install(
+     FILES
+         "${CMAKE_CURRENT_BINARY_DIR}/telnetpp-config-version.cmake"
+     DESTINATION
+-        lib/telnetpp-${TELNETPP_VERSION}
++        share/telnetpp
+ )
+ 
+ if (TELNETPP_WITH_TESTS)
diff --git a/ports/telnetpp/github-215.patch b/ports/telnetpp/github-215.patch
deleted file mode 100644
index 57461b9a7..000000000
--- a/ports/telnetpp/github-215.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-
----
- include/telnetpp/options/msdp/variable.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/telnetpp/options/msdp/variable.hpp b/include/telnetpp/options/msdp/variable.hpp
-index 16dae0c..d74a6da 100644
---- a/include/telnetpp/options/msdp/variable.hpp
-+++ b/include/telnetpp/options/msdp/variable.hpp
-@@ -5,6 +5,7 @@
- #include <boost/variant.hpp>
- #include <iosfwd>
- #include <string>
-+#include <ostream>
- 
- namespace telnetpp { namespace options { namespace msdp {
- 
-
-
----
- include/telnetpp/options/msdp/variable.hpp | 1 -
- src/options/msdp/variable.cpp              | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/telnetpp/options/msdp/variable.hpp b/include/telnetpp/options/msdp/variable.hpp
-index d74a6da..16dae0c 100644
---- a/include/telnetpp/options/msdp/variable.hpp
-+++ b/include/telnetpp/options/msdp/variable.hpp
-@@ -5,7 +5,6 @@
- #include <boost/variant.hpp>
- #include <iosfwd>
- #include <string>
--#include <ostream>
- 
- namespace telnetpp { namespace options { namespace msdp {
- 
-diff --git a/src/options/msdp/variable.cpp b/src/options/msdp/variable.cpp
-index dc779ea..82549e9 100644
---- a/src/options/msdp/variable.cpp
-+++ b/src/options/msdp/variable.cpp
-@@ -1,5 +1,6 @@
- #include "telnetpp/options/msdp/variable.hpp"
- #include "telnetpp/detail/lambda_visitor.hpp"
-+#include <ostream>
- 
- namespace telnetpp { namespace options { namespace msdp {
- 
diff --git a/ports/telnetpp/portfile.cmake b/ports/telnetpp/portfile.cmake
index 26154cf33..f4a196144 100644
--- a/ports/telnetpp/portfile.cmake
+++ b/ports/telnetpp/portfile.cmake
@@ -1,16 +1,10 @@
-if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
-    message(FATAL_ERROR "${PORT} does not currently support UWP")
-endif()
-
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO KazDragon/telnetpp
-  REF 8dc780579293153ad2ae9ad6943815c050d4c659
-  SHA512 280a8e6c0392f5822b05968520d176d1510f00c12a2502f6039f4f1f78a558e61f825a231fb70b7de6fd21a18b24734eea3ba36a24b29f2a7e9856b1f4de5217
+  REF f370ebd0c0dc6505708065ee5afdc59a6de54387 # v2.1.2 + MSVC patches
+  SHA512 c58cb9159a8fb6c4b089a0212a995f70f08b93877d98828aa263e9f065f42a932d98749b56741d9e711c0805dcc2dcf0607dc86b0553c4e34bd3fad99e0bf157
   HEAD_REF master
-  PATCHES
-    fix-build-error.patch
-    github-215.patch
+  PATCHES fix-install-paths.patch
 )
 
 set(USE_ZLIB OFF)