From 9a65980e34fed5aaed54c3f3ac304d43949ebd44 Mon Sep 17 00:00:00 2001 From: laokz Date: Fri, 31 Oct 2025 12:15:12 +0800 Subject: [PATCH] Adapt to gcc14 https://gcc.gnu.org/gcc-14/porting_to.html#header-dep-changes (cherry picked from commit 1e06d4bceeddb9ecbf1865ca3acfdf176b25fad4) --- adapt-to-gcc14.patch | 12 ++++++++++++ webkit2gtk4_1.spec | 7 ++++++- webkit2gtk5_0.spec | 7 ++++++- webkitgtk.spec | 7 ++++++- 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 adapt-to-gcc14.patch diff --git a/adapt-to-gcc14.patch b/adapt-to-gcc14.patch new file mode 100644 index 0000000..32721a4 --- /dev/null +++ b/adapt-to-gcc14.patch @@ -0,0 +1,12 @@ +diff --git a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h +index 18175e15..28332857 100644 +--- a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h ++++ b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + + // This type is defined here to simplify ANGLE's integration with glslang for SPIR-V. + using ShCompileOptions = uint64_t; diff --git a/webkit2gtk4_1.spec b/webkit2gtk4_1.spec index 6b6afaf..56629ef 100644 --- a/webkit2gtk4_1.spec +++ b/webkit2gtk4_1.spec @@ -14,7 +14,7 @@ Name: webkit2gtk4.1 Version: 2.38.2 -Release: 11 +Release: 12 Summary: GTK web content engine library License: LGPLv2 URL: https://www.webkitgtk.org/ @@ -32,6 +32,8 @@ Patch6005: backport-CVE-2024-4558.patch Patch6006: backport-CVE-2024-40779.patch Patch6007: backport-CVE-2024-40780.patch +Patch9000: adapt-to-gcc14.patch + #Dependency BuildRequires: bison BuildRequires: bubblewrap @@ -258,6 +260,9 @@ popd %endif %changelog +* Fri Oct 31 2025 laokz - 2.38.2-12 +- Adapt to gcc14 + * Fri May 09 2025 lingsheng - 2.38.2-11 - Adapt repo name webkitgtk diff --git a/webkit2gtk5_0.spec b/webkit2gtk5_0.spec index 3a87da1..7d4fce2 100644 --- a/webkit2gtk5_0.spec +++ b/webkit2gtk5_0.spec @@ -14,7 +14,7 @@ Name: webkit2gtk5.0 Version: 2.38.2 -Release: 11 +Release: 12 Summary: GTK web content engine library License: LGPLv2 URL: https://www.webkitgtk.org/ @@ -32,6 +32,8 @@ Patch6005: backport-CVE-2024-4558.patch Patch6006: backport-CVE-2024-40779.patch Patch6007: backport-CVE-2024-40780.patch +Patch9000: adapt-to-gcc14.patch + #Dependency BuildRequires: bison BuildRequires: bubblewrap @@ -258,6 +260,9 @@ popd %endif %changelog +* Fri Oct 31 2025 laokz - 2.38.2-12 +- Adapt to gcc14 + * Fri May 09 2025 lingsheng - 2.38.2-11 - Adapt repo name webkitgtk diff --git a/webkitgtk.spec b/webkitgtk.spec index 556c963..99c94cc 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -14,7 +14,7 @@ Name: webkit2gtk3 Version: 2.38.2 -Release: 11 +Release: 12 Summary: GTK web content engine library License: LGPLv2 URL: https://www.webkitgtk.org/ @@ -32,6 +32,8 @@ Patch6005: backport-CVE-2024-4558.patch Patch6006: backport-CVE-2024-40779.patch Patch6007: backport-CVE-2024-40780.patch +Patch9000: adapt-to-gcc14.patch + #Dependency BuildRequires: bison BuildRequires: bubblewrap @@ -289,6 +291,9 @@ popd %endif %changelog +* Fri Oct 31 2025 laokz - 2.38.2-12 +- Adapt to gcc14 + * Fri May 09 2025 lingsheng - 2.38.2-11 - Adapt repo name webkitgtk -- Gitee