[cpp-httplib] update to 0.15.0 (microsoft#36438)

* [cpp-httplib] update to 0.15.0 * [cpp-httplib] update versions * Update fix-find-brotli.patch Change the EOL from CRLF to LF * [cpp-httplib] change the EOL from CRLF to LF * [cpp-httplib] update to 0.15.1 * [cpp-httplib] update versions * Update cpp-httplib.json --------- Co-authored-by: Lily Wang <[email protected]>
m-kuhn · Jan 30, 2024 · 81e65f7 · 81e65f7
1 parent 5a58e64
commit 81e65f7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/ports/cpp-httplib/fix-find-brotli.patch b/ports/cpp-httplib/fix-find-brotli.patch
@@ -1,20 +1,21 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3515d77..556fb78 100644
+index 73de511..940b6ab 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -138,9 +138,9 @@ endif()
- # Adds our cmake folder to the search path for find_package
+@@ -141,10 +141,10 @@ endif()
+ # This is so we can use our custom FindBrotli.cmake
  list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
  if(HTTPLIB_REQUIRE_BROTLI)
 -	find_package(Brotli COMPONENTS encoder decoder common REQUIRED)
 +	find_package(unofficial-brotli CONFIG REQUIRED)
+ 	set(HTTPLIB_IS_USING_BROTLI TRUE)
  elseif(HTTPLIB_USE_BROTLI_IF_AVAILABLE)
 -	find_package(Brotli COMPONENTS encoder decoder common QUIET)
 +	find_package(unofficial-brotli CONFIG QUIET)
+ 	set(HTTPLIB_IS_USING_BROTLI ${Brotli_FOUND})
  endif()
- # Just setting this variable here for people building in-tree
- if(Brotli_FOUND)
-@@ -223,9 +223,9 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
+
+@@ -217,9 +217,9 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
  		# Needed for API from MacOS Security framework
  		"$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>,$<BOOL:${HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN}>>:-framework CoreFoundation -framework Security>"
  		# Can't put multiple targets in a single generator expression or it bugs out.
@@ -27,7 +28,7 @@ index 3515d77..556fb78 100644
  		$<$<BOOL:${HTTPLIB_IS_USING_ZLIB}>:ZLIB::ZLIB>
  		$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::SSL>
  		$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::Crypto>
-@@ -283,9 +283,6 @@ if(HTTPLIB_INSTALL)
+@@ -275,9 +275,6 @@ if(HTTPLIB_INSTALL)
  	install(FILES
  		"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
  		"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"

diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO yhirose/cpp-httplib
     REF "v${VERSION}"
-    SHA512 0e7955fc74b87550e260739abf2503b2b0aabb2e2925953956bef8ead9718367d075d37fb5468a40aa340d7bdafb06274e0770baab86b08c6a25020d96033b88
+    SHA512 2be6dceb3a4277a23813baf7e27bad3f0e88504ce72e6fb551e98c2f5888f208fccf35c4f17bc34ec979eb3958da7fa6851993febcd50535094900533fae5709
     HEAD_REF master
     PATCHES
         fix-find-brotli.patch

diff --git a/ports/cpp-httplib/vcpkg.json b/ports/cpp-httplib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cpp-httplib",
-  "version": "0.14.3",
+  "version": "0.15.1",
   "description": "A single file C++11 header-only HTTP/HTTPS server and client library",
   "homepage": "https://github.com/yhirose/cpp-httplib",
   "license": "MIT",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1825,7 +1825,7 @@
       "port-version": 0
     },
     "cpp-httplib": {
-      "baseline": "0.14.3",
+      "baseline": "0.15.1",
       "port-version": 0
     },
     "cpp-ipc": {

diff --git a/versions/c-/cpp-httplib.json b/versions/c-/cpp-httplib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cf7ac80d06d049094fbf0742fcc99ecbd0c3396c",
+      "version": "0.15.1",
+      "port-version": 0
+    },
     {
       "git-tree": "6f65092ce5157b3cf987bf0daba4db53f5d10d37",
       "version": "0.14.3",