Accepting request 705187 from GNOME:Next

New stable rel

OBS-URL: https://build.opensuse.org/request/show/705187
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=217
This commit is contained in:
Dominique Leuenberger 2019-05-24 11:13:03 +00:00 committed by Git OBS Bridge
parent e6abab2a25
commit bef81b748c
7 changed files with 26 additions and 102 deletions

View File

@ -1,89 +0,0 @@
Index: /trunk/CMakeLists.txt
===================================================================
--- /trunk/CMakeLists.txt (revision 244137)
+++ /trunk/CMakeLists.txt (revision 244138)
@@ -115,14 +115,4 @@
endif ()
-#---------------------------
-# Make sure SSE2 is present.
-#---------------------------
-if (WTF_CPU_X86)
- include(FindSSE2)
- if (NOT SSE2_SUPPORT_FOUND)
- message(FATAL_ERROR "SSE2 support is required to compile WebKit")
- endif ()
-endif ()
-
# -----------------------------------------------------------------------------
# Determine the operating system
Index: /trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp
===================================================================
--- /trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp (revision 244137)
+++ /trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp (revision 244138)
@@ -168,4 +168,9 @@
static_assert(sizeof(Probe::State) == PROBE_SIZE, "Probe::State::size's matches ctiMasmProbeTrampoline");
static_assert((PROBE_EXECUTOR_OFFSET + PTR_SIZE) <= (PROBE_SIZE + OUT_SIZE), "Must have room after ProbeContext to stash the probe handler");
+
+#if CPU(X86)
+// SSE2 is a hard requirement on x86.
+static_assert(isSSE2Present(), "SSE2 support is required in JavaScriptCore");
+#endif
#undef PROBE_OFFSETOF
@@ -788,4 +793,5 @@
{
CPUID cpuid = getCPUID(0x1);
+ s_sse2CheckState = (cpuid[3] & (1 << 26)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
s_sse4_1CheckState = (cpuid[2] & (1 << 19)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
s_sse4_2CheckState = (cpuid[2] & (1 << 20)) ? CPUIDCheckState::Set : CPUIDCheckState::Clear;
@@ -804,4 +810,5 @@
}
+MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse2CheckState = CPUIDCheckState::NotChecked;
MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse4_1CheckState = CPUIDCheckState::NotChecked;
MacroAssemblerX86Common::CPUIDCheckState MacroAssemblerX86Common::s_sse4_2CheckState = CPUIDCheckState::NotChecked;
Index: /trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h
===================================================================
--- /trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (revision 244137)
+++ /trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (revision 244138)
@@ -4198,4 +4198,33 @@
#endif
+#if CPU(X86)
+#if OS(MAC_OS_X)
+
+ // All X86 Macs are guaranteed to support at least SSE2,
+ static bool isSSE2Present()
+ {
+ return true;
+ }
+
+#else // OS(MAC_OS_X)
+ static bool isSSE2Present()
+ {
+ if (s_sse2CheckState == CPUIDCheckState::NotChecked)
+ collectCPUFeatures();
+ return s_sse2CheckState == CPUIDCheckState::Set;
+ }
+
+#endif // OS(MAC_OS_X)
+#elif !defined(NDEBUG) // CPU(X86)
+
+ // On x86-64 we should never be checking for SSE2 in a non-debug build,
+ // but non debug add this method to keep the asserts above happy.
+ static bool isSSE2Present()
+ {
+ return true;
+ }
+
+#endif
+
using CPUID = std::array<unsigned, 4>;
static CPUID getCPUID(unsigned level);
@@ -4203,4 +4232,5 @@
JS_EXPORT_PRIVATE static void collectCPUFeatures();
+ JS_EXPORT_PRIVATE static CPUIDCheckState s_sse2CheckState;
JS_EXPORT_PRIVATE static CPUIDCheckState s_sse4_1CheckState;
JS_EXPORT_PRIVATE static CPUIDCheckState s_sse4_2CheckState;

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri May 24 08:00:33 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 2.24.2:
+ Fix rendering of emojis copy-pasted from GTK emoji chooser.
+ Fix space characters not being rendered with some CJK fonts.
+ Fix adaptive streaming playback with older GStreamer versions.
+ Set a maximum zoom level for pinch zooming gesture.
+ Fix navigation gesture to not interfere with scrolling.
+ Fix SSE2 detection at compile time, ensuring the right flags
are passed to the compiler.
+ Fix several crashes and rendering issues.
+ Security fixes: CVE-2019-8595, CVE-2019-8607, CVE-2019-8615.
+ Updated translations.
- Drop webkit2gtk3-fix-i586-build.patch: Fixed upstream.
-------------------------------------------------------------------
Wed Apr 24 17:45:53 UTC 2019 - Martin Liška <mliska@suse.cz>

View File

@ -42,7 +42,7 @@
%bcond_with python3
%endif
Name: webkit2gtk3
Version: 2.24.1
Version: 2.24.2
Release: 0
Summary: Library for rendering web content, GTK+ Port
License: LGPL-2.0-or-later AND BSD-3-Clause
@ -52,8 +52,6 @@ Source0: https://webkitgtk.org/releases/%{_name}-%{version}.tar.xz
Source1: https://webkitgtk.org/releases/%{_name}-%{version}.tar.xz.asc
Source98: baselibs.conf
Source99: webkit2gtk3.keyring
# PATCH-FIX-UPSTREAM webkit2gtk3-fix-i586-build.patch dimstar@opensuse.org -- Fix build on i586, taken from upstream https://trac.webkit.org/changeset/244138/webkit
Patch0: webkit2gtk3-fix-i586-build.patch
# PATCH-FIX-UPSTREAM webkit2gtk3-boo1088932-a11y-state-set.patch boo#1088932 webkit#184366 mgorse@suse.com -- fix crash when atk_object_ref_state_set is called on an AtkObject that's being destroyed
Patch1: webkit2gtk3-boo1088932-a11y-state-set.patch
BuildRequires: Mesa-libEGL-devel
@ -291,7 +289,6 @@ A small test browswer from webkit, useful for testing features.
%prep
%setup -q -n webkitgtk-%{version}
%patch0 -p2
%patch1 -p1
%build

View File

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

View File

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCXKxbDQAKCRDz0yLQ7EWC
w6WXAKDUFV+QwdCM6qtEuK8VMXMwZW1f9gCeMXyhkxnKEqoAZjyhfXZTJi+YE/s=
=Qcvg
-----END PGP SIGNATURE-----

3
webkitgtk-2.24.2.tar.xz Normal file
View File

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

View File

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCXN6hFgAKCRDz0yLQ7EWC
wypxAJ4iNMIbelVK8YF0fdZshwAiYxzdOwCg26tdQQZr4SnhX+uEVJlO7P64n6Y=
=blLK
-----END PGP SIGNATURE-----