diff --git a/ports/scnlib/portfile.cmake b/ports/scnlib/portfile.cmake index 791b388474..4b64950802 100644 --- a/ports/scnlib/portfile.cmake +++ b/ports/scnlib/portfile.cmake @@ -1,14 +1,26 @@ 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_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eliaskosunen/scnlib REF "v${VERSION}" SHA512 12b9ae26a5ccc600aacad1e2b2287bfc0b6986a260e182c91541876bc5804fe661093ad10d1befda56803afc7a9aa9f0348820dbb5af4fa6fdf048f85b3bcef1 HEAD_REF master - PATCHES - fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch - remove-simdutf-dependency-version.patch + PATCHES + fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch + "${PATCH_20240406_1_97baaf2}" + "${PATCH_20240406_2_5c4b91e}" ) vcpkg_cmake_configure( @@ -18,7 +30,6 @@ vcpkg_cmake_configure( -DSCN_EXAMPLES=OFF -DSCN_BENCHMARKS=OFF -DSCN_DOCS=OFF - -DSCN_RANGES=OFF -DSCN_USE_EXTERNAL_SIMDUTF=ON -DSCN_USE_EXTERNAL_FAST_FLOAT=ON ) diff --git a/ports/scnlib/remove-simdutf-dependency-version.patch b/ports/scnlib/remove-simdutf-dependency-version.patch deleted file mode 100644 index 352b1afb41..0000000000 --- a/ports/scnlib/remove-simdutf-dependency-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 71f5ecccb5..287203c289 100644 --- a/ports/scnlib/vcpkg.json +++ b/ports/scnlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "scnlib", "version": "2.0.2", - "port-version": 1, + "port-version": 2, "description": "scnlib is a modern C++ library for replacing scanf and std::istream", "homepage": "https://scnlib.dev/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f5da45de75..f3a6f4f3be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7886,7 +7886,7 @@ }, "scnlib": { "baseline": "2.0.2", - "port-version": 1 + "port-version": 2 }, "scope-guard": { "baseline": "1.1.0", diff --git a/versions/s-/scnlib.json b/versions/s-/scnlib.json index 6e8f80c160..5fd95c46f0 100644 --- a/versions/s-/scnlib.json +++ b/versions/s-/scnlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17567901d2d2e06776b74ce27ab8c612901cb9af", + "version": "2.0.2", + "port-version": 2 + }, { "git-tree": "2ab6b65ae15e7ce03c1d57ad16ee80f6186dfee5", "version": "2.0.2",