[scnlib] update to 3.0.1. (#39419)

This commit is contained in:
Lily Wang 2024-06-21 13:25:02 -07:00 committed by GitHub
parent 2b665df62f
commit b6f51c96e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 47 deletions

View File

@ -1,13 +0,0 @@
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

View File

@ -1,38 +1,11 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_download_distfile(PATCH_20240406_1_97baaf2
URLS https://github.com/eliaskosunen/scnlib/commit/97baaf2a0bbf235ba91e29fe7ac16abe528da2d2.patch?full_index=1
SHA512 39c31d4bcac95a9ca614c0e39159f740a9819a2186d05cc5112178ab3e186cb5ca342438479b7e2267cea620d3042dc306d50c6c032572dbc2ad496bf85b7776
FILENAME 97baaf2a0bbf235ba91e29fe7ac16abe528da2d2.patch
)
vcpkg_download_distfile(PATCH_20240406_2_5c4b91e
URLS https://github.com/eliaskosunen/scnlib/commit/5c4b91ef1e2bbc29420e37b655bd8194afa19efc.patch?full_index=1
SHA512 8af9695729ab906066aa7db16733796e45f824c7711ca72a13273438c510bed38d7fb2884861e70d1178f67c8b0e8ff4d0bff9a16ba434becb60a87dcb6269b5
FILENAME 5c4b91ef1e2bbc29420e37b655bd8194afa19efc.patch
)
vcpkg_download_distfile(PATCH_20240515_3_15c3547
URLS https://github.com/eliaskosunen/scnlib/commit/15c3547b408391d7314e29bd23f35af36683a907.patch?full_index=1
SHA512 006378ad92c68b2786e14a7da76a7397a600cccb18163bf73e68ab0c3019067b9bec99ed2f86499d8cb2e2758d0ea1bf2c3ca98b6ab72e41f82037caeaff8298
FILENAME 15c3547b408391d7314e29bd23f35af36683a907.patch
)
vcpkg_download_distfile(PATCH_20240515_6_e149892
URLS https://github.com/eliaskosunen/scnlib/commit/e1498927e8f0367796d1643b65482861c1b4c9b1.patch?full_index=1
SHA512 d584b883a8dced18fdbec3846f93dfbf68633127354168199f986404c1404e80049798b7f4df5352315c9c2c5691ae5d5746fa5234c47631c38752aec73ad861
FILENAME e1498927e8f0367796d1643b65482861c1b4c9b1.patch
)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO eliaskosunen/scnlib
REF "v${VERSION}"
SHA512 12b9ae26a5ccc600aacad1e2b2287bfc0b6986a260e182c91541876bc5804fe661093ad10d1befda56803afc7a9aa9f0348820dbb5af4fa6fdf048f85b3bcef1
SHA512 76f3196d6bd01a349c69bf1863cc0dc521a95b84ef25b841198acbef99e295b53c1c82c745a7498b9a86a6fd4cc0c395abcb02fdf18b1d7c9152321ab195945b
HEAD_REF master
PATCHES
fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch
"${PATCH_20240406_1_97baaf2}"
"${PATCH_20240406_2_5c4b91e}"
"${PATCH_20240515_3_15c3547}"
"${PATCH_20240515_6_e149892}"
)
vcpkg_cmake_configure(
@ -42,7 +15,6 @@ vcpkg_cmake_configure(
-DSCN_EXAMPLES=OFF
-DSCN_BENCHMARKS=OFF
-DSCN_DOCS=OFF
-DSCN_USE_EXTERNAL_SIMDUTF=ON
-DSCN_USE_EXTERNAL_FAST_FLOAT=ON
)

View File

@ -1,12 +1,11 @@
{
"name": "scnlib",
"version": "2.0.2",
"port-version": 3,
"version": "3.0.1",
"description": "scnlib is a modern C++ library for replacing scanf and std::istream",
"homepage": "https://scnlib.dev/",
"license": "Apache-2.0",
"dependencies": [
"fast-float",
"simdutf",
{
"name": "vcpkg-cmake",
"host": true

View File

@ -7945,8 +7945,8 @@
"port-version": 0
},
"scnlib": {
"baseline": "2.0.2",
"port-version": 3
"baseline": "3.0.1",
"port-version": 0
},
"scope-guard": {
"baseline": "1.1.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cbbd6d359bd0838808caa2ffd0982f87c8587fab",
"version": "3.0.1",
"port-version": 0
},
{
"git-tree": "14d61103894e6ff0c14d3b2db7727c18d725982a",
"version": "2.0.2",