[wt] Update to 4.10.4 (#38063)

Update `wt` to 4.10.4. 

* Remove outdated `0002-link-glew.patch` and replace outdated PR #33369.

* Fix the following errors:
```
1> [CMake] CMake Error at F:/vcpkg/scripts/buildsystems/vcpkg.cmake:859 (_find_package): 
1> [CMake] Could not find a package configuration file provided by "wt" with any of 
1> [CMake] the following names: 
1> [CMake] 
1> [CMake] wtConfig.cmake 
1> [CMake] wt-config.cmake 
1> [CMake] 
1> [CMake] Add the installation prefix of "wt" to CMAKE_PREFIX_PATH or set "wt_DIR" to 
1> [CMake] a directory containing one of the above files. If "wt" provides a separate 
1> [CMake] development package or SDK, be sure it has been installed. 
1> [CMake] Call Stack (most recent call first): 
1> [CMake] CMakeUsage/CMakeLists.txt:17 (find_package)
```

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [ ] ~The "supports" clause reflects platforms that may be fixed by
this new version.~
- [ ] ~Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.~
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.

All features are tested successfully in the following triplet:
```
x86-windows
x64-windows
x64-windows-static
```
The usage test passed on `x64-windows` (header files found):
```
wt provides CMake targets:

  # this is heuristically generated, and may not be correct
  find_package(wt CONFIG REQUIRED)
  target_link_libraries(main PRIVATE Wt::Wt Wt::HTTP Wt::Test Wt::Isapi)
```

---------

Co-authored-by: Monica <v-liumonica@microsoft.com>
This commit is contained in:
MonicaLiu 2024-04-11 06:58:38 -07:00 committed by GitHub
parent e09922ad22
commit 5c12a3bd77
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 22 additions and 40 deletions

View File

@ -1,23 +0,0 @@
From 6301c4ccaf8d3b6982898fed84e691ab8ddd7a4f Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Fri, 23 Feb 2018 03:12:45 -0800
Subject: [PATCH 2/3] link glew
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 80734fb..70e755b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -556,7 +556,8 @@ ENDIF("${WT_WRASTERIMAGE_IMPLEMENTATION}" STREQUAL "GraphicsMagick")
IF(HAVE_GL)
INCLUDE_DIRECTORIES(${GL_INCLUDE_DIRS})
IF(USE_SYSTEM_GLEW)
- TARGET_LINK_LIBRARIES(wt PRIVATE GLEW)
+ find_package(glew REQUIRED)
+ TARGET_LINK_LIBRARIES(wt PRIVATE GLEW::GLEW)
ENDIF(USE_SYSTEM_GLEW)
TARGET_LINK_LIBRARIES(wt PRIVATE ${GL_LIBRARIES})
ELSE(HAVE_GL)
--
2.16.2.windows.1

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca19b30..4765632 100644
index 96eff0a..c31fd49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,7 +197,11 @@ SET(CMAKE_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake" CACHE STRING
@@ -111,7 +111,11 @@ SET(CMAKE_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake" CACHE STRING
IF(WIN32)

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fe932fb7..ae122f03a 100644
index 96eff0a..c31fd49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -342,9 +342,9 @@ SET(WT_WRASTERIMAGE_IMPLEMENTATION ${WT_WRASTERIMAGE_DEFAULT_IMPLEMENTATION} CAC
@@ -352,9 +356,9 @@ SET(WT_WRASTERIMAGE_IMPLEMENTATION ${WT_WRASTERIMAGE_DEFAULT_IMPLEMENTATION} CAC
SET_PROPERTY(CACHE WT_WRASTERIMAGE_IMPLEMENTATION PROPERTY STRINGS GraphicsMagick Direct2D none)
IF (${WT_WRASTERIMAGE_IMPLEMENTATION} STREQUAL "GraphicsMagick")
@ -15,11 +15,11 @@ index 7fe932fb7..ae122f03a 100644
ELSEIF (${WT_WRASTERIMAGE_IMPLEMENTATION} STREQUAL "Direct2D")
IF (WIN32)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fb398ff0d..16b5f76b3 100644
index 4bc0e5d..eb52234 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -632,8 +632,8 @@ ELSE(HAVE_HARU)
ENDIF(HAVE_HARU)
@@ -637,8 +637,8 @@ else()
endif()
IF("${WT_WRASTERIMAGE_IMPLEMENTATION}" STREQUAL "GraphicsMagick")
- TARGET_LINK_LIBRARIES(wt PRIVATE ${GM_LIBRARIES})

View File

@ -1,11 +1,10 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO emweb/wt
REF ${VERSION}
SHA512 70ab7bc79463fb0cf60b5ff07598f58b422cfff8d46fec2e9bb1d8598f5e2785e9f5dad2c6dbc24f7ff0ccf8cdcd8c52a09e647b6e1a9000444a1866f710175d
REF "${VERSION}"
SHA512 f41efec1e77bd76f6f66ffb4ff38c98cfc590debb194682e3c6eb3f7b4366c30f8e2bbc16f4c33faa45f6f49d28812215538d20f4abc6c4dc3a226ae9b10ac71
HEAD_REF master
PATCHES
0002-link-glew.patch
0005-XML_file_path.patch
0006-GraphicsMagick.patch
)
@ -50,7 +49,6 @@ vcpkg_cmake_configure(
-DINSTALL_CONFIG_FILE_PATH="${DOWNLOADS}/wt"
-DSHARED_LIBS=${SHARED_LIBS}
-DBOOST_DYNAMIC=${SHARED_LIBS}
-DDISABLE_BOOST_AUTOLINK=ON
-DBUILD_EXAMPLES=OFF
-DBUILD_TESTS=OFF
@ -71,12 +69,15 @@ vcpkg_cmake_configure(
${WT_PLATFORM_SPECIFIC_OPTIONS}
-DUSE_SYSTEM_SQLITE3=ON
-DUSE_SYSTEM_GLEW=ON
-DCMAKE_INSTALL_DIR=share
# see https://redmine.webtoolkit.eu/issues/9646
-DWTHTTP_CONFIGURATION=
-DCONFIGURATION=
"-DUSERLIB_PREFIX=${CURRENT_INSTALLED_DIR}"
MAYBE_UNUSED_VARIABLES
USE_SYSTEM_SQLITE3
)
@ -93,5 +94,5 @@ file(READ "${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" W_CONFIG_H)
string(REGEX REPLACE "([\r\n])#define RUNDIR[^\r\n]+" "\\1// RUNDIR intentionally unset by vcpkg" W_CONFIG_H "${W_CONFIG_H}")
file(WRITE "${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" "${W_CONFIG_H}")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
vcpkg_copy_pdbs()

View File

@ -1,7 +1,6 @@
{
"name": "wt",
"version": "4.9.1",
"port-version": 2,
"version": "4.10.4",
"description": "Wt is a C++ library for developing web applications",
"homepage": "https://github.com/emweb/wt",
"license": "GPL-2.0-only",

View File

@ -9349,8 +9349,8 @@
"port-version": 0
},
"wt": {
"baseline": "4.9.1",
"port-version": 2
"baseline": "4.10.4",
"port-version": 0
},
"wtl": {
"baseline": "10.0.10320",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f6f5be4e2310add242bc08c30ef6887dd3d5d2fa",
"version": "4.10.4",
"port-version": 0
},
{
"git-tree": "9246a50b2cb7aaf547b61a4343ab3849e22533e6",
"version": "4.9.1",