woff2: Fix build with gcc=15

This commit is contained in:
Dmitry Bogatov
2025-09-01 00:02:02 +00:00
parent e4e98bb074
commit f96dd2fe52
2 changed files with 38 additions and 1 deletions
+37
View File
@@ -0,0 +1,37 @@
From 08ece7871775c0d7bf4fdff64b961cdc256adf6c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 2 Aug 2024 22:12:03 +0100
Subject: [PATCH] include/woff2/output.h: add missing <stdint.h> include
Without the change `woff2` build fails on upcoming `gcc-15` as:
In file included from src/woff2_out.cc:9:
include/woff2/output.h:73:25: error: expected ')' before '*' token
73 | WOFF2MemoryOut(uint8_t* buf, size_t buf_size);
| ~ ^
| )
include/woff2/output.h:79:3: error: 'uint8_t' does not name a type
79 | uint8_t* buf_;
| ^~~~~~~
include/woff2/output.h:16:1: note: 'uint8_t' is defined in header '<cstdint>';
this is probably fixable by adding '#include <cstdint>'
15 | #include <string>
+++ |+#include <cstdint>
16 |
---
include/woff2/output.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/woff2/output.h b/include/woff2/output.h
index dc78ccf..b12d538 100644
--- a/include/woff2/output.h
+++ b/include/woff2/output.h
@@ -9,6 +9,8 @@
#ifndef WOFF2_WOFF2_OUT_H_
#define WOFF2_WOFF2_OUT_H_
+#include <stdint.h>
+
#include <algorithm>
#include <cstring>
#include <memory>
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
];
# Need to explicitly link to brotlicommon
patches = lib.optional static ./brotli-static.patch;
patches = lib.optional static ./brotli-static.patch ++ [ ./gcc15.patch ];
nativeBuildInputs = [
cmake