janneke pushed a commit to branch core-packages-team
in repository guix.
commit 8c3dae5bef8aaf1664975ef665157f5a2128304a
Author: Janneke Nieuwenhuizen <jann...@gnu.org>
AuthorDate: Fri Jan 3 10:48:56 2025 +0100
gnu: cura-engine: Fix build with gcc-14.
* gnu/packages/patches/cura-engine-gcc-14.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/engineering.scm: Use it.
Change-Id: Icb77a9a67c79372c16e607038c185d22fc20d122
---
gnu/local.mk | 1 +
gnu/packages/engineering.scm | 4 +++-
gnu/packages/patches/cura-engine-gcc-14.patch | 12 ++++++++++++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 01054ce031..d61ac69a5f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1151,6 +1151,7 @@ dist_patch_DATA =
\
%D%/packages/patches/csvkit-set-locale-for-tests.patch
\
%D%/packages/patches/cube-nocheck.patch \
%D%/packages/patches/cups-minimal-Address-PPD-injection-issues.patch \
+ %D%/packages/patches/cura-engine-gcc-14.patch \
%D%/packages/patches/curl-CVE-2024-8096.patch \
%D%/packages/patches/curl-use-ssl-cert-env.patch \
%D%/packages/patches/curlftpfs-fix-error-closing-file.patch \
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 234f4a2b03..872ca6bb38 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -42,6 +42,7 @@
;;; Copyright © 2024 Juliana Sims <j...@incana.org>
;;; Copyright © 2024 Nguyễn Gia Phong <mcsi...@disroot.org>
;;; Copyright © 2025 Frederick Muriuki Muriithi <fredmang...@gmail.com>
+;;; Copyright © 2025 Janneke Nieuwenhuizen <jann...@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -4436,13 +4437,14 @@ facilitate the communication between Cura and its
backend and similar code.")
(define-public cura-engine
(package
(name "cura-engine")
- (version "4.13.1")
+ (version "4.13.2")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Ultimaker/CuraEngine";)
(commit version)))
+ (patches (search-patches "cura-engine-gcc-14.patch"))
(file-name (git-file-name name version))
(sha256
(base32 "0xp2r0m5wwfsh9wdb3biqzvfqfz5jsmyw4bww93aksw0rgli07bp"))))
diff --git a/gnu/packages/patches/cura-engine-gcc-14.patch
b/gnu/packages/patches/cura-engine-gcc-14.patch
new file mode 100644
index 0000000000..e28f228072
--- /dev/null
+++ b/gnu/packages/patches/cura-engine-gcc-14.patch
@@ -0,0 +1,12 @@
+Upstream-status: Not presented upstream.
+
+--- cura-engine-4.13.2-checkout/src/utils/math.h 1970-01-01
01:00:01.000000000 +0100
++++ cura-engine-4.13.2-checkout/src/utils/math.h 2025-01-03
10:42:38.726345314 +0100
+@@ -5,6 +5,7 @@
+ #define UTILS_MATH_H
+
+ #include <cmath>
++#include <cstdint>
+
+
+ //c++11 no longer defines M_PI, so add our own constant.
