mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openexr-2: Fix build with gcc-14.

Browse source 
* 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
This commit is contained in:
Janneke Nieuwenhuizen 2025-01-01 15:12:25 +01:00
parent 5772f4fdd1
commit 13317c56f8
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1904,6 +1904,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 \

2
gnu/packages/graphics.scm
View file

@ -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

33
gnu/packages/patches/openexr-2-gcc-14.patch Normal file
View file

@ -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;