[civetweb] Update to version 1.15 (#20078)

5 files changed, 12 insertions, 44 deletions

diff --git a/ports/civetweb/add-option-to-disable-debug-tools.patch b/ports/civetweb/add-option-to-disable-debug-tools.patch
deleted file mode 100644
index 5cf276886..000000000
--- a/ports/civetweb/add-option-to-disable-debug-tools.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 111672d5437a3c7f02b66d730be5000dade58bff Mon Sep 17 00:00:00 2001
-From: Gregor Jasny <gjasny@googlemail.com>
-Date: Tue, 15 Dec 2020 14:38:37 +0100
-Subject: [PATCH] CMake: Add option to disable Debug tools
-Origin: https://github.com/civetweb/civetweb/pull/952
-
-Sometimes one needs the CMake `Debug` build type
-to select the Windows Debug runtime. But at the same
-time the verbose logging output might be unwanted.
-
-This PR adds the `CIVETWEB_ENABLE_DEBUG_TOOLS` option
-to disable extensive logging and assertion.
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 368e5640..000f7972 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -476,8 +476,11 @@ endif()
- 
- 
- # Set up the definitions
-+option(CIVETWEB_ENABLE_DEBUG_TOOLS "For Debug builds enable verbose logging and assertions" ON)
- if (${CMAKE_BUILD_TYPE} MATCHES "[Dd]ebug")
--  add_definitions(-DDEBUG)
-+  if(CIVETWEB_ENABLE_DEBUG_TOOLS)
-+    add_definitions(-DDEBUG)
-+  endif()
-   add_definitions(-O0)
-   add_definitions(-g)
- endif()
--- 
-2.29.2
-
diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake
index 8af5c6d76..7a0837a8b 100644
--- a/ports/civetweb/portfile.cmake
+++ b/ports/civetweb/portfile.cmake
@@ -5,10 +5,9 @@ vcpkg_fail_port_install(MESSAGE "${PORT} does not currently support UWP" ON_TARG
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO civetweb/civetweb
-    REF 8e243456965c9be5212cb96519da69cd54550e3d # v1.13
-    SHA512 6f9daf404975697c6b7a56cc71006aaf14442acf545e483d8a7b845f255d5e5d6e08194fe3350a667e0b737b6924c9d39b025b587af27e7f12cd7b64f314eb70
+    REF eefb26f82b233268fc98577d265352720d477ba4 # v1.15
+    SHA512 5ce962e31b3c07b7110cbc645458dba9c0e26e693fbe3b4a7ffe8a28563827049a22fc5596a911fbcea4d88a9adbef3f82000ff61027ff4387f40e4a4045c26d
     HEAD_REF master
-    PATCHES "add-option-to-disable-debug-tools.patch"
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -18,7 +17,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+    # PREFER_NINJA - See https://github.com/civetweb/civetweb/issues/1024
     OPTIONS
         -DCIVETWEB_BUILD_TESTING=OFF
         -DCIVETWEB_ENABLE_DEBUG_TOOLS=OFF
@@ -36,6 +35,7 @@ vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/civetweb)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/civetweb/vcpkg.json b/ports/civetweb/vcpkg.json
index 77ac71bf0..f39eea59c 100644
--- a/ports/civetweb/vcpkg.json
+++ b/ports/civetweb/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "civetweb",
-  "version": "1.13",
-  "port-version": 2,
+  "version": "1.15",
   "description": "Easy to use, powerful, C/C++ embeddable web server.",
   "homepage": "https://github.com/civetweb/civetweb",
   "supports": "!uwp",
diff --git a/versions/baseline.json b/versions/baseline.json
index 47e50c9f6..4430ddd1e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1281,8 +1281,8 @@
       "port-version": 1
     },
     "civetweb": {
-      "baseline": "1.13",
-      "port-version": 2
+      "baseline": "1.15",
+      "port-version": 0
     },
     "cjson": {
       "baseline": "2019-11-30",
diff --git a/versions/c-/civetweb.json b/versions/c-/civetweb.json
index 4a1f0f827..8c5b7c8e3 100644
--- a/versions/c-/civetweb.json
+++ b/versions/c-/civetweb.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "536e2167b093981486715537c12a52d0696b3840",
+      "version": "1.15",
+      "port-version": 0
+    },
+    {
       "git-tree": "ca6f80fd431dc0a13daa1509308d598700fbd763",
       "version": "1.13",
       "port-version": 2