download.lst | 4 +- external/liborcus/UnpackedTarball_liborcus.mk | 1 external/liborcus/add-lt-operator.patch.1 | 39 ++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-)
New commits: commit 4094a3fdaddf5ee58af03e2eb93cfe6ecfed08e6 Author: Kohei Yoshida <[email protected]> AuthorDate: Mon Dec 15 21:08:37 2025 -0500 Commit: Kohei Yoshida <[email protected]> CommitDate: Wed Dec 17 00:12:18 2025 +0100 Upgrade mdds to 3.2.0 Downloaded from https://gitlab.com/api/v4/projects/mdds%2Fmdds/packages/generic/source/3.2.0/mdds-3.2.0.tar.xz Change-Id: If2a6fff0a8d7bce04e36be0b92097405cc30a899 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195691 Reviewed-by: Kohei Yoshida <[email protected]> Tested-by: Jenkins diff --git a/download.lst b/download.lst index 2b03a0610d8e..61c314231692 100644 --- a/download.lst +++ b/download.lst @@ -492,8 +492,8 @@ MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.4.8-src.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -MDDS_SHA256SUM := ca295f4c86968a7eb1f5d503ff7ae180e6605210cfb26d01658be42048c0924c -MDDS_TARBALL := mdds-3.1.0.tar.xz +MDDS_SHA256SUM := 16defab556c53f94b463460ea2a1faab96e58bad2a95d7981300d2956534abbb +MDDS_TARBALL := mdds-3.2.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 6c1b846f23a0..39e01c8d43cc 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus)) $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/rpath.patch.0 \ external/liborcus/libtool.patch.0 \ + external/liborcus/add-lt-operator.patch.1 \ )) ifeq ($(OS),WNT) diff --git a/external/liborcus/add-lt-operator.patch.1 b/external/liborcus/add-lt-operator.patch.1 new file mode 100644 index 000000000000..556e6110f122 --- /dev/null +++ b/external/liborcus/add-lt-operator.patch.1 @@ -0,0 +1,39 @@ +diff --git a/src/liborcus/gnumeric_types.cpp b/src/liborcus/gnumeric_types.cpp +index fdfdb3fc..a07700e5 100644 +--- a/src/liborcus/gnumeric_types.cpp ++++ b/src/liborcus/gnumeric_types.cpp +@@ -83,11 +83,19 @@ gnumeric_value_format_type to_gnumeric_value_format_type(std::string_view s) + return value_format_type::get().find(s); + } + +-bool gnumeric_value_format_segment::operator==(const gnumeric_value_format_segment& other) const ++bool gnumeric_value_format_segment::operator==(const gnumeric_value_format_segment& other) const noexcept + { + return type == other.type && value == other.value; + } + ++bool gnumeric_value_format_segment::operator<(const gnumeric_value_format_segment& other) const noexcept ++{ ++ if (type != other.type) ++ return type < other.type; ++ ++ return value < other.value; ++} ++ + void gnumeric_named_exp::reset() + { + name = std::string_view{}; +diff --git a/src/liborcus/gnumeric_types.hpp b/src/liborcus/gnumeric_types.hpp +index a2c75deb..4389ad9f 100644 +--- a/src/liborcus/gnumeric_types.hpp ++++ b/src/liborcus/gnumeric_types.hpp +@@ -81,7 +81,8 @@ struct gnumeric_value_format_segment + gnumeric_value_format_type type = gnumeric_value_format_type::unknown; + std::string_view value; + +- bool operator==(const gnumeric_value_format_segment& other) const; ++ bool operator==(const gnumeric_value_format_segment& other) const noexcept; ++ bool operator<(const gnumeric_value_format_segment& other) const noexcept; + }; + + using value_format_segments_type = mdds::segment_tree<std::size_t, gnumeric_value_format_segment>;
