From 0e39349046ff347e4c6fa314ad651be1c31c2a99 Mon Sep 17 00:00:00 2001 From: Daniel Bertalan Date: Sun, 20 Apr 2025 08:47:20 +0200 Subject: [PATCH] [woff2] Fix gcc 15 missing header issue GCC 15 reduced some transitive includes in libstdc++, so `stdint.h` is no longer being pulled in to woff2's `output.h`, causing a compile error on its use of `uint8_t`. There is an open pull request with the fix (https://github.com/google/woff2/pull/176), but upstream maintainers haven't responded to it; let's patch it ourselves. --- ports/woff2/0002-stdint-include.patch | 13 +++++++++++++ ports/woff2/portfile.cmake | 1 + ports/woff2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/woff2.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/woff2/0002-stdint-include.patch diff --git a/ports/woff2/0002-stdint-include.patch b/ports/woff2/0002-stdint-include.patch new file mode 100644 index 00000000000000..43f7fc85e513c4 --- /dev/null +++ b/ports/woff2/0002-stdint-include.patch @@ -0,0 +1,13 @@ +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 ++ + #include + #include + #include diff --git a/ports/woff2/portfile.cmake b/ports/woff2/portfile.cmake index b392fed7f65368..f70fdc3bc1b4be 100644 --- a/ports/woff2/portfile.cmake +++ b/ports/woff2/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( HEAD_REF master PATCHES 0001-unofficial-brotli.patch + 0002-stdint-include.patch ) vcpkg_cmake_configure( diff --git a/ports/woff2/vcpkg.json b/ports/woff2/vcpkg.json index fa3ece813bb3a5..c43c6932c76428 100644 --- a/ports/woff2/vcpkg.json +++ b/ports/woff2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "woff2", "version": "1.0.2", - "port-version": 4, + "port-version": 5, "description": "font compression reference code", "dependencies": [ "brotli", diff --git a/versions/baseline.json b/versions/baseline.json index 5f8df64c66645c..ed4921ff8e020a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10038,7 +10038,7 @@ }, "woff2": { "baseline": "1.0.2", - "port-version": 4 + "port-version": 5 }, "wolf-midi": { "baseline": "1.0.1", diff --git a/versions/w-/woff2.json b/versions/w-/woff2.json index 60f4d2454cf83f..f87ff38d3cf43e 100644 --- a/versions/w-/woff2.json +++ b/versions/w-/woff2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a12f112e02313670c8e24d72d72a83ce74521b4", + "version": "1.0.2", + "port-version": 5 + }, { "git-tree": "fbd2207ad0ad1e7e52b421b86f96deff9ed7ec65", "version": "1.0.2",