From d504d864ca8ea32ad731e21375d33ce9428e3504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=95=E3=81=8F=E3=82=89=E3=81=BF=E3=81=93?= Date: Thu, 26 Dec 2024 17:51:37 +0300 Subject: [PATCH] z --- packages/n/nghttp3/patches/1.7.0/vendor.patch | 28 +++++++++++++++++++ packages/n/nghttp3/xmake.lua | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 packages/n/nghttp3/patches/1.7.0/vendor.patch diff --git a/packages/n/nghttp3/patches/1.7.0/vendor.patch b/packages/n/nghttp3/patches/1.7.0/vendor.patch new file mode 100644 index 00000000000..8e28e4dd95a --- /dev/null +++ b/packages/n/nghttp3/patches/1.7.0/vendor.patch @@ -0,0 +1,28 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index b46da55..07ec28e 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -60,7 +60,6 @@ set(nghttp3_SOURCES + nghttp3_opl.c + nghttp3_objalloc.c + nghttp3_unreachable.c +- sfparse/sfparse.c + ) + + set(NGHTTP3_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") +@@ -85,6 +84,7 @@ install( + # Public shared library + if(ENABLE_SHARED_LIB) + add_library(nghttp3 SHARED ${nghttp3_SOURCES}) ++ target_link_libraries(nghttp3 sfparse) + set_target_properties(nghttp3 PROPERTIES + COMPILE_FLAGS "${WARNCFLAGS}" + VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION} +@@ -103,6 +103,7 @@ endif() + if(ENABLE_STATIC_LIB) + # Public static library + add_library(nghttp3_static STATIC ${nghttp3_SOURCES}) ++ target_link_libraries(nghttp3_static sfparse) + set_target_properties(nghttp3_static PROPERTIES + COMPILE_FLAGS "${WARNCFLAGS}" + VERSION ${LT_VERSION} SOVERSION ${LT_SOVERSION} diff --git a/packages/n/nghttp3/xmake.lua b/packages/n/nghttp3/xmake.lua index a3dbfe2576f..634094d5889 100644 --- a/packages/n/nghttp3/xmake.lua +++ b/packages/n/nghttp3/xmake.lua @@ -6,9 +6,11 @@ package("nghttp3") add_urls("https://github.com/ngtcp2/nghttp3/archive/refs/tags/$(version).tar.gz", "https://github.com/ngtcp2/nghttp3.git") + add_versions("v1.7.0", "2e6c5599995939a96b759e9f8987c69c0872ed1c219f57730685a93c1c36c9ef") add_versions("v1.4.0", "522c8952ccae1815f34425f0c8bc6d8a4660e72dada1b4e97b8223e4c459a84a") add_versions("v1.3.0", "a83c6a4f589ae777a5f967652969d99b3399a85971340b8de9bed79119a11f88") + add_patches("1.7.0", "patches/1.7.0/vendor.patch", "e2e9a9ea3a168e8943fef23eb537c6e64a88ea21823803302d6d8a9717bfad0f") add_patches("1.4.0", "patches/1.4.0/vendor.patch", "a6d611938c797d721a0345c5c772a1405ae0d6587ae46e16c1b73c89090a5c08") add_patches("1.3.0", "patches/1.3.0/vendor.patch", "51ab785328270b8df854283a8c20403c09813b0586eb84702a9c20241ff14980")