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

Accepting request 927841 from GNOME:Next

Browse Source 
Fix build on SLE-15-SP4.
Update g++ version dependency.
Tweak changes to add bug/CVE refs.

OBS-URL: https://build.opensuse.org/request/show/927841
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=317
This commit is contained in:
Bjørn Lie 2021-10-28 08:24:30 +00:00 committed by Git OBS Bridge
parent a8c1932cca
commit b0eb41d75e
3 changed files with 56 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
webkit2gtk3-link-fix.patch Normal file
View File

@ -0,0 +1,31 @@
From 94396c05ce816b9f7245ac493367c84219cef407 Mon Sep 17 00:00:00 2001
From: "ysuzuki@apple.com"
<ysuzuki@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu, 2 Sep 2021 08:13:12 +0000
Subject: [PATCH] Unreviewed, annotate executeJSCJITProbe with
REFERENCED_FROM_ASM WTF_INTERNAL
* assembler/ProbeContext.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@281911 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
Source/JavaScriptCore/ChangeLog | 6 ++++++
Source/JavaScriptCore/assembler/ProbeContext.h | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/Source/JavaScriptCore/assembler/ProbeContext.h b/Source/JavaScriptCore/assembler/ProbeContext.h
index 54db1ce832ef..36f430bcb509 100644
--- a/Source/JavaScriptCore/assembler/ProbeContext.h
+++ b/Source/JavaScriptCore/assembler/ProbeContext.h
@@ -249,7 +249,7 @@ private:
friend JS_EXPORT_PRIVATE void* probeStateForContext(Context&); // Not for general use. This should only be for writing tests.
};
-extern "C" void executeJSCJITProbe(State*);
+extern "C" void executeJSCJITProbe(State*) REFERENCED_FROM_ASM WTF_INTERNAL;
} // namespace Probe
} // namespace JSC
--
2.33.0

17
webkit2gtk3.changes
View File

@ -1,12 +1,22 @@
-------------------------------------------------------------------
Tue Oct 26 22:10:23 UTC 2021 - Michael Gorse <mgorse@suse.com>
- Add webkit2gtk3-link-fix.patch: taken from upstream, fixes the
build on SLE-15-SP4.
- Use gcc10 package on SLE <= 15-SP4. Gcc 7 is currently the
default there.
- Update gcc-c++ version requirement to match the cmake check.
-------------------------------------------------------------------
Thu Oct 21 20:07:32 UTC 2021 - Michael Gorse <mgorse@suse.com>
- Update to version 2.34.1:
- Update to version 2.34.1 (boo#1191937):
+ Update user agent browser versions.
+ Fix a crash with GTK >= 3.24.30.
+ Fix a crash when loading videos on reddit.
+ Fix file type detection when application calls
g_desktop_app_info_set_as_default_for_extension() passing html.
+ Security fixes: CVE-2021-42762.
-------------------------------------------------------------------
Wed Sep 29 10:16:33 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
@ -23,8 +33,9 @@ Wed Sep 29 06:47:28 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
-------------------------------------------------------------------
Wed Sep 22 16:18:00 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 2.34.0:
- Update to version 2.34.0 (boo#1192063):
+ Fix another regression in JavaScriptCore on 32bit systems.
+ Security fixes: CVE-2021-30846.
-------------------------------------------------------------------
Mon Sep 20 02:33:51 UTC 2021 - Michael Gorse <mgorse@suse.com>
@ -92,7 +103,7 @@ Sun Sep 19 19:00:09 UTC 2021 - Michael Gorse <mgorse@suse.com>
- Update to version 2.32.4 (boo#1190701):
+ Do not append .asc extension to downloaded text/plain files.
+ Fix several crashes and rendering issues.
+ Security fixes: CVE-2021-30858.
+ Security fixes: CVE-2021-30848, CVE-2021-30849, CVE-2021-30858.
- Drop fix-lto.patch: fixed upstream.
-------------------------------------------------------------------

12
webkit2gtk3.spec
View File

@ -88,6 +88,8 @@ Source99: webkit2gtk3.keyring
Patch0: no-forced-sse.patch
# PATCH-FIX-UPSTREAM fix-warnings.patch mgorse@suse.com -- silence return-type warnings.
Patch1: fix-warnings.patch
# PATCH-FIX-UPSTREAM webkit2gtk3-link-fix.patch mgorse@suse.com -- annotate executeJSCJITProbe.
Patch2: webkit2gtk3-link-fix.patch
BuildRequires: Mesa-libEGL-devel
BuildRequires: Mesa-libGL-devel
@ -98,7 +100,11 @@ BuildRequires: bison >= 2.3
BuildRequires: bubblewrap
BuildRequires: cmake
BuildRequires: enchant-devel
BuildRequires: gcc-c++ >= 4.9
%if 0%{?sle_version} && 0%{?sle_version} <= 150400
BuildRequires: gcc10-c++ >= 4.9
%else
BuildRequires: gcc-c++ >= 7.3
%endif
BuildRequires: gobject-introspection-devel
BuildRequires: gperf >= 3.0.1
BuildRequires: hyphen-devel
@ -344,6 +350,10 @@ export PYTHON=%{_bindir}/python3
%cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
%if 0%{?sle_version} && 0%{?sle_version} <= 150400
-DCMAKE_C_COMPILER=gcc-10 \
-DCMAKE_CXX_COMPILER=g++-10 \
%endif
-DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkit2gtk%{_wk2sover} \
-DPORT=GTK \
%if "%{flavor}" == "gtk4"