From d99b919889fee6c08a7e99650dbc6704690e82d6 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 19 Jun 2026 12:28:48 +0200 Subject: [PATCH 1/2] Bump spdlog version and fix clipper conflict when building with cli CURA-13232 --- conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 5254a39..efed995 100644 --- a/conanfile.py +++ b/conanfile.py @@ -100,9 +100,9 @@ def layout(self): def requirements(self): - self.requires("spdlog/1.15.1") + self.requires("spdlog/1.17.0") self.requires("range-v3/0.12.0") - self.requires("clipper/6.4.2@ultimaker/stable") + self.requires("clipper/6.4.2@ultimaker/stable", override=True) if self.options.get_safe("with_python_bindings", False): self.requires("cpython/3.12.2") self.requires("pybind11/2.11.1") From db5e1c2f02cb932d9dd66095d36d839ce44e8931 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 19 Jun 2026 13:58:54 +0200 Subject: [PATCH 2/2] Properly set the forced clipper version CURA-13232 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index efed995..6823e5b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -102,7 +102,7 @@ def layout(self): def requirements(self): self.requires("spdlog/1.17.0") self.requires("range-v3/0.12.0") - self.requires("clipper/6.4.2@ultimaker/stable", override=True) + self.requires("clipper/6.4.2@ultimaker/stable", force=True) if self.options.get_safe("with_python_bindings", False): self.requires("cpython/3.12.2") self.requires("pybind11/2.11.1")