소스 검색

Auto-update nghttp3 to v1.11.0 (#7779)

* Update nghttp3 to v1.11.0

* Create vendor.patch

* Update xmake.lua

---------

Co-authored-by: star9029 <[email protected]>
ruki 1 개월 전
부모
커밋
8a150cf8cc
2개의 변경된 파일32개의 추가작업 그리고 2개의 파일을 삭제
  1. 28 0
      packages/n/nghttp3/patches/1.11.0/vendor.patch
  2. 4 2
      packages/n/nghttp3/xmake.lua

+ 28 - 0
packages/n/nghttp3/patches/1.11.0/vendor.patch

@@ -0,0 +1,28 @@
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index f4be2be..039ff11 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -62,7 +62,6 @@ set(nghttp3_SOURCES
+   nghttp3_unreachable.c
+   nghttp3_settings.c
+   nghttp3_callbacks.c
+-  sfparse/sfparse.c
+ )
+ 
+ set(NGHTTP3_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
+@@ -87,6 +86,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}
+@@ -105,6 +105,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}

+ 4 - 2
packages/n/nghttp3/xmake.lua

@@ -6,6 +6,7 @@ package("nghttp3")
     add_urls("https://github.com/ngtcp2/nghttp3/archive/refs/tags/$(version).tar.gz",
              "https://github.com/ngtcp2/nghttp3.git", {submodules = false})
 
+    add_versions("v1.11.0", "2fc58fbb8a4b463e62ce985dbc6ef5e215bfd41dc23ee625225e0589b97ac82a")
     add_versions("v1.10.1", "6d8714b9a077e02c17b85a0a5d8e90ceb26e9c91b149d3238130a91ca3df3e3a")
     add_versions("v1.8.0", "d2cac7cd17966c915f87fa6b823963db4b555397e43c69d16d289765af7ab442")
     add_versions("v1.7.0", "2e6c5599995939a96b759e9f8987c69c0872ed1c219f57730685a93c1c36c9ef")
@@ -14,13 +15,14 @@ package("nghttp3")
     add_versions("v1.4.0", "522c8952ccae1815f34425f0c8bc6d8a4660e72dada1b4e97b8223e4c459a84a")
     add_versions("v1.3.0", "a83c6a4f589ae777a5f967652969d99b3399a85971340b8de9bed79119a11f88")
 
-    add_patches(">=1.4.0", "patches/1.4.0/vendor.patch", "a6d611938c797d721a0345c5c772a1405ae0d6587ae46e16c1b73c89090a5c08")
+    add_patches(">=1.11.0", "patches/1.11.0/vendor.patch", "29cd87f12c695021ea25f33bee2aa950e29806eadf2134ff043147414e33839d")
+    add_patches(">=1.4.0<1.11.0", "patches/1.4.0/vendor.patch", "a6d611938c797d721a0345c5c772a1405ae0d6587ae46e16c1b73c89090a5c08")
     add_patches("1.3.0", "patches/1.3.0/vendor.patch", "51ab785328270b8df854283a8c20403c09813b0586eb84702a9c20241ff14980")
 
     add_deps("cmake")
 
     on_load(function (package)
-        if package:gitref() or package:version():ge("1.7.0") then
+        if package:version() or package:version():ge("1.7.0") then
             package:add("deps", "sfparse")
         else
             package:add("deps", "sfparse 2024.05.12")