From ec6869ac22f5791b58fd028a4038efbda1a037b7 Mon Sep 17 00:00:00 2001
From: talregev <talregev@users.noreply.github.com>
Date: Tue, 3 Sep 2024 22:29:36 +0300
Subject: [PATCH] [nghttp3] Update to v1.5.0 (#40673)

---
 ports/nghttp3/fix-include-usage.patch | 22 ++++++++++++++++++++++
 ports/nghttp3/portfile.cmake          | 10 +++++++---
 ports/nghttp3/usage                   |  4 ++++
 ports/nghttp3/vcpkg.json              |  6 +++++-
 versions/baseline.json                |  2 +-
 versions/n-/nghttp3.json              |  5 +++++
 6 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 ports/nghttp3/fix-include-usage.patch
 create mode 100644 ports/nghttp3/usage

diff --git a/ports/nghttp3/fix-include-usage.patch b/ports/nghttp3/fix-include-usage.patch
new file mode 100644
index 0000000000..dfd139ed58
--- /dev/null
+++ b/ports/nghttp3/fix-include-usage.patch
@@ -0,0 +1,22 @@
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 94672b5..aa46631 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -96,6 +96,8 @@ if(ENABLE_SHARED_LIB)
+     C_VISIBILITY_PRESET hidden
+   )
+ 
++  target_include_directories(nghttp3 INTERFACE $<INSTALL_INTERFACE:include>)
++
+   install(TARGETS nghttp3
+     EXPORT ${NGHTTP3_TARGETS_EXPORT_NAME} 
+     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+@@ -113,6 +115,8 @@ if(ENABLE_STATIC_LIB)
+     )
+   target_compile_definitions(nghttp3_static PUBLIC "-DNGHTTP3_STATICLIB")
+ 
++  target_include_directories(nghttp3_static INTERFACE $<INSTALL_INTERFACE:include>)
++
+   install(TARGETS nghttp3_static
+     EXPORT ${NGHTTP3_TARGETS_EXPORT_NAME} 
+     DESTINATION "${CMAKE_INSTALL_LIBDIR}")
diff --git a/ports/nghttp3/portfile.cmake b/ports/nghttp3/portfile.cmake
index 3e4592f8a6..513a6d66a0 100644
--- a/ports/nghttp3/portfile.cmake
+++ b/ports/nghttp3/portfile.cmake
@@ -2,15 +2,17 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ngtcp2/nghttp3
     REF v${VERSION}
-    SHA512 56b5ac28f01a9210f0bd3de06dabe9f34867b72c68df0776f8faf3f03a4b82185fd16891f67f710b8c7db56523e29a7c51e4b2337ea9e5331bc6c21a26ed12dd
+    SHA512 d8b6db7a1323e036cd2d1aab1ded299e83024ce451cddbfe0ea102d968bdcb57221dbcc231b73880e0987cf3ed7ecd2c2b5f53b10947d9accb7603d7c3fcbb95
     HEAD_REF main
+    PATCHES
+        fix-include-usage.patch
 )
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SFPARSE_SOURCE_PATH
     REPO ngtcp2/sfparse
-    REF c669673012f9d535ec3bcf679fe911c8c75a479f
-    SHA512 0b16569665d794384704d95317211ad6b8ab32f1aa3ee4823450f325caaef58ca7155a83f37f7ceeb0da574e15a462b47f1dc01563f5b2f899b9386053200ea7
+    REF c2e010d064d58f7775aca1aa29df20dd2f534a9a
+    SHA512 5556878d9bfd190e537064e069ca71e76aa0e3bc9fc1d5eef24f1b413a6d3abc584024fb81e188d8ae148673db279e665064cb9971cf04568148782152bd9702
     HEAD_REF main
 )
 
@@ -37,6 +39,7 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/nghttp3")
 
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
@@ -55,3 +58,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
 endif()
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/nghttp3/usage b/ports/nghttp3/usage
new file mode 100644
index 0000000000..c95b0b7475
--- /dev/null
+++ b/ports/nghttp3/usage
@@ -0,0 +1,4 @@
+nghttp3 provides CMake targets:
+
+  find_package(nghttp3 CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:nghttp3::nghttp3>,nghttp3::nghttp3,nghttp3::nghttp3_static>)
diff --git a/ports/nghttp3/vcpkg.json b/ports/nghttp3/vcpkg.json
index f5550670f5..ba6f3abd10 100644
--- a/ports/nghttp3/vcpkg.json
+++ b/ports/nghttp3/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "nghttp3",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK in C",
   "homepage": "https://github.com/ngtcp2/nghttp3",
   "license": "MIT",
@@ -8,6 +8,10 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 54ff9bc0f1..24535bb1a7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6237,7 +6237,7 @@
       "port-version": 1
     },
     "nghttp3": {
-      "baseline": "1.3.0",
+      "baseline": "1.5.0",
       "port-version": 0
     },
     "ngspice": {
diff --git a/versions/n-/nghttp3.json b/versions/n-/nghttp3.json
index e569c298c1..fe0cedefc9 100644
--- a/versions/n-/nghttp3.json
+++ b/versions/n-/nghttp3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "35b52ed7827b7da3b3dd1aa78a41aad9c3c13d59",
+      "version": "1.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a503d4283d1d25411c53bce53ff5bc0a8c66592c",
       "version": "1.3.0",