Update nghttp2 to v1.61.0

WebKitForWindows · Apr 4, 2024 · 02b0015 · 02b0015
1 parent c7a02a7
commit 02b0015
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 119 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ the requirements.
 | [zlib](https://github.com/zlib-ng/zlib-ng) | 2.1.6 | 2024-01-10 |
 | [brotli](https://github.com/google/brotli) | 1.1.0 | 2023-08-31 |
 | [libressl](https://www.libressl.org) | 3.9.1 | 2024-03-27 |
-| [nghttp2](https://nghttp2.org) | 1.60.0 | 2024-03-01 |
+| [nghttp2](https://nghttp2.org) | 1.61.0 | 2024-04-04 |
 | [nghttp3](https://github.com/ngtcp2/nghttp3) | 1.2.0 | 2024-02-16 |
 | [ngtcp2](https://github.com/ngtcp2/ngtcp2) | 1.4.0 | 2024-03-18 |
 | [c-ares](https://c-ares.org) | 1.28.1 | 2024-03-30 |

diff --git a/ports/nghttp2/patches/0001-Adjust-CMake-for-vcpkg.patch b/ports/nghttp2/patches/0001-Adjust-CMake-for-vcpkg.patch
@@ -1,4 +1,4 @@
-From 3ac6fd25aa8e9d98a31ba7af5d0e8e2d38fdbd64 Mon Sep 17 00:00:00 2001
+From da2db3b41075bd976fd08bffabe375d92270a590 Mon Sep 17 00:00:00 2001
 From: Don Olmstead <don.j.olmstead@gmail.com>
 Date: Tue, 26 Mar 2024 10:45:06 -0700
 Subject: [PATCH] Adjust CMake for vcpkg
@@ -8,10 +8,10 @@ Subject: [PATCH] Adjust CMake for vcpkg
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 211c8e43..52b040d5 100644
+index fda8dcb7..de103d6e 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -99,5 +99,5 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libnghttp2.pc"
+@@ -103,5 +103,5 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libnghttp2.pc"
    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 
  install(EXPORT ${EXPORT_SET}

diff --git a/ports/nghttp2/patches/0002-CMake-Respect-BUILD_STATIC_LIBS.patch b/ports/nghttp2/patches/0002-CMake-Respect-BUILD_STATIC_LIBS.patch
diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake
@@ -1,17 +1,15 @@
-set(VERSION 1.60.0)
+set(VERSION 1.61.0)
 
 # Get archive
 vcpkg_download_distfile(ARCHIVE
     URLS "https://github.com/nghttp2/nghttp2/releases/download/v${VERSION}/nghttp2-${VERSION}.tar.xz"
     FILENAME "nghttp2-${VERSION}.tar.xz"
-    SHA512 5e6365d9118596d41848930de70f4a918d72463920184df60a7e1678c3a6c9cf1416236888e7e34395c87f41bba00a114994ba5a6e73f6a389769abf1b5cc842
+    SHA512 01e930d7caf464699505f92b76e2bc8192d168612dc564d2546812c42afea2fb81d552d70e8a5fed35e2bf5deadbec8eda095af94a2484bca41542988afce52a
 )
 
 # Patches
 set(PATCHES
     ${CMAKE_CURRENT_LIST_DIR}/patches/0001-Adjust-CMake-for-vcpkg.patch
-    # Remove after next release
-    ${CMAKE_CURRENT_LIST_DIR}/patches/0002-CMake-Respect-BUILD_STATIC_LIBS.patch
 )
 
 # Extract archive

diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "nghttp2",
-  "version": "1.60.0",
+  "version": "1.61.0",
   "description": "Implementation of the Hypertext Transfer Protocol version 2 in C.",
   "homepage": "https://nghttp2.org",
   "license": "MIT",