~ruther/guix-local

7f32a25e06652e53fa43211cc32f8d2925c60830 — Janneke Nieuwenhuizen 1 year, 10 months ago 35a2abb
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
3 files changed, 36 insertions(+), 0 deletions(-)

M gnu/local.mk
M gnu/packages/graphics.scm
A gnu/packages/patches/openexr-2-gcc-14.patch
M gnu/local.mk => gnu/local.mk +1 -0
@@ 1969,6 1969,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/openboardview-use-system-mpc.patch	\
  %D%/packages/patches/openbox-add-fix-for-glib2-exposed-segfault.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       \

M gnu/packages/graphics.scm => gnu/packages/graphics.scm +2 -0
@@ 1578,6 1578,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

A gnu/packages/patches/openexr-2-gcc-14.patch => gnu/packages/patches/openexr-2-gcc-14.patch +33 -0
@@ 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;