From 4ef694a6c058ede007b87a2e90cbfb9fa7fad6a4 Mon Sep 17 00:00:00 2001 From: toge Date: Sun, 26 Jan 2025 02:39:22 +0900 Subject: [PATCH 1/3] [scnlib] support fast-float 7.0.0 --- ports/scnlib/portfile.cmake | 3 +++ ports/scnlib/scnlib-pr-136.patch | 26 ++++++++++++++++++++++++++ versions/s-/scnlib.json | 2 +- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 ports/scnlib/scnlib-pr-136.patch diff --git a/ports/scnlib/portfile.cmake b/ports/scnlib/portfile.cmake index 0b15af4f838737..fb0324ff299a54 100644 --- a/ports/scnlib/portfile.cmake +++ b/ports/scnlib/portfile.cmake @@ -6,6 +6,9 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 db14d71da3c1ecb849f00ac1e334f39c532592230e950aa1009ff00ba56670cb71e33ca457fd4ac66595ff43f0dca0e42d45f672848b9cde3cba80f19ef8693f HEAD_REF master + PATCHES + # support fast_float 7.0.0 + scnlib-pr-136.patch ) vcpkg_cmake_configure( diff --git a/ports/scnlib/scnlib-pr-136.patch b/ports/scnlib/scnlib-pr-136.patch new file mode 100644 index 00000000000000..f3ecee9c6ebd43 --- /dev/null +++ b/ports/scnlib/scnlib-pr-136.patch @@ -0,0 +1,26 @@ +diff --git a/src/scn/impl.cpp b/src/scn/impl.cpp +index aa0d334..ab859a4 100644 +--- a/src/scn/impl.cpp ++++ b/src/scn/impl.cpp +@@ -721,15 +721,17 @@ scan_expected fast_float_fallback(impl_init_data data, + struct fast_float_impl_base : impl_base { + fast_float::chars_format get_flags() const + { +- unsigned format_flags{}; ++ fast_float::chars_format format_flags{}; + if ((m_options & float_reader_base::allow_fixed) != 0) { +- format_flags |= fast_float::fixed; ++ format_flags = ++ static_cast(format_flags | fast_float::chars_format::fixed); + } + if ((m_options & float_reader_base::allow_scientific) != 0) { +- format_flags |= fast_float::scientific; ++ format_flags = ++ static_cast(format_flags | fast_float::chars_format::scientific); + } + +- return static_cast(format_flags); ++ return format_flags; + } + }; + diff --git a/versions/s-/scnlib.json b/versions/s-/scnlib.json index 981f68aae8b4e8..95a7f1a51a942c 100644 --- a/versions/s-/scnlib.json +++ b/versions/s-/scnlib.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c4f32fa5eff83c4abe03aa721dcc57c3fd3f0a02", + "git-tree": "f48d5065901a6d4da13812c735e147ff3d065415", "version": "4.0.1", "port-version": 0 }, From 5182fe6ca24e43c3e77fd623e2e83656e5a13c9a Mon Sep 17 00:00:00 2001 From: toge Date: Sun, 26 Jan 2025 19:30:14 +0900 Subject: [PATCH 2/3] update port-version --- ports/scnlib/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/scnlib.json | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/scnlib/vcpkg.json b/ports/scnlib/vcpkg.json index ec304e0ab54598..464e91ae0c60f5 100644 --- a/ports/scnlib/vcpkg.json +++ b/ports/scnlib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "scnlib", "version": "4.0.1", + "port-version": 1, "description": "scnlib is a modern C++ library for replacing scanf and std::istream", "homepage": "https://scnlib.dev/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 3204cc05e572d9..92774cc4052083 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8190,7 +8190,7 @@ }, "scnlib": { "baseline": "4.0.1", - "port-version": 0 + "port-version": 1 }, "scope-guard": { "baseline": "1.1.0", diff --git a/versions/s-/scnlib.json b/versions/s-/scnlib.json index 95a7f1a51a942c..85f8c9a91d47a7 100644 --- a/versions/s-/scnlib.json +++ b/versions/s-/scnlib.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "f48d5065901a6d4da13812c735e147ff3d065415", + "git-tree": "b26c97d1ad11fc4a361f470db0f66b9afccd218c", "version": "4.0.1", - "port-version": 0 + "port-version": 1 }, { "git-tree": "cbbd6d359bd0838808caa2ffd0982f87c8587fab", From 406dbc0050e6aff0ca837b95287451950e95aaf7 Mon Sep 17 00:00:00 2001 From: toge Date: Mon, 27 Jan 2025 11:38:51 +0900 Subject: [PATCH 3/3] restore port-version 0 --- versions/s-/scnlib.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/versions/s-/scnlib.json b/versions/s-/scnlib.json index 85f8c9a91d47a7..b015ac78fb5a68 100644 --- a/versions/s-/scnlib.json +++ b/versions/s-/scnlib.json @@ -5,6 +5,11 @@ "version": "4.0.1", "port-version": 1 }, + { + "git-tree": "c4f32fa5eff83c4abe03aa721dcc57c3fd3f0a02", + "version": "4.0.1", + "port-version": 0 + }, { "git-tree": "cbbd6d359bd0838808caa2ffd0982f87c8587fab", "version": "3.0.1",