pool/webkit2gtk3
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 966072 from GNOME:Next

Browse Source 
- Add webkit2gtk3-gcc12.patch: fix the build with gcc 12.

- Disabled usage of gold linker for all targets via existing
  define.

OBS-URL: https://build.opensuse.org/request/show/966072
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=341
This commit is contained in:
Bjørn Lie 2022-03-31 09:47:22 +00:00 committed by Git OBS Bridge
parent 8d38d5a665
commit 5d4bfe079c
3 changed files with 87 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
webkit2gtk3-gcc12.patch Normal file
View File

@ -0,0 +1,73 @@
From 0a17a235d9f56d9107a3e87a42bdcff4c43806a7 Mon Sep 17 00:00:00 2001
From: Mike Gorse <mgorse@suse.com>
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<unsigned>::max() },
+ columnNumber { std::numeric_limits<unsigned>::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<unsigned>::max() };
- unsigned columnNumber { std::numeric_limits<unsigned>::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<float>;
- HueInterpolationMethod hueInterpolationMethod = HueInterpolationMethod::Shorter;
+ HueInterpolationMethod hueInterpolationMethod;
};
struct HWB {
static constexpr auto interpolationColorSpace = ColorInterpolationColorSpace::HWB;
--
2.35.1

11
webkit2gtk3.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Mar 30 18:04:39 UTC 2022 - Michael Gorse <mgorse@suse.com>
- Add webkit2gtk3-gcc12.patch: fix the build with gcc 12.
-------------------------------------------------------------------
Tue Mar 29 11:48:56 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Disabled usage of gold linker for all targets via existing
define.
-------------------------------------------------------------------
Mon Mar 21 19:45:49 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

4
webkit2gtk3.spec
View File

@ -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