From 595fde3f040553b48a7d0a0675b67afcb06f655a Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 29 Mar 2024 03:42:56 +0800 Subject: [PATCH] [simdutf] update to 5.0.0 (#37783) --- ports/scnlib/portfile.cmake | 4 +++- .../scnlib/remove-simdutf-dependency-version.patch | 13 +++++++++++++ ports/scnlib/vcpkg.json | 1 + ports/simdutf/portfile.cmake | 2 +- ports/simdutf/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/s-/scnlib.json | 5 +++++ versions/s-/simdutf.json | 5 +++++ 8 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 ports/scnlib/remove-simdutf-dependency-version.patch diff --git a/ports/scnlib/portfile.cmake b/ports/scnlib/portfile.cmake index 6bdf88c441..791b388474 100644 --- a/ports/scnlib/portfile.cmake +++ b/ports/scnlib/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 12b9ae26a5ccc600aacad1e2b2287bfc0b6986a260e182c91541876bc5804fe661093ad10d1befda56803afc7a9aa9f0348820dbb5af4fa6fdf048f85b3bcef1 HEAD_REF master - PATCHES fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch + PATCHES + fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch + remove-simdutf-dependency-version.patch ) vcpkg_cmake_configure( diff --git a/ports/scnlib/remove-simdutf-dependency-version.patch b/ports/scnlib/remove-simdutf-dependency-version.patch new file mode 100644 index 0000000000..352b1afb41 --- /dev/null +++ b/ports/scnlib/remove-simdutf-dependency-version.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake +index ae2832b..3c58a12 100644 +--- a/cmake/dependencies.cmake ++++ b/cmake/dependencies.cmake +@@ -61,7 +61,7 @@ endif () + # we don't want to include tests of dependencies, so we need to do some manual work + + if (SCN_USE_EXTERNAL_SIMDUTF) +- find_package(simdutf 4.0.0 CONFIG REQUIRED) ++ find_package(simdutf CONFIG REQUIRED) + else () + FetchContent_Declare( + simdutf diff --git a/ports/scnlib/vcpkg.json b/ports/scnlib/vcpkg.json index e7695068b7..71f5ecccb5 100644 --- a/ports/scnlib/vcpkg.json +++ b/ports/scnlib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "scnlib", "version": "2.0.2", + "port-version": 1, "description": "scnlib is a modern C++ library for replacing scanf and std::istream", "homepage": "https://scnlib.dev/", "dependencies": [ diff --git a/ports/simdutf/portfile.cmake b/ports/simdutf/portfile.cmake index b125f32815..f7c25e4908 100644 --- a/ports/simdutf/portfile.cmake +++ b/ports/simdutf/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdutf/simdutf REF "v${VERSION}" - SHA512 39ffc41d8d6889603b72bbcdcb5bce6b0a98cd41299568cf9bd34f5cbc0d5950f96907eae21c0975b10d701c49d80bb839911672909c802e7f6d3b616fe6279c + SHA512 809ed80e963068191c6fb687f820c9c8e0b638f98d348f65bcf211c4bca1abd3a063adae15cfd7f807a977181f2c0428d61b9183307f5a3ce2ea21e31e6a06d2 HEAD_REF master ) diff --git a/ports/simdutf/vcpkg.json b/ports/simdutf/vcpkg.json index 9a8adc54f8..d3b6d97b83 100644 --- a/ports/simdutf/vcpkg.json +++ b/ports/simdutf/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "simdutf", - "version-semver": "4.0.9", + "version-semver": "5.0.0", "description": "Unicode validation and transcoding at billions of characters per second", "homepage": "https://github.com/simdutf/simdutf", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 61fc9608d0..a091ae5c76 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7854,7 +7854,7 @@ }, "scnlib": { "baseline": "2.0.2", - "port-version": 0 + "port-version": 1 }, "scope-guard": { "baseline": "1.1.0", @@ -8073,7 +8073,7 @@ "port-version": 0 }, "simdutf": { - "baseline": "4.0.9", + "baseline": "5.0.0", "port-version": 0 }, "simonbrunel-qtpromise": { diff --git a/versions/s-/scnlib.json b/versions/s-/scnlib.json index 2cf982a263..6e8f80c160 100644 --- a/versions/s-/scnlib.json +++ b/versions/s-/scnlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ab6b65ae15e7ce03c1d57ad16ee80f6186dfee5", + "version": "2.0.2", + "port-version": 1 + }, { "git-tree": "dec19b7a48e73d0f9422945a9ca65e7322c57618", "version": "2.0.2", diff --git a/versions/s-/simdutf.json b/versions/s-/simdutf.json index c72aea3f56..49225eebc0 100644 --- a/versions/s-/simdutf.json +++ b/versions/s-/simdutf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abbfcd20dd25b3b01b4e117ffe339623762baa2a", + "version-semver": "5.0.0", + "port-version": 0 + }, { "git-tree": "4d4511effb044b1b416e71a747a8f955bbf6047d", "version-semver": "4.0.9",