diff --git a/ports/nghttp3/fix-include-usage.patch b/ports/nghttp3/fix-include-usage.patch deleted file mode 100644 index dfd139ed58..0000000000 --- a/ports/nghttp3/fix-include-usage.patch +++ /dev/null @@ -1,22 +0,0 @@ -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(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(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 1792ece075..a6bd0b8b60 100644 --- a/ports/nghttp3/portfile.cmake +++ b/ports/nghttp3/portfile.cmake @@ -1,18 +1,10 @@ -vcpkg_download_distfile(MSVC_ARM64_INTRINSICS_FIX - URLS https://github.com/ngtcp2/nghttp3/commit/2c4a3816bbeab45e7c9092aecc915b54a3c88ccb.patch?full_index=1 - SHA512 ccdd14a71bfa51f3480252faf2a4664544e1e11f3c5b6be9bfe577d46f0fc6c22e22f86b721987d6d1ca17d96ba2e55e32b0d01a6c291ab9ba2fc2279275aeae - FILENAME nghttp3-msvc-arm64-intrinsicis-2c4a3816bbeab45e7c9092aecc915b54a3c88ccb.patch.patch -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/nghttp3 REF v${VERSION} - SHA512 d8b6db7a1323e036cd2d1aab1ded299e83024ce451cddbfe0ea102d968bdcb57221dbcc231b73880e0987cf3ed7ecd2c2b5f53b10947d9accb7603d7c3fcbb95 + SHA512 c5f8188b7c74a8162b4526d0d317f94db934eb75335c6ccc4f289d3e3592edb099b7cdc72d966db68140be99c3b6ebf34f5814d62a52b0dc4040d79fab2351cf HEAD_REF main PATCHES - fix-include-usage.patch - "${MSVC_ARM64_INTRINSICS_FIX}" ) vcpkg_from_github( diff --git a/ports/nghttp3/vcpkg.json b/ports/nghttp3/vcpkg.json index 320945a576..1d24fdf6aa 100644 --- a/ports/nghttp3/vcpkg.json +++ b/ports/nghttp3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nghttp3", - "version": "1.5.0", - "port-version": 1, + "version": "1.6.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", diff --git a/versions/baseline.json b/versions/baseline.json index b424ae9db8..6d98721129 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6289,8 +6289,8 @@ "port-version": 1 }, "nghttp3": { - "baseline": "1.5.0", - "port-version": 1 + "baseline": "1.6.0", + "port-version": 0 }, "ngspice": { "baseline": "41", diff --git a/versions/n-/nghttp3.json b/versions/n-/nghttp3.json index 1d4b2d984a..898091dc5f 100644 --- a/versions/n-/nghttp3.json +++ b/versions/n-/nghttp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a9f36eb052356da25b2705b310fa13e4da7c121", + "version": "1.6.0", + "port-version": 0 + }, { "git-tree": "266af41d2ae35c2d64ccee22c99a4fcc57f4fb3f", "version": "1.5.0",