mjw pushed to rpms/valgrind (f39). "Fedora 40 dropped openmpi
support on i386"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-10-31 22:24:17 UTC
From 3fdfb3c05f54634b056caca8f9d0c8743e4238de Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark(a)klomp.org>
Date: Oct 30 2023 20:06:00 +0000
Subject: Fedora 40 dropped openmpi support on i386
---
diff --git a/valgrind.spec b/valgrind.spec
index 277bf90..b3421cd 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -15,11 +15,16 @@ URL: https://www.valgrind.org/
# We never want the openmpi subpackage when building a software collecton.
# We always want it for fedora.
# We only want it for older rhel. But not s390x for too old rhel.
+# And on fedora > 39 i386 dropped openmpi.
%if %{is_scl}
%global build_openmpi 0
%else
%if 0%{?fedora}
- %global build_openmpi 1
+ %ifarch %{ix86}
+ %global build_openmpi (%{?fedora} < 40)
+ %else
+ %global build_openmpi 1
+ %endif
%endif
%if 0%{?rhel}
%if 0%{?rhel} > 7
@@ -460,6 +465,7 @@ fi
%changelog
* Mon Oct 30 2023 Mark Wielaard <mjw(a)fedoraproject.org> - 3.22.0-0.2.RC2
- Update valgrind-3.21.0-no-memcpy-replace-check.patch
+- Fedora 40 dropped openmpi support on i386
* Thu Oct 26 2023 Mark Wielaard <mjw(a)fedoraproject.org> - 3.22.0-0.1.RC2
- Upstream 3.22.0-RC2
https://src.fedoraproject.org/rpms/valgrind/c/3fdfb3c05f54634b056caca8f9d...
6Â months, 1Â week
mjw pushed to rpms/valgrind (f39). "3.22.0-0.2.RC2 - Update
valgrind-3.21.0-no-memcpy-replace-check.patch"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-10-31 22:24:17 UTC
From 79f7a0b69f360048736c7eb4da31473a42146726 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark(a)klomp.org>
Date: Oct 30 2023 19:38:48 +0000
Subject: 3.22.0-0.2.RC2 - Update valgrind-3.21.0-no-memcpy-replace-check.patch
---
diff --git a/valgrind-3.21.0-no-memcpy-replace-check.patch b/valgrind-3.21.0-no-memcpy-replace-check.patch
index 6e26e04..1f59a90 100644
--- a/valgrind-3.21.0-no-memcpy-replace-check.patch
+++ b/valgrind-3.21.0-no-memcpy-replace-check.patch
@@ -1,22 +1,54 @@
+diff --git a/memcheck/tests/overlap.vgtest b/memcheck/tests/overlap.vgtest
+index 54a0baacf..eba65897c 100644
+--- a/memcheck/tests/overlap.vgtest
++++ b/memcheck/tests/overlap.vgtest
+@@ -1,2 +1,4 @@
+ prog: overlap
+ vgopts: -q
++# https://bugs.kde.org/show_bug.cgi?id=402833
++prereq: ! ../../tests/arch_test amd64
diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
-index b32f13f76..464e8d4ca 100644
+index 8de6a0698..79e640189 100644
--- a/shared/vg_replace_strmem.c
+++ b/shared/vg_replace_strmem.c
-@@ -1128,7 +1128,7 @@ static inline void my_exit ( int x )
+@@ -1128,8 +1128,15 @@ static inline void my_exit ( int x )
+ #define MEMMOVE(soname, fnname) \
MEMMOVE_OR_MEMCPY(20181, soname, fnname, 0)
- #define MEMCPY(soname, fnname) \
-- MEMMOVE_OR_MEMCPY(20180, soname, fnname, 1)
-+ MEMMOVE_OR_MEMCPY(20180, soname, fnname, 0) /* See KDE bug #402833 */
+-#define MEMCPY(soname, fnname) \
++/* See https://bugs.kde.org/show_bug.cgi?id=402833
++ why we disable the overlap check on x86_64. */
++#if defined(VGP_amd64_linux)
++ #define MEMCPY(soname, fnname) \
++ MEMMOVE_OR_MEMCPY(20180, soname, fnname, 0)
++#else
++ #define MEMCPY(soname, fnname) \
+ MEMMOVE_OR_MEMCPY(20180, soname, fnname, 1)
++#endif
#if defined(VGO_linux)
/* For older memcpy we have to use memmove-like semantics and skip
-@@ -1714,8 +1714,6 @@ static inline void my_exit ( int x )
+@@ -1704,6 +1711,14 @@ static inline void my_exit ( int x )
+
+ /*-------------------- memcpy_chk --------------------*/
+
++/* See https://bugs.kde.org/show_bug.cgi?id=402833
++ why we disable the overlap check on x86_64. */
++#if defined(VGP_amd64_linux)
++ #define CHECK_OVERLAP 0
++#else
++ #define CHECK_OVERLAP 1
++#endif
++
+ #define GLIBC26___MEMCPY_CHK(soname, fnname) \
+ void* VG_REPLACE_FUNCTION_EZU(20300,soname,fnname) \
+ (void* dst, const void* src, SizeT len, SizeT dstlen ); \
+@@ -1717,7 +1732,7 @@ static inline void my_exit ( int x )
RECORD_COPY(len); \
if (len == 0) \
return dst; \
- if (is_overlap(dst, src, len, len)) \
-- RECORD_OVERLAP_ERROR("memcpy_chk", dst, src, len); \
++ if (CHECK_OVERLAP && is_overlap(dst, src, len, len)) \
+ RECORD_OVERLAP_ERROR("memcpy_chk", dst, src, len); \
if ( dst > src ) { \
d = (HChar *)dst + len - 1; \
- s = (const HChar *)src + len - 1; \
diff --git a/valgrind.spec b/valgrind.spec
index 80231ec..277bf90 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
Summary: Dynamic analysis tools to detect memory or thread bugs and profile
Name: %{?scl_prefix}valgrind
Version: 3.22.0
-Release: 0.1.RC2%{?dist}
+Release: 0.2.RC2%{?dist}
Epoch: 1
License: GPLv2+
URL: https://www.valgrind.org/
@@ -458,6 +458,9 @@ fi
%endif
%changelog
+* Mon Oct 30 2023 Mark Wielaard <mjw(a)fedoraproject.org> - 3.22.0-0.2.RC2
+- Update valgrind-3.21.0-no-memcpy-replace-check.patch
+
* Thu Oct 26 2023 Mark Wielaard <mjw(a)fedoraproject.org> - 3.22.0-0.1.RC2
- Upstream 3.22.0-RC2
https://src.fedoraproject.org/rpms/valgrind/c/79f7a0b69f360048736c7eb4da3...
6Â months, 1Â week
mjw pushed to rpms/valgrind (f39). "3.22.0-0.1.RC2 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-10-31 22:24:17 UTC
From ebfba02e334d174208f50c928e95f22a0d4b78ea Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw(a)fedoraproject.org>
Date: Oct 26 2023 12:53:20 +0000
Subject: 3.22.0-0.1.RC2
- Upstream 3.22.0-RC2
---
diff --git a/.gitignore b/.gitignore
index 3f735f2..8398eb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@
/valgrind-3.21.0.RC2.tar.bz2
/valgrind-3.21.0.tar.bz2
/valgrind-3.22.0.RC1.tar.bz2
+/valgrind-3.22.0.RC2.tar.bz2
diff --git a/sources b/sources
index e2e8ed5..e14d456 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (valgrind-3.22.0.RC1.tar.bz2) = 0aa9e98a959808d20cce53575433f81973ef3de3acc313ef2700f58cf9b2b7ee951b5bc701ef8508f5c136cb14239bbe7d81ae4208679ba55150b3edfd6078f0
+SHA512 (valgrind-3.22.0.RC2.tar.bz2) = 6a15101f4b92454856850fc35b9c38fd7fb294bee422274a803331465f347a732dc71e52c28e2d489c8d08ec7c677c1041bd32aeb4f43dd91ee404d4f6fa1208
diff --git a/valgrind.spec b/valgrind.spec
index ab1816f..80231ec 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
Summary: Dynamic analysis tools to detect memory or thread bugs and profile
Name: %{?scl_prefix}valgrind
Version: 3.22.0
-Release: 0.1.RC1%{?dist}
+Release: 0.1.RC2%{?dist}
Epoch: 1
License: GPLv2+
URL: https://www.valgrind.org/
@@ -69,7 +69,7 @@ URL: https://www.valgrind.org/
# So those will already have their full symbol table.
%undefine _include_minidebuginfo
-Source0: https://sourceware.org/pub/valgrind/valgrind-%{version}.RC1.tar.bz2
+Source0: https://sourceware.org/pub/valgrind/valgrind-%{version}.RC2.tar.bz2
# Needs investigation and pushing upstream
Patch1: valgrind-3.9.0-cachegrind-improvements.patch
@@ -213,7 +213,7 @@ Valgrind User Manual for details.
%endif
%prep
-%setup -q -n %{?scl:%{pkg_name}}%{!?scl:%{name}}-%{version}.RC1
+%setup -q -n %{?scl:%{pkg_name}}%{!?scl:%{name}}-%{version}.RC2
%patch -P1 -p1
%patch -P2 -p1
@@ -458,6 +458,9 @@ fi
%endif
%changelog
+* Thu Oct 26 2023 Mark Wielaard <mjw(a)fedoraproject.org> - 3.22.0-0.1.RC2
+- Upstream 3.22.0-RC2
+
* Tue Oct 17 2023 Mark Wielaard <mjw(a)fedoraproject.org> - 3.22.0-0.1.RC1
- Upstream 3.22.0-RC1
- Remove all upstreamed patches
https://src.fedoraproject.org/rpms/valgrind/c/ebfba02e334d174208f50c928e9...
6Â months, 1Â week
mjw pushed to rpms/valgrind (rawhide). "BuildRequires
elfutils-debuginfod for testing"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-10-31 22:23:40 UTC
From 4295b515b73f046fd41117d98b7aa3b8697f687f Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark(a)klomp.org>
Date: Oct 31 2023 22:23:19 +0000
Subject: BuildRequires elfutils-debuginfod for testing
---
diff --git a/valgrind.spec b/valgrind.spec
index c637884..fd14ef0 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -120,6 +120,7 @@ BuildRequires: docbook-dtds
# For testing debuginfod-find
%if 0%{?fedora} > 29 || 0%{?rhel} > 7
+BuildRequires: elfutils-debuginfod
BuildRequires: elfutils-debuginfod-client
# For using debuginfod at runtime
Recommends: elfutils-debuginfod-client
@@ -459,6 +460,7 @@ fi
%changelog
* Tue Oct 31 2023 Mark Wielaard <mjw(a)fedoraproject.org> - 3.22.0-1
- Upstream 3.22.0 final
+- BuildRequires elfutils-debuginfod for testing
* Mon Oct 30 2023 Mark Wielaard <mjw(a)fedoraproject.org> - 3.22.0-0.2.RC2
- Update valgrind-3.21.0-no-memcpy-replace-check.patch
https://src.fedoraproject.org/rpms/valgrind/c/4295b515b73f046fd41117d98b7...
6Â months, 1Â week
pagure pushed to rpms/CuraEngine (f37). "Ensure stb_image contains
the latest CVE patches"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-10-31 22:21:46 UTC
From cd328f0323eaf55621e1db9e069f991df6ed9d8d Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Oct 26 2023 12:20:44 +0000
Subject: Ensure stb_image contains the latest CVE patches
---
diff --git a/CuraEngine.spec b/CuraEngine.spec
index aa9d79c..3832f98 100644
--- a/CuraEngine.spec
+++ b/CuraEngine.spec
@@ -1,7 +1,7 @@
Name: CuraEngine
Epoch: 1
Version: 4.13.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Engine for processing 3D models into G-code instructions for 3D printers
License: AGPLv3+
URL: https://github.com/Ultimaker/%{name}
@@ -17,9 +17,19 @@ BuildRequires: cmake
BuildRequires: git-core
# Header-only package; -static version is for tracking per guidelines
-# stb_image 2.28^20230129git5736b15-0.2 is the minimum EVR that fixes the null
-# pointer dereference reported in https://github.com/nothings/stb/issues/1452.
-BuildRequires: stb_image-static >= 2.28^20230129git5736b15-0.2
+# Enforce the the minimum EVR to contain fixes for all of:
+# CVE-2021-28021
+# CVE-2021-42715
+# CVE-2021-42716
+# CVE-2022-28041
+# CVE-2023-43898
+# CVE-2023-45661
+# CVE-2023-45662
+# CVE-2023-45663
+# CVE-2023-45664
+# CVE-2023-45666
+# CVE-2023-45667
+BuildRequires: stb_image-static >= 2.28^20231011gitbeebb24-12
Patch: %{name}-static-libstdcpp.patch
# Add an #include needed for GCC 13
@@ -74,6 +84,9 @@ sed -i 's/"DEV"/"%{version}"/' src/settings/Settings.h
%{_bindir}/%{name}
%changelog
+* Wed Oct 25 2023 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1:4.13.1-7
+- Ensure stb_image contains the latest CVE patches
+
* Sat Feb 25 2023 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1:4.13.1-6
- Update minimum stb_image to fix a null deref. bug
https://src.fedoraproject.org/rpms/CuraEngine/c/cd328f0323eaf55621e1db9e0...
6Â months, 1Â week
packagerbot pushed to rpms/dummy-test-package-gloster (rawhide).
"Bump release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-10-31 22:12:44 UTC
From 92e744b588504b7540a409ace70ba1db65c7fea8 Mon Sep 17 00:00:00 2001
From: packagerbot <admin(a)fedoraproject.org>
Date: Oct 31 2023 22:12:37 +0000
Subject: Bump release
Signed-off-by: packagerbot <admin(a)fedoraproject.org>
---
diff --git a/dummy-test-package-gloster.spec b/dummy-test-package-gloster.spec
index c9117e3..fa4c73d 100644
--- a/dummy-test-package-gloster.spec
+++ b/dummy-test-package-gloster.spec
@@ -3,7 +3,7 @@
Name: dummy-test-package-gloster
Version: 0
-Release: 11186%{?dist}
+Release: 11187%{?dist}
Summary: Dummy Test Package called Gloster
License: CC0
URL: http://fedoraproject.org/wiki/DummyTestPackages
@@ -32,6 +32,9 @@ cp -p uuid %{buildroot}%{_datadir}/%{name}
%{_datadir}/%{name}
%changelog
+* Tue Oct 31 2023 packagerbot <admin(a)fedoraproject.org> - 0-11187
+- rebuilt
+
* Tue Oct 31 2023 packagerbot <admin(a)fedoraproject.org> - 0-11186
- rebuilt
https://src.fedoraproject.org/rpms/dummy-test-package-gloster/c/92e744b58...
6Â months, 1Â week
pagure pushed to rpms/CuraEngine (f38). "Rebuilt due to fmt 10 update."
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-10-31 22:00:19 UTC
From 8c233369593330baea7908892f9ac38caaea544d Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Jun 28 2023 09:06:38 +0000
Subject: Rebuilt due to fmt 10 update.
---
diff --git a/CuraEngine.spec b/CuraEngine.spec
index d84d6eb..41b1a35 100644
--- a/CuraEngine.spec
+++ b/CuraEngine.spec
@@ -1,7 +1,7 @@
Name: CuraEngine
Epoch: 1
Version: 5.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Engine for processing 3D models into G-code instructions for 3D printers
License: AGPLv3+
URL: https://github.com/Ultimaker/%{name}
@@ -89,6 +89,9 @@ rm -rf libs
%{_bindir}/%{name}
%changelog
+* Wed Jun 28 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:5.3.0-2
+- Rebuilt due to fmt 10 update.
+
* Wed Mar 8 2023 Tom Callaway <spot(a)fedoraproject.org> - 1:5.3.0-1
- update to 5.3.0
https://src.fedoraproject.org/rpms/CuraEngine/c/8c233369593330baea7908892...
6Â months, 1Â week
pagure pushed to rpms/CuraEngine (f38). "Ensure stb_image contains
the latest CVE patches"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-10-31 22:00:19 UTC
From dea253a8e80f369a4c730b0ff2c866a44a41b24b Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Oct 25 2023 17:58:55 +0000
Subject: Ensure stb_image contains the latest CVE patches
---
diff --git a/CuraEngine.spec b/CuraEngine.spec
index 78624bd..19db295 100644
--- a/CuraEngine.spec
+++ b/CuraEngine.spec
@@ -1,7 +1,7 @@
Name: CuraEngine
Epoch: 1
Version: 5.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Engine for processing 3D models into G-code instructions for 3D printers
License: AGPLv3+
URL: https://github.com/Ultimaker/%{name}
@@ -28,9 +28,19 @@ BuildRequires: fmt-devel
BuildRequires: spdlog-devel
# Header-only package; -static version is for tracking per guidelines
-# stb_image 2.28^20230129git5736b15-0.2 is the minimum EVR that fixes the null
-# pointer dereference reported in https://github.com/nothings/stb/issues/1452.
-BuildRequires: stb_image-static >= 2.28^20230129git5736b15-0.2
+# Enforce the the minimum EVR to contain fixes for all of:
+# CVE-2021-28021
+# CVE-2021-42715
+# CVE-2021-42716
+# CVE-2022-28041
+# CVE-2023-43898
+# CVE-2023-45661
+# CVE-2023-45662
+# CVE-2023-45663
+# CVE-2023-45664
+# CVE-2023-45666
+# CVE-2023-45667
+BuildRequires: stb_image-static >= 2.28^20231011gitbeebb24-12
Patch0: %{name}-static-libstdcpp.patch
# Patch for fmtlib 10
@@ -92,6 +102,9 @@ rm -rf libs
%{_bindir}/%{name}
%changelog
+* Wed Oct 25 2023 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1:5.3.0-5
+- Ensure stb_image contains the latest CVE patches
+
* Wed Jul 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:5.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
https://src.fedoraproject.org/rpms/CuraEngine/c/dea253a8e80f369a4c730b0ff...
6Â months, 1Â week
pagure pushed to rpms/CuraEngine (f38). "Rebuilt due to spdlog 1.12 update."
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-10-31 22:00:19 UTC
From 3b304a98bd7132fc26a53823aee4eb6859cf4557 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Jul 08 2023 18:25:01 +0000
Subject: Rebuilt due to spdlog 1.12 update.
---
diff --git a/CuraEngine.spec b/CuraEngine.spec
index b7854dc..441686d 100644
--- a/CuraEngine.spec
+++ b/CuraEngine.spec
@@ -1,7 +1,7 @@
Name: CuraEngine
Epoch: 1
Version: 5.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Engine for processing 3D models into G-code instructions for 3D printers
License: AGPLv3+
URL: https://github.com/Ultimaker/%{name}
@@ -92,6 +92,9 @@ rm -rf libs
%{_bindir}/%{name}
%changelog
+* Sat Jul 08 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:5.3.0-3
+- Rebuilt due to spdlog 1.12 update.
+
* Sat Jul 1 2023 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1:5.3.0-3
- Patch for fmtlib 10
https://src.fedoraproject.org/rpms/CuraEngine/c/3b304a98bd7132fc26a53823a...
6Â months, 1Â week
pagure pushed to rpms/CuraEngine (f38). "Patch for fmtlib 10"
by notificationsï¼ fedoraproject.org
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...
6Â months, 1Â week