Auto-update ls-qpack to v2.6.0 (#6106)

* Update ls-qpack to v2.6.0 * apply 2.5.5 version patch * fix xmake.lua --------- Co-authored-by: star9029 <[email protected]>
xmake-io · Jan 8, 2025 · cdf2e3d · cdf2e3d
1 parent 8eea855
commit cdf2e3d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/...ck/patches/v2.5.3/fix-cmake-install.patch → ...ack/patches/2.5.3/fix-cmake-install.patch b/...ck/patches/v2.5.3/fix-cmake-install.patch → ...ack/patches/2.5.3/fix-cmake-install.patch
diff --git a/packages/l/ls-qpack/xmake.lua b/packages/l/ls-qpack/xmake.lua
@@ -6,18 +6,19 @@ package("ls-qpack")
     add_urls("https://github.com/litespeedtech/ls-qpack/archive/refs/tags/$(version).tar.gz",
              "https://github.com/litespeedtech/ls-qpack.git")
 
+    add_versions("v2.6.0", "567a7a86f801eef5df28ce0cc89826d9008a57135027bdf63ba4a1d0639d0c58")
     add_versions("v2.5.5", "8770435b81d13616cf952bd361ec0e6e0fd79acff76dd9f6e75c18fd88b4c4f4")
     add_versions("v2.5.4", "56b96190a1943d75ef8d384b13cd4592a72e3e2d84284f78d7f8adabbc717f3e")
     add_versions("v2.5.3", "075a05efee27961eac5ac92a12a6e28a61bcd6c122a0276938ef993338577337")
 
-    add_patches("2.5.5", "patches/2.5.5/cmake.patch", "23fd785c3db2e1b43ead464b0ee8d12e9f290fbfdf818c3238cba316df295f08")
-    add_patches("2.5.3", "patches/v2.5.3/fix-cmake-install.patch", "7d819b620b5e2bd34ef58a91bf20d882883c7525def9f9f80313b64cba5e5239")
+    add_patches(">=2.5.5 <=2.6.0", "patches/2.5.5/cmake.patch", "23fd785c3db2e1b43ead464b0ee8d12e9f290fbfdf818c3238cba316df295f08")
+    add_patches("2.5.3", "patches/2.5.3/fix-cmake-install.patch", "7d819b620b5e2bd34ef58a91bf20d882883c7525def9f9f80313b64cba5e5239")
 
     add_deps("cmake")
     add_deps("xxhash")
 
     on_load(function (package)
-        if package:gitref() or package:version():ge("2.5.5") then
+        if package:version() and package:version():ge("2.5.5") then
             if is_subhost("windows") then
                 package:add("deps", "pkgconf")
             else
@@ -28,9 +29,7 @@ package("ls-qpack")
 
     on_install(function (package)
         local opt = {}
-        if package:gitref() or package:version():ge("2.5.5") then
-            io.replace("CMakeLists.txt", "libxxhash", "xxhash", {plain = true})
-        else
+        if package:version() and package:version():lt("2.5.5") then
             opt.packagedeps = "xxhash"
         end
 
@@ -46,11 +45,6 @@ package("ls-qpack")
             table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON")
         end
         import("package.tools.cmake").install(package, configs, opt)
-
-        if package:is_plat("windows") and package:is_debug() then
-            local dir = package:installdir(package:config("shared") and "bin" or "lib")
-            os.trycp(path.join(package:buildir(), "ls-qpack.pdb"), dir)
-        end
     end)
 
     on_test(function (package)

diff --git a/packages/l/lsquic/xmake.lua b/packages/l/lsquic/xmake.lua
@@ -51,9 +51,6 @@ package("lsquic")
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
         table.insert(configs, "-DLSQUIC_SHARED_LIB=" .. (package:config("shared") and "ON" or "OFF"))
         table.insert(configs, "-DLSQUIC_FIU=" .. (package:config("fiu") and "ON" or "OFF"))
-        if package:is_plat("windows") then
-            table.insert(configs, "-DCMAKE_COMPILE_PDB_OUTPUT_DIRECTORY=''")
-        end
         import("package.tools.cmake").install(package, configs, opt)
     end)