Notification time stamped 2023-10-31 22:00:19 UTC
From 8ab358bed4ae7b3acebb190e523cad75be88edb8 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Jul 01 2023 15:17:58 +0000
Subject: Patch for fmtlib 10
---
diff --git a/CuraEngine-5.3.0-fmt10.patch b/CuraEngine-5.3.0-fmt10.patch
new file mode 100644
index 0000000..d8147df
--- /dev/null
+++ b/CuraEngine-5.3.0-fmt10.patch
@@ -0,0 +1,33 @@
+--- CuraEngine-5.3.0/src/FffGcodeWriter.cpp.fmt10 2023-03-07 21:33:22.000000000 +0900
++++ CuraEngine-5.3.0/src/FffGcodeWriter.cpp 2023-07-02 00:01:20.042447483 +0900
+@@ -996,7 +996,7 @@ void FffGcodeWriter::processRaft(const S
+
+ LayerPlan& FffGcodeWriter::processLayer(const SliceDataStorage& storage,
LayerIndex layer_nr, const size_t total_layers) const
+ {
+- spdlog::debug("GcodeWriter processing layer {} of {}", layer_nr,
total_layers);
++ spdlog::debug("GcodeWriter processing layer {} of {}",
static_cast<int>(layer_nr), total_layers);
+
+ const Settings& mesh_group_settings =
Application::getInstance().current_slice->scene.current_mesh_group->settings;
+ coord_t layer_thickness =
mesh_group_settings.get<coord_t>("layer_height");
+--- CuraEngine-5.3.0/src/LayerPlanBuffer.cpp.fmt10 2023-03-07 21:33:22.000000000 +0900
++++ CuraEngine-5.3.0/src/LayerPlanBuffer.cpp 2023-07-02 00:03:16.060680917 +0900
+@@ -82,7 +82,7 @@ void LayerPlanBuffer::addConnectingTrave
+
+ if (! new_layer_destination_state)
+ {
+- spdlog::warn("Layer {} is empty (or it has empty extruder plans).
Temperature control and cross layer travel moves might suffer!",
newest_layer->layer_nr);
++ spdlog::warn("Layer {} is empty (or it has empty extruder plans).
Temperature control and cross layer travel moves might suffer!",
static_cast<int>(newest_layer->layer_nr));
+ return;
+ }
+
+--- CuraEngine-5.3.0/src/Weaver.cpp.fmt10 2023-03-07 21:33:22.000000000 +0900
++++ CuraEngine-5.3.0/src/Weaver.cpp 2023-07-02 00:04:08.697786833 +0900
+@@ -55,7 +55,7 @@ void Weaver::weave(MeshGroup* meshgroup)
+ }
+ if (starting_layer_idx > 0)
+ {
+- spdlog::warn("First {} layers are empty!", starting_layer_idx);
++ spdlog::warn("First {} layers are empty!",
static_cast<int>(starting_layer_idx));
+ }
+ }
+
diff --git a/CuraEngine.spec b/CuraEngine.spec
index 41b1a35..b7854dc 100644
--- a/CuraEngine.spec
+++ b/CuraEngine.spec
@@ -33,6 +33,8 @@ BuildRequires: spdlog-devel
BuildRequires: stb_image-static >= 2.28^20230129git5736b15-0.2
Patch0: %{name}-static-libstdcpp.patch
+# Patch for fmtlib 10
+Patch1: CuraEngine-5.3.0-fmt10.patch
#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10
@@ -57,7 +59,8 @@ cp -a %{SOURCE2} %{SOURCE3} %{SOURCE4} cmake
rm -rf CMakeLists.txt
cp -a %{SOURCE5} %{SOURCE6} .
-%patch0 -p1
+%patch -P0 -p1
+%patch -P1 -p1
# bundled libraries
rm -rf libs
@@ -89,6 +92,9 @@ rm -rf libs
%{_bindir}/%{name}
%changelog
+* Sat Jul 1 2023 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1:5.3.0-3
+- Patch for fmtlib 10
+
* Wed Jun 28 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:5.3.0-2
- Rebuilt due to fmt 10 update.
https://src.fedoraproject.org/rpms/CuraEngine/c/8ab358bed4ae7b3acebb190e5...