diff --git a/webkit2gtk3-gcc12.patch b/webkit2gtk3-gcc12.patch new file mode 100644 index 0000000..2a3f63f --- /dev/null +++ b/webkit2gtk3-gcc12.patch @@ -0,0 +1,73 @@ +From 0a17a235d9f56d9107a3e87a42bdcff4c43806a7 Mon Sep 17 00:00:00 2001 +From: Mike Gorse +Date: Wed, 30 Mar 2022 13:07:47 -0500 +Subject: [PATCH] Add default constructors needed to build with gcc 12 + +--- + Source/JavaScriptCore/ChangeLog | 11 +++++++++++ + Source/JavaScriptCore/runtime/SamplingProfiler.h | 15 +++++++++++---- + Source/WebCore/ChangeLog | 10 ++++++++++ + .../platform/graphics/ColorInterpolationMethod.h | 10 +++++++++- + 4 files changed, 41 insertions(+), 5 deletions(-) + +diff --git a/Source/JavaScriptCore/runtime/SamplingProfiler.h b/Source/JavaScriptCore/runtime/SamplingProfiler.h +index 64415967ab7f..87ecbb4e7bd0 100644 +--- a/Source/JavaScriptCore/runtime/SamplingProfiler.h ++++ b/Source/JavaScriptCore/runtime/SamplingProfiler.h +@@ -106,6 +106,13 @@ public: + BytecodeIndex wasmOffset; + + struct CodeLocation { ++ CodeLocation() ++ : lineNumber { std::numeric_limits::max() }, ++ columnNumber { std::numeric_limits::max() }, ++ jitType { JITType::None }, ++ isRegExp { false } ++ { } ++ + bool hasCodeBlockHash() const + { + return codeBlockHash.isSet(); +@@ -123,12 +130,12 @@ public: + } + + // These attempt to be expression-level line and column number. +- unsigned lineNumber { std::numeric_limits::max() }; +- unsigned columnNumber { std::numeric_limits::max() }; ++ unsigned lineNumber; ++ unsigned columnNumber; + BytecodeIndex bytecodeIndex; + CodeBlockHash codeBlockHash; +- JITType jitType { JITType::None }; +- bool isRegExp { false }; ++ JITType jitType; ++ bool isRegExp; + }; + + CodeLocation semanticLocation; +diff --git a/Source/WebCore/platform/graphics/ColorInterpolationMethod.h b/Source/WebCore/platform/graphics/ColorInterpolationMethod.h +index ee6cba0d1d3a..990251d82a23 100644 +--- a/Source/WebCore/platform/graphics/ColorInterpolationMethod.h ++++ b/Source/WebCore/platform/graphics/ColorInterpolationMethod.h +@@ -57,9 +57,17 @@ enum class ColorInterpolationColorSpace : uint8_t { + + struct ColorInterpolationMethod { + struct HSL { ++ HSL() ++ : hueInterpolationMethod { HueInterpolationMethod::Shorter} ++ { } ++ ++ HSL(HueInterpolationMethod method) ++ : hueInterpolationMethod(method) ++ { } ++ + static constexpr auto interpolationColorSpace = ColorInterpolationColorSpace::HSL; + using ColorType = WebCore::HSLA; +- HueInterpolationMethod hueInterpolationMethod = HueInterpolationMethod::Shorter; ++ HueInterpolationMethod hueInterpolationMethod; + }; + struct HWB { + static constexpr auto interpolationColorSpace = ColorInterpolationColorSpace::HWB; +-- +2.35.1 + diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index cf48f18..1b25516 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Mar 30 18:04:39 UTC 2022 - Michael Gorse + +- Add webkit2gtk3-gcc12.patch: fix the build with gcc 12. + +------------------------------------------------------------------- +Tue Mar 29 11:48:56 UTC 2022 - Bjørn Lie + +- Disabled usage of gold linker for all targets via existing + define. + ------------------------------------------------------------------- Mon Mar 21 19:45:49 UTC 2022 - Bjørn Lie diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index ae7cfbd..a2040cd 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -70,7 +70,7 @@ ExclusiveArch: do-not-build %endif # gold linker not available on old s390/s390x -%define _gold_linker 1 +%define _gold_linker 0 %ifarch ppc ppc64le s390 %define _gold_linker 0 %endif @@ -88,6 +88,8 @@ Source99: webkit2gtk3.keyring # PATCH-FIX-OPENSUSE no-forced-sse.patch jengelh@iani.de -- cure execution of illegal instruction in i586 webkit Patch0: no-forced-sse.patch +# PATCH-FIX-UPSTREAM webkit2gtk3-gcc12.patch boo#1197584 webkit#238482 mgorse@suse.com -- fix the build with gcc 12. +Patch1: webkit2gtk3-gcc12.patch BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGL-devel