[wt]Upgrade to 4.1.1. (#8903)

4 files changed, 46 insertions, 73 deletions

diff --git a/ports/wt/0003-disable-boost-autolink.patch b/ports/wt/0003-disable-boost-autolink.patch
index 910fbf800..9f7069b6e 100644
--- a/ports/wt/0003-disable-boost-autolink.patch
+++ b/ports/wt/0003-disable-boost-autolink.patch
@@ -1,22 +1,13 @@
-From 21dd691c8ac8d60f49cd051193402187f6912f92 Mon Sep 17 00:00:00 2001
-From: Robert Schumacher <roschuma@microsoft.com>
-Date: Fri, 23 Feb 2018 03:29:09 -0800
-Subject: [PATCH 3/3] disable boost autolink
-
-
-diff --git a/cmake/WtFindBoost-cmake.txt b/cmake/WtFindBoost-cmake.txt
-index b708803..b0c2846 100644
---- a/cmake/WtFindBoost-cmake.txt
-+++ b/cmake/WtFindBoost-cmake.txt
-@@ -89,7 +89,7 @@ IF (Boost_FOUND)
-   SET(BOOST_WTHTTP_MT_FOUND TRUE)
-   SET(BOOST_WTHTTP_FOUND TRUE)
- 
--  IF(MSVC)
-+  IF(MSVC AND 0)
-     # use autolink
-     SET(BOOST_WT_LIBRARIES "")
-     SET(BOOST_WTHTTP_LIBRARIES "")
--- 
-2.16.2.windows.1
-
+diff --git a/cmake/WtFindBoost.txt b/cmake/WtFindBoost.txt

+index e86fd7e..a017f6f 100644

+--- a/cmake/WtFindBoost.txt

++++ b/cmake/WtFindBoost.txt

+@@ -122,7 +122,7 @@ IF (Boost_FOUND)

+   SET(BOOST_WTHTTP_MT_FOUND TRUE)

+   SET(BOOST_WTHTTP_FOUND TRUE)

+ 

+-  IF(MSVC AND Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION LESS 70)

++  IF(0)

+     # use autolink

+     SET(BOOST_WT_LIBRARIES "")

+     SET(BOOST_WTHTTP_LIBRARIES "")

diff --git a/ports/wt/0004-link-ssl.patch b/ports/wt/0004-link-ssl.patch
index 8579223dc..c9efc480b 100644
--- a/ports/wt/0004-link-ssl.patch
+++ b/ports/wt/0004-link-ssl.patch
@@ -1,46 +1,30 @@
-diff --git a/cmake/WtFindSsl.txt b/cmake/WtFindSsl.txt
-index c5f7bbc8..6e2c2f4d 100644
---- a/cmake/WtFindSsl.txt
-+++ b/cmake/WtFindSsl.txt
-@@ -121,6 +121,16 @@ ELSEIF(APPLE)
-       /usr/local/lib
-     NO_DEFAULT_PATH
-   )
-+  FIND_LIBRARY(CRYPTO_LIB
-+    NAMES
-+      crypto
-+    PATHS
-+      ${SSL_PREFIX}/lib
-+      ${SSL_PREFIX}/lib/VC
-+      /usr/lib
-+      /usr/local/lib
-+    NO_DEFAULT_PATH
-+  )
- ELSE (WIN32)
-   FIND_LIBRARY(SSL_LIB
-     NAMES
-@@ -131,6 +141,15 @@ ELSE (WIN32)
-       /usr/lib
-       /usr/local/lib
-   )
-+  FIND_LIBRARY(CRYPTO_LIB
-+    NAMES
-+      crypto
-+    PATHS
-+      ${SSL_PREFIX}/lib
-+      ${SSL_PREFIX}/lib/VC
-+      /usr/lib
-+      /usr/local/lib
-+  )
- ENDIF (WIN32)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bd3b506..560ffb2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -546,6 +546,12 @@ IF(ENABLE_HARU AND HARU_FOUND)
+   SET(WT_HAS_WPDFIMAGE true)
+ ENDIF(ENABLE_HARU AND HARU_FOUND)
  
- IF(SSL_LIB
-@@ -144,7 +163,7 @@ IF(SSL_LIB
-     ENDIF(SSL_TOO_LIB)
-   ELSE(WIN32)
-     SET(SSL_FOUND true)
--    SET(SSL_LIBRARIES ${SSL_LIB} -lcrypto)
-+    SET(SSL_LIBRARIES ${SSL_LIB} ${CRYPTO_LIB})
-   ENDIF(WIN32)
- ENDIF(SSL_LIB
-     AND SSL_INCLUDE_DIRS)
++if (WIN32)
++    add_definitions(-DWT_WIN32)
++endif()
++find_package(OpenSSL REQUIRED)
++set(OPENSSL_FOUND OpenSSL_FOUND)
++set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
+ IF(ENABLE_SSL AND OPENSSL_FOUND)
+   SET(HAVE_SSL ON)
+   SET(WT_WITH_SSL true)
+diff --git a/src/isapi/IsapiRequest.h b/src/isapi/IsapiRequest.h
+index 6c788e2..3f8d213 100644
+--- a/src/isapi/IsapiRequest.h
++++ b/src/isapi/IsapiRequest.h
+@@ -1,5 +1,8 @@
+ #include "WebRequest.h"
+ #include <sstream>
++#ifdef _WIN32
++#include <winsock2.h>
++#endif
+ #include <httpext.h>
+ 
+ namespace Wt {
diff --git a/ports/wt/CONTROL b/ports/wt/CONTROL
index b712ca738..d630e5157 100644
--- a/ports/wt/CONTROL
+++ b/ports/wt/CONTROL
@@ -1,5 +1,5 @@
 Source: wt
-Version: 4.0.5-1
+Version: 4.1.1
 Homepage: https://github.com/emweb/wt
 Description: Wt is a C++ library for developing web applications
 Build-Depends: openssl, sqlite3, libpq, pango, glew, boost-date-time, boost-regex, boost-program-options, boost-signals, boost-system, boost-filesystem, boost-thread, boost-random, boost-multi-index, boost-signals2, boost-asio, boost-ublas, boost-conversion, boost-array, boost-smart-ptr, boost-tuple, boost-algorithm, boost-logic, boost-interprocess
diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake
index bc39a7a64..3160b6af6 100644
--- a/ports/wt/portfile.cmake
+++ b/ports/wt/portfile.cmake
@@ -1,10 +1,8 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO emweb/wt
-    REF 4.0.5
-    SHA512 5513b428bfd3e778726c947606677f3e0774b38e640e61cd94906a2e0c75d204a68072b54ddeb3614a7ba08f5668e6eb3a96d9c8df3744b09dc36ad9be12d924
+    REF 2441ac6dc7a208a33aaa06f62f065f8567bf94f3 # 4.1.1
+    SHA512 5f5e4c58ecec842747fc65061e9bbb75b1d32878d3aceb92436e8f619845c0984e6bce30af4762b913256de863afbf99f83eb76496d8f5dc19e1665a6ba02ed1
     HEAD_REF master
     PATCHES
         0002-link-glew.patch
@@ -51,5 +49,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/var)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/var)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wt RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 vcpkg_copy_pdbs()