Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[scnlib] fix SCN_HAS_STD_REGEX_MULTILINE marco #41653

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −1
Open

[scnlib] fix SCN_HAS_STD_REGEX_MULTILINE marco #41653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ports/scnlib/fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions ports/scnlib/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 1 addition & 0 deletions ports/scnlib/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8106,7 +8106,7 @@
},
"scnlib": {
"baseline": "3.0.1",
"port-version": 0
"port-version": 1
},
"scope-guard": {
"baseline": "1.1.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/scnlib.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d4f0ab85fabf940107092d29051f236178b26823",
"version": "3.0.1",
"port-version": 1
},
{
"git-tree": "cbbd6d359bd0838808caa2ffd0982f87c8587fab",
"version": "3.0.1",
Expand Down