diff --git a/gnu/local.mk b/gnu/local.mk index 9da31390d1..51c557ca99 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1912,6 +1912,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 c251a525ff..8ba1018efb 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1416,6 +1416,8 @@ (define-public openexr-2 (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 + #include + #include ++#include + + + 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 + + #include ++#include + + + // 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 + #include "ImfNamespace.h" + ++#include ++ + OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER + + using IMATH_NAMESPACE::Box2i;