[nghttp2] Upgrade to version 1.39.2

3 files changed, 5 insertions, 43 deletions

diff --git a/ports/nghttp2/CONTROL b/ports/nghttp2/CONTROL
index 176a1c30a..2e8489e0a 100644
--- a/ports/nghttp2/CONTROL
+++ b/ports/nghttp2/CONTROL
@@ -1,4 +1,4 @@
 Source: nghttp2
-Version: 1.35.0
+Version: 1.39.2
 Homepage: https://github.com/nghttp2/nghttp2
 Description: Implementation of the Hypertext Transfer Protocol version 2 in C
diff --git a/ports/nghttp2/enable-static.patch b/ports/nghttp2/enable-static.patch
deleted file mode 100644
index 18e58daeb..000000000
--- a/ports/nghttp2/enable-static.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 17e422b..b2e7a6e 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -37,8 +37,8 @@ if(WIN32)
-   set(NGHTTP2_RES ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
- endif()
- 
--# Public shared library
--add_library(nghttp2 SHARED ${NGHTTP2_SOURCES} ${NGHTTP2_RES})
-+# Public library
-+add_library(nghttp2 ${NGHTTP2_SOURCES} ${NGHTTP2_RES})
- set_target_properties(nghttp2 PROPERTIES
-   COMPILE_FLAGS "${WARNCFLAGS}"
-   VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION}
-@@ -49,6 +49,10 @@ target_include_directories(nghttp2 INTERFACE
-     "${CMAKE_CURRENT_SOURCE_DIR}/includes"
-     )
- 
-+if(NOT BUILD_SHARED_LIBS)
-+  target_compile_definitions(nghttp2 PUBLIC "-DNGHTTP2_STATICLIB")
-+endif()
-+	
- if(HAVE_CUNIT OR ENABLE_STATIC_LIB)
-   # Static library (for unittests because of symbol visibility)
-   add_library(nghttp2_static STATIC ${NGHTTP2_SOURCES})
-
diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake
index 52f754afb..05a639d06 100644
--- a/ports/nghttp2/portfile.cmake
+++ b/ports/nghttp2/portfile.cmake
@@ -1,7 +1,7 @@
 include(vcpkg_common_functions)
 
 set(LIB_NAME nghttp2)
-set(LIB_VERSION 1.35.0)
+set(LIB_VERSION 1.39.2)
 
 set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION})
@@ -9,16 +9,10 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION})
 vcpkg_download_distfile(ARCHIVE
     URLS "https://github.com/nghttp2/nghttp2/releases/download/v${LIB_VERSION}/${LIB_FILENAME}"
     FILENAME "${LIB_FILENAME}"
-    SHA512 65889545684e2c8b4aeeb7084ca36e3f78927fa2b6d1df906af3970d8ce6c7c6093b56a5e0713f7bb54a98f06ad52d6e2b323e760297610702afe526b0fdd577
+    SHA512 1623a6bd9de1ca4d0742919b973eaefd570b250eb109697e5cf2240d2062789d1ca58632fdff32bb17f524b102fade0e30ab3f400dc2c128bfb91a75277f13e0 
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/enable-static.patch"
-)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -35,13 +29,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
 
-# Move dll files from /lib to /bin where vcpkg expects them
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/${LIB_NAME}.dll ${CURRENT_PACKAGES_DIR}/bin/${LIB_NAME}.dll)
-
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_NAME}.dll ${CURRENT_PACKAGES_DIR}/debug/bin/${LIB_NAME}.dll)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
 # License and man