[staging-next] aseprite, skia-aseprite: fix build with GCC 15 (#474755)

This commit is contained in:
Aleksana
2025-12-28 09:32:43 +00:00
committed by GitHub
2 changed files with 15 additions and 0 deletions
+5
View File
@@ -105,6 +105,11 @@ clangStdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace src/ver/CMakeLists.txt \
--replace-fail '"1.x-dev"' '"${finalAttrs.version}"'
# Using substituteInPlace because no upstream patch for GCC 15 was found for this bundled library.
substituteInPlace third_party/json11/json11.cpp \
--replace-fail "#include <cmath>" "#include <cmath>
#include <cstdint>"
'';
cmakeFlags = [
+10
View File
@@ -41,6 +41,16 @@ clangStdenv.mkDerivation (finalAttrs: {
python3
];
# Using substituteInPlace because no clean upstream backport for GCC 15 exists for this version of Skia, newer versions fix this with large refactorings.
postPatch = ''
substituteInPlace include/private/SkSLProgramKind.h \
--replace-fail "#include <cinttypes>" "#include <cinttypes>
#include <cstdint>"
substituteInPlace src/sksl/transform/SkSLTransform.h \
--replace-fail "#include <vector>" "#include <vector>
#include <cstdint>"
'';
preConfigure = with depSrcs; ''
mkdir -p third_party/externals
ln -s ${angle2} third_party/externals/angle2