From c82bfbbc2e69c68495b571de3eb60a68e2b0bfbc Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 20 Jan 2025 16:13:42 +0800 Subject: libtoml11: upgrade 4.2.0 -> 4.3.0 0001-fix-add-missing-zero-initialization-to-region.patch removed since it's included in 4.3.0 Changlog: ========= Added ------ Support std::optional as a template argument of toml::find Support multiple arguments toml::visit(visitor, args...) Fixed ------ toml::detail::region::last_ may be used uninitialized Fix use with CMake 3.21 and older fix: prevent size_t-max length string allocation update README.md Make parsing faster for very long line Avoid known problem in MSVC Check if source_location::file_name() is null before formatting Changed ------- Update hugo-book theme Add MSVC 2017 to appveyor build Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...add-missing-zero-initialization-to-region.patch | 35 ------------------- .../recipes-devtools/libtoml11/libtoml11_4.2.0.bb | 39 ---------------------- .../recipes-devtools/libtoml11/libtoml11_4.3.0.bb | 38 +++++++++++++++++++++ 3 files changed, 38 insertions(+), 74 deletions(-) delete mode 100644 meta-oe/recipes-devtools/libtoml11/files/0001-fix-add-missing-zero-initialization-to-region.patch delete mode 100644 meta-oe/recipes-devtools/libtoml11/libtoml11_4.2.0.bb create mode 100644 meta-oe/recipes-devtools/libtoml11/libtoml11_4.3.0.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-devtools/libtoml11/files/0001-fix-add-missing-zero-initialization-to-region.patch b/meta-oe/recipes-devtools/libtoml11/files/0001-fix-add-missing-zero-initialization-to-region.patch deleted file mode 100644 index cb3d10ee72..0000000000 --- a/meta-oe/recipes-devtools/libtoml11/files/0001-fix-add-missing-zero-initialization-to-region.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9c7cef94a551cfdbbe2cce262c29221e22643d84 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= -Date: Mon, 19 Aug 2024 06:35:03 +0200 -Subject: [PATCH] fix: add missing zero initialization to region - -Fixes below error: - -/build/tmp-glibc/work/core2-64-wrs-linux/libtoml11/1_4.2.0-r0/git/include/toml11/fwd/../fwd/../fwd/region_fwd.hpp:49:5: error: '.toml::detail::region::first_' is used uninitialized [-Werror=uninitialized] - 49 | region(region&&) = default; - | ^~~~~~ - -Upstream-Status: Backport [https://github.com/ToruNiina/toml11/commit/9c7cef94a551cfdbbe2cce262c29221e22643d84] - -Signed-off-by: Mingli Yu ---- - include/toml11/fwd/region_fwd.hpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/toml11/fwd/region_fwd.hpp b/include/toml11/fwd/region_fwd.hpp -index b40317d..26f1a9b 100644 ---- a/include/toml11/fwd/region_fwd.hpp -+++ b/include/toml11/fwd/region_fwd.hpp -@@ -34,7 +34,8 @@ class region - // a value that is constructed manually does not have input stream info - region() - : source_(nullptr), source_name_(""), length_(0), -- first_line_(0), first_column_(0), last_line_(0), last_column_(0) -+ first_(0), first_line_(0), first_column_(0), last_(0), last_line_(0), -+ last_column_(0) - {} - - // a value defined in [first, last). --- -2.34.1 - diff --git a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.2.0.bb b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.2.0.bb deleted file mode 100644 index 758e258a57..0000000000 --- a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.2.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "TOML for Modern C++" -DESCRIPTION = "toml11 is a feature-rich TOML language library for \ - C++11/14/17/20." - -HOMEPAGE = "https://github.com/ToruNiina/toml11" - -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=44d1fcf70c7aa6991533c38daf7befa3" - -PE = "1" - -SRCREV = "cc0bee4fd46ea1f5db147d63ea545208cc9e8405" -SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03" -SRCREV_doctest = "ae7a13539fb71f270b87eb2e874fbac80bc8dda2" - -SRC_URI = "git://github.com/ToruNiina/toml11;branch=main;protocol=https \ - git://github.com/nlohmann/json;destsuffix=git/tests/extlib/json;name=json;branch=develop;protocol=https \ - git://github.com/doctest/doctest;destsuffix=git/tests/extlib/doctest;name=doctest;branch=master;protocol=https \ - file://0001-fix-add-missing-zero-initialization-to-region.patch \ - file://run-ptest \ -" -SRCREV_FORMAT = "json_doctest" - -S = "${WORKDIR}/git" - -inherit cmake ptest - -EXTRA_OECMAKE += "-DTOML11_PRECOMPILE=ON \ - -DTOML11_BUILD_TESTS=${@bb.utils.contains("DISTRO_FEATURES", "ptest", "ON", "OFF", d)} \ -" - -ALLOW_EMPTY:${PN} = "1" - -do_install_ptest () { - install -d ${D}${PTEST_PATH}/tests - cp -r ${B}/tests/test_* ${D}${PTEST_PATH}/tests -} diff --git a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.3.0.bb b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.3.0.bb new file mode 100644 index 0000000000..9f265ea19a --- /dev/null +++ b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.3.0.bb @@ -0,0 +1,38 @@ +SUMMARY = "TOML for Modern C++" +DESCRIPTION = "toml11 is a feature-rich TOML language library for \ + C++11/14/17/20." + +HOMEPAGE = "https://github.com/ToruNiina/toml11" + +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=44d1fcf70c7aa6991533c38daf7befa3" + +PE = "1" + +SRCREV = "499be3c177bcf9b42848d5d9567153e4edfcbc8a" +SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03" +SRCREV_doctest = "ae7a13539fb71f270b87eb2e874fbac80bc8dda2" + +SRC_URI = "git://github.com/ToruNiina/toml11;branch=main;protocol=https \ + git://github.com/nlohmann/json;destsuffix=git/tests/extlib/json;name=json;branch=develop;protocol=https \ + git://github.com/doctest/doctest;destsuffix=git/tests/extlib/doctest;name=doctest;branch=master;protocol=https \ + file://run-ptest \ +" +SRCREV_FORMAT = "json_doctest" + +S = "${WORKDIR}/git" + +inherit cmake ptest + +EXTRA_OECMAKE += "-DTOML11_PRECOMPILE=ON \ + -DTOML11_BUILD_TESTS=${@bb.utils.contains("DISTRO_FEATURES", "ptest", "ON", "OFF", d)} \ +" + +ALLOW_EMPTY:${PN} = "1" + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -r ${B}/tests/test_* ${D}${PTEST_PATH}/tests +} -- cgit v1.2.3-54-g00ecf