From 600378d3fc37c7811350c52b36070f88148e62bb Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:23:22 +0800 Subject: [PATCH] [simdutf,scnlib] update to 4.0.9,2.0.2 (#36459) - [X] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md) - [X] SHA512s are updated for each updated download - [ ] ~The "supports" clause reflects platforms that may be fixed by this new version~ - [ ] ~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~ - [ ] ~Any patches that are no longer applied are deleted from the port's directory.~ - [X] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [X] Only one version is added to each modified port's versions file. --- .../fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch | 13 +++++++++++++ ports/scnlib/portfile.cmake | 5 ++++- ports/scnlib/vcpkg.json | 4 +++- ports/simdutf/portfile.cmake | 3 ++- ports/simdutf/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/s-/scnlib.json | 5 +++++ versions/s-/simdutf.json | 5 +++++ 8 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 ports/scnlib/fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch diff --git a/ports/scnlib/fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch b/ports/scnlib/fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch new file mode 100644 index 0000000000..ae57735879 --- /dev/null +++ b/ports/scnlib/fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch @@ -0,0 +1,13 @@ +diff --git a/include/scn/detail/pp_detect.h b/include/scn/detail/pp_detect.h +index e8c5081..2002559 100644 +--- a/include/scn/detail/pp_detect.h ++++ b/include/scn/detail/pp_detect.h +@@ -527,7 +527,7 @@ + // (2021-09-29 is the date of the commit introducing `multiline`, + // libstdc++ doesn't support checking for minor versions) + #if SCN_STDLIB_LIBCPP >= 15000 || SCN_STDLIB_GLIBCXX >= 12 || \ +- (SCN_STDLIB_GLIBCXX == 11 && __GLIBCXX__ >= 20210929L) ++ (SCN_STDLIB_GLIBCXX == 11 && SCN_GCC_COMPAT_MINOR >= 4 && __GLIBCXX__ >= 20210929L) + #define SCN_HAS_STD_REGEX_MULTILINE 1 + #else + #define SCN_HAS_STD_REGEX_MULTILINE 0 diff --git a/ports/scnlib/portfile.cmake b/ports/scnlib/portfile.cmake index 7e19546e36..6bdf88c441 100644 --- a/ports/scnlib/portfile.cmake +++ b/ports/scnlib/portfile.cmake @@ -4,8 +4,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eliaskosunen/scnlib REF "v${VERSION}" - SHA512 5dc2cc0f0817710453c7741cb61df46b4d4a43af0ec5cbbba77e3b6fb055e906840c232f92df5c3f3a9643191268922f059eacb798978767c717cc3578eb117d + SHA512 12b9ae26a5ccc600aacad1e2b2287bfc0b6986a260e182c91541876bc5804fe661093ad10d1befda56803afc7a9aa9f0348820dbb5af4fa6fdf048f85b3bcef1 HEAD_REF master + PATCHES fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch ) vcpkg_cmake_configure( @@ -16,6 +17,8 @@ vcpkg_cmake_configure( -DSCN_BENCHMARKS=OFF -DSCN_DOCS=OFF -DSCN_RANGES=OFF + -DSCN_USE_EXTERNAL_SIMDUTF=ON + -DSCN_USE_EXTERNAL_FAST_FLOAT=ON ) vcpkg_cmake_install() diff --git a/ports/scnlib/vcpkg.json b/ports/scnlib/vcpkg.json index 98b5c8fd21..e7695068b7 100644 --- a/ports/scnlib/vcpkg.json +++ b/ports/scnlib/vcpkg.json @@ -1,9 +1,11 @@ { "name": "scnlib", - "version": "1.1.2", + "version": "2.0.2", "description": "scnlib is a modern C++ library for replacing scanf and std::istream", "homepage": "https://scnlib.dev/", "dependencies": [ + "fast-float", + "simdutf", { "name": "vcpkg-cmake", "host": true diff --git a/ports/simdutf/portfile.cmake b/ports/simdutf/portfile.cmake index 64d1e4305b..b125f32815 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 f9d307bc769450cc0ff967ad5d764db15a7c38011c17096fcb824e4a89c0ae29ae66137c9063b8c54a42937600d058a8bd31439cf12c68d31a0053b1b8dd619f + SHA512 39ffc41d8d6889603b72bbcdcb5bce6b0a98cd41299568cf9bd34f5cbc0d5950f96907eae21c0975b10d701c49d80bb839911672909c802e7f6d3b616fe6279c HEAD_REF master ) @@ -21,6 +21,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() if ("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES sutf AUTO_CLEAN) endif() diff --git a/ports/simdutf/vcpkg.json b/ports/simdutf/vcpkg.json index bda37ab3a1..9a8adc54f8 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": "3.2.16", + "version-semver": "4.0.9", "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 f251134eb2..c596b69d71 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7805,7 +7805,7 @@ "port-version": 0 }, "scnlib": { - "baseline": "1.1.2", + "baseline": "2.0.2", "port-version": 0 }, "scope-guard": { @@ -8025,7 +8025,7 @@ "port-version": 0 }, "simdutf": { - "baseline": "3.2.16", + "baseline": "4.0.9", "port-version": 0 }, "simonbrunel-qtpromise": { diff --git a/versions/s-/scnlib.json b/versions/s-/scnlib.json index e2e858116c..2cf982a263 100644 --- a/versions/s-/scnlib.json +++ b/versions/s-/scnlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dec19b7a48e73d0f9422945a9ca65e7322c57618", + "version": "2.0.2", + "port-version": 0 + }, { "git-tree": "9d2d619116db10c60c0553f9ca6e155f16e05bdd", "version": "1.1.2", diff --git a/versions/s-/simdutf.json b/versions/s-/simdutf.json index 73d1b5a6a0..c72aea3f56 100644 --- a/versions/s-/simdutf.json +++ b/versions/s-/simdutf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d4511effb044b1b416e71a747a8f955bbf6047d", + "version-semver": "4.0.9", + "port-version": 0 + }, { "git-tree": "5c88dfda4ee0a79ae238b227b9866b5ad9f4651a", "version-semver": "3.2.16",