fix SCN_HAS_STD_REGEX_MULTILINE marco

microsoft · Oct 19, 2024 · 99bc294 · 99bc294
1 parent da5024e
commit 99bc294
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/ports/scnlib/fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch b/ports/scnlib/fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch
@@ -0,0 +1,17 @@
+diff --git a/include/scn/fwd.h b/include/scn/fwd.h
+index 9b4892f..92f603b 100644
+--- a/include/scn/fwd.h
++++ b/include/scn/fwd.h
+@@ -740,10 +740,10 @@ SCN_GCC_POP
+
+ // Detect std::regex_constants::multiline:
+ // libc++ 15 and later, or libstdc++ 11.4 or later
+-// (2021-09-29 is the date of the commit introducing `multiline`,
++// (2023-05-28 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 && __GLIBCXX__ >= 20230528L)
+ #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
@@ -6,6 +6,7 @@ vcpkg_from_github(
     REF "v${VERSION}"
     SHA512 76f3196d6bd01a349c69bf1863cc0dc521a95b84ef25b841198acbef99e295b53c1c82c745a7498b9a86a6fd4cc0c395abcb02fdf18b1d7c9152321ab195945b
     HEAD_REF master
+    PATCHES fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch
 )
 
 vcpkg_cmake_configure(

diff --git a/ports/scnlib/vcpkg.json b/ports/scnlib/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "scnlib",
   "version": "3.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
@@ -8106,7 +8106,7 @@
     },
     "scnlib": {
       "baseline": "3.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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d4f0ab85fabf940107092d29051f236178b26823",
+      "version": "3.0.1",
+      "port-version": 1
+    },
     {
       "git-tree": "cbbd6d359bd0838808caa2ffd0982f87c8587fab",
       "version": "3.0.1",