~ruther/guix-local

7efaaa0da153dd41f2104891fa70985557686fea — Janneke Nieuwenhuizen 1 year, 10 months ago 82cc581
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
3 files changed, 16 insertions(+), 1 deletions(-)

M gnu/local.mk
M gnu/packages/engineering.scm
A gnu/packages/patches/cura-engine-gcc-14.patch
M gnu/local.mk => gnu/local.mk +1 -0
@@ 1170,6 1170,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/ctranslate2-local-build.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	\

M gnu/packages/engineering.scm => gnu/packages/engineering.scm +3 -1
@@ 44,6 44,7 @@
;;; Copyright © 2025 Frederick Muriuki Muriithi <fredmanglis@gmail.com>
;;; Copyright © 2025 nomike Postmann <nomike@nomike.com>
;;; Copyright © 2025 Matthew Elwin <elwin@northwestern.edu>
;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;


@@ 4774,13 4775,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"))))

A gnu/packages/patches/cura-engine-gcc-14.patch => gnu/packages/patches/cura-engine-gcc-14.patch +12 -0
@@ 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.