116/290: gnu: openexr-2: Fix build with gcc-14.

[guix-commits]

andreas pushed a commit to branch core-packages-team
in repository guix.

commit 6c9c96b481aedae258b243ff2345133eb2ab3603
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed Jan 1 15:12:25 2025 +0100

    gnu: openexr-2: Fix build with gcc-14.
    
    * gnu/packages/patches/openexr-2-gcc-14.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Register it.
    * gnu/packages/graphics.scm (openexr-2)[source]: Use it.
    
    Change-Id: I050731f989581a8a6255ad46a4ede5493e2bed87
---
 gnu/local.mk                                |  1 +
 gnu/packages/graphics.scm                   |  2 ++
 gnu/packages/patches/openexr-2-gcc-14.patch | 33 +++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index fd367ccf28..ddbf8e09c7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1940,6 +1940,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/openboardview-use-system-imgui.patch    \
   %D%/packages/patches/openboardview-use-system-mpc.patch      \
   %D%/packages/patches/openbox-python3.patch                   \
+  %D%/packages/patches/openexr-2-gcc-14.patch                  \
   %D%/packages/patches/openjdk-currency-time-bomb.patch                \
   %D%/packages/patches/openjdk-currency-time-bomb2.patch       \
   %D%/packages/patches/openjdk-9-pointer-comparison.patch       \
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index f3c147d4ed..9f1bc4e9f1 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1452,6 +1452,8 @@ with strong support for multi-part, multi-channel use 
cases.")
     (version (package-version ilmbase))
     (source (origin
               (inherit (package-source ilmbase))
+              (patches (append (origin-patches (package-source ilmbase))
+                               (search-patches "openexr-2-gcc-14.patch")))
               (file-name (git-file-name "openexr" version))))
     (build-system cmake-build-system)
     (arguments
diff --git a/gnu/packages/patches/openexr-2-gcc-14.patch 
b/gnu/packages/patches/openexr-2-gcc-14.patch
new file mode 100644
index 0000000000..4ed45ce459
--- /dev/null
+++ b/gnu/packages/patches/openexr-2-gcc-14.patch
@@ -0,0 +1,33 @@
+Upstream-status: Not presented upstream.
+
+--- openexr-2.5.7-checkout/OpenEXR/IlmImf/ImfHuf.cpp   1970-01-01 
01:00:01.000000000 +0100
++++ openexr-2.5.7-checkout/OpenEXR/IlmImf/ImfHuf.cpp   2025-01-01 
14:56:18.414434903 +0100
+@@ -53,6 +53,7 @@
+ #include <cstring>
+ #include <cassert>
+ #include <algorithm>
++#include <cstdint>
+ 
+ 
+ using namespace std;
+--- openexr-2.5.7-checkout/OpenEXR/IlmImf/ImfDwaCompressor.cpp 1970-01-01 
01:00:01.000000000 +0100
++++ openexr-2.5.7-checkout/OpenEXR/IlmImf/ImfDwaCompressor.cpp 2025-01-01 
15:03:40.654686929 +0100
+@@ -159,6 +159,7 @@
+ #include <limits>
+ 
+ #include <cstddef>
++#include <cstdint>
+ 
+ 
+ // Windows specific addition to prevent the indirect import of the redefined 
min/max macros
+--- openexr-2.5.7-checkout/OpenEXR/IlmImf/ImfMisc.cpp  1970-01-01 
01:00:01.000000000 +0100
++++ openexr-2.5.7-checkout/OpenEXR/IlmImf/ImfMisc.cpp  2025-01-01 
15:09:40.591441901 +0100
+@@ -54,6 +54,8 @@
+ #include <ImfTileDescription.h>
+ #include "ImfNamespace.h"
+ 
++#include <cstdint>
++
+ OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER
+ 
+ using IMATH_NAMESPACE::Box2i;