Accepting request 986920 from GNOME:Next

- Update to version 2.36.4 (boo#1201221)

OBS-URL: https://build.opensuse.org/request/show/986920
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=357

webkit2gtk3-fix-build.patch

@@ -0,0 +1,54 @@
+From f20bac21ea37991c1a1110e78846897a406932f0 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Tue, 5 Jul 2022 08:23:12 -0500
+Subject: [PATCH] Revert "Merge r295034 - WebKitTestRunner shouldn't link
+ object files of JavaScriptCore and WebCore"
+
+This reverts commit 7916fda00b347ff263fbfe72c065032d1d9b523c.
+---
+ Source/JavaScriptCore/CMakeLists.txt     | 12 +++++++++---
+ Tools/WebKitTestRunner/CMakeLists.txt    |  1 -
+ Tools/WebKitTestRunner/PlatformGTK.cmake |  4 ++++
+ Tools/WebKitTestRunner/PlatformWin.cmake |  4 ++++
+ 4 files changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
+index 95a1300ce1b3..238208eb1137 100644
+--- a/Source/JavaScriptCore/CMakeLists.txt
++++ b/Source/JavaScriptCore/CMakeLists.txt
+@@ -456,7 +456,7 @@ if (MSVC AND NOT ENABLE_C_LOOP)
+         COMMAND ${MASM_EXECUTABLE} ${LLINT_MASM_FLAGS} ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.asm
+         VERBATIM)
+     list(APPEND JavaScriptCore_SOURCES ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj)
+-    add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp)
++    add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp)
+ else ()
+     # As there's poor toolchain support for using `.file` directives in
+     # inline asm (i.e. there's no way to avoid clashes with the `.file`
+@@ -465,7 +465,7 @@ else ()
+     # an object file. We only need to do this for LowLevelInterpreter.cpp
+     # and cmake doesn't allow us to introduce a compiler wrapper for a
+     # single source file, so we need to create a separate target for it.
+-    add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp
++    add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp
+         ${JavaScriptCore_DERIVED_SOURCES_DIR}/${LLIntOutput})
+ endif ()
+ 
+@@ -1496,7 +1496,13 @@ if (CMAKE_COMPILER_IS_GNUCXX AND GCC_OFFLINEASM_SOURCE_MAP)
+         COMPILE_OPTIONS "-fno-lto")
+ endif ()
+ 
+-list(APPEND JavaScriptCore_PRIVATE_LIBRARIES LowLevelInterpreterLib)
++# When building JavaScriptCore as an object library, we need to make sure the
++# lowlevelinterpreter lib objects get propogated.
++if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "OBJECT")
++    list(APPEND JavaScriptCore_PRIVATE_LIBRARIES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
++else ()
++    list(APPEND JavaScriptCore_SOURCES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
++endif ()
+ 
+ WEBKIT_COMPUTE_SOURCES(JavaScriptCore)
+ list(APPEND JavaScriptCore_SOURCES
+-- 
+2.36.1
+

webkit2gtk3.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Jul  5 15:16:48 UTC 2022 - Michael Gorse <mgorse@suse.com>
+
+- Update to version 2.36.4 (boo#1201221):
+  + Fix the new ATSPI accessibility implementation to add the missing
+    Collection interface for the loaded document.
+  + Fix the MediaSession implementation to make the MPRIS object
+    names more sandbox friendly, which plays better with Flatpak
+    and WebKit's own Bubblwrap-based sandboxing.
+  + Fix leaked Web Processes in some particular situations.
+  + Fix the build with media capture support enabled.
+  + Fix cross-compilation when targeting 64-bit ARM.
+  + Fix several crashes and rendering issues.
+  + Security fixes: CVE-2022-22677, CVE-2022-26710.
+- Add webkit2gtk3-fix-build.patch: fix the build.
+
 -------------------------------------------------------------------
 Sun May 29 19:07:38 UTC 2022 - Michael Gorse <mgorse@suse.com>
 
@@ -75,7 +91,8 @@ Mon Mar 21 19:45:49 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
     schemes.
   + Make user interactive threads (event handler, scrolling, …)
     real time in linux.
-  + Security fixes: CVE-2022-22624, CVE-2022-22628, CVE-2022-22629.
+  + Security fixes: CVE-2022-22624, CVE-2022-22628, CVE-2022-22629,
+    CVE-2022-22662.
 
 -------------------------------------------------------------------
 Mon Feb 28 01:29:27 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

webkit2gtk3.spec

@@ -70,7 +70,7 @@ ExclusiveArch:  do-not-build
 %endif
 
 Name:           webkit2%{_gtknamesuffix}
-Version:        2.36.3
+Version:        2.36.4
 Release:        0
 Summary:        Library for rendering web content, GTK+ Port
 License:        BSD-3-Clause AND LGPL-2.0-or-later
@@ -83,6 +83,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-fix-build.patch mgorse@suse.com -- fix the build.
+Patch1:         webkit2gtk3-fix-build.patch
 
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGL-devel

webkitgtk-2.36.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:732fcf8c4ec644b8ed28b46ebbd7c1ebab9d9e0afea9bdf5e5d12786afc478d1
-size 26600236

webkitgtk-2.36.3.tar.xz.asc

@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYpHpvAAKCRCRxVnb5MkS
-O27PAJ9ptAQKzmWX16VWJ1yyn/CaHwKJ8QCfV5gesH/nXmV7IsZn5vv+jDixo58=
-=AWMS
------END PGP SIGNATURE-----

webkitgtk-2.36.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6bebe1f85a479d968c19e44a4704622ef8cef61636ad1b2406b77d16ae2e2a8
+size 26598964

webkitgtk-2.36.4.tar.xz.asc

@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYsNzwAAKCRCRxVnb5MkS
+O7rWAJ0TPBHtohF/X/TxiUbE3PiQiVz7LQCfV3dmU+HJ7EU/qDmjOz6+lVusUgw=
+=MnD+
+-----END PGP SIGNATURE-----