From 802e8966c135647622b470f6da5db7341b9e8aa6 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Mon, 15 Jul 2024 19:07:02 +0000 Subject: [PATCH] [libuv] Update version to v1.48.0 (#38821) --- ports/libuv/fix-build-type.patch | 16 +++++++--------- ports/libuv/portfile.cmake | 2 +- ports/libuv/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libuv.json | 5 +++++ 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/ports/libuv/fix-build-type.patch b/ports/libuv/fix-build-type.patch index 41235b7a227..f6ef6537d7c 100644 --- a/ports/libuv/fix-build-type.patch +++ b/ports/libuv/fix-build-type.patch @@ -1,26 +1,25 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 93733dd0..769025cf 100644 +index 5e8e016..b3c3f18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -460,8 +460,7 @@ if(LIBUV_BUILD_SHARED) +@@ -465,7 +465,7 @@ if(LIBUV_BUILD_SHARED) endif() target_link_libraries(uv ${uv_libraries}) set_target_properties(uv PROPERTIES OUTPUT_NAME "uv") -endif() -- +else() + add_library(uv_a STATIC ${uv_sources}) target_compile_definitions(uv_a PRIVATE ${uv_defines}) - target_compile_options(uv_a PRIVATE ${uv_cflags}) -@@ -480,6 +479,7 @@ set_target_properties(uv_a PROPERTIES OUTPUT_NAME "uv") - if(MSVC) +@@ -485,6 +485,7 @@ set_target_properties(uv_a PROPERTIES OUTPUT_NAME "uv") + if(WIN32) set_target_properties(uv_a PROPERTIES PREFIX "lib") endif() +endif() if(LIBUV_BUILD_TESTS) # Small hack: use ${uv_test_sources} now to get the runner skeleton, -@@ -737,10 +737,6 @@ configure_file(libuv-static.pc.in libuv-static.pc @ONLY) +@@ -755,10 +756,6 @@ configure_file(libuv-static.pc.in libuv-static.pc @ONLY) install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR}) install(FILES LICENSE-extra DESTINATION ${CMAKE_INSTALL_DOCDIR}) @@ -31,7 +30,7 @@ index 93733dd0..769025cf 100644 install(EXPORT libuvConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libuv NAMESPACE libuv::) -@@ -757,6 +753,11 @@ if(LIBUV_BUILD_SHARED) +@@ -775,6 +772,11 @@ if(LIBUV_BUILD_SHARED) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) @@ -43,4 +42,3 @@ index 93733dd0..769025cf 100644 endif() if(MSVC) - diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 1de13194eb4..1e8e500e57d 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv REF "v${VERSION}" - SHA512 e3a7c10ffd909f9b128fb2316e09b8456e87278107178b49368f31ba30e7f62d64e7eba650cc59ef2d7eb178199c7a2c5b5c99b333849200492235116d7aee7a + SHA512 81a9580bc51c22385de4dab748968477b5e552aa25f901c376e3ffac624e0e05362b48239222e826cad900329f9a7cbdb080794fb4ada9ca14196efc2969cc57 HEAD_REF v1.x PATCHES fix-build-type.patch ) diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json index 2bb7f826ae9..b25b72902e2 100644 --- a/ports/libuv/vcpkg.json +++ b/ports/libuv/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libuv", - "version-semver": "1.46.0", - "port-version": 1, + "version-semver": "1.48.0", "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", "homepage": "https://github.com/libuv/libuv", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 8119e5ec958..c37cd7bf9eb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5177,8 +5177,8 @@ "port-version": 14 }, "libuv": { - "baseline": "1.46.0", - "port-version": 1 + "baseline": "1.48.0", + "port-version": 0 }, "libuvc": { "baseline": "0.0.7", diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json index 60d499a6e98..e284c556690 100644 --- a/versions/l-/libuv.json +++ b/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb297582074da541775cf29ad02a7dfe8a5a57e1", + "version-semver": "1.48.0", + "port-version": 0 + }, { "git-tree": "2267bb7c14ae2201b02e2d708631e4a228355543", "version-semver": "1.46.0",