import webkit2gtk3-2.32.3-2.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
8fc986ec8d
commit
4959673f79
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/webkitgtk-2.30.4.tar.xz
|
||||
SOURCES/webkitgtk-2.32.3.tar.xz
|
||||
|
||||
@ -1 +1 @@
|
||||
330f45d7badf944fb01a3238ebb2ceaad8c2a91f SOURCES/webkitgtk-2.30.4.tar.xz
|
||||
9c9b2cb2638ea40706765768dd5cb3c95ab46dcb SOURCES/webkitgtk-2.32.3.tar.xz
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
diff --git a/Source/JavaScriptCore/assembler/LinkBuffer.cpp b/Source/JavaScriptCore/assembler/LinkBuffer.cpp
|
||||
index b6577a9e8c4e..7745793670b1 100644
|
||||
--- a/Source/JavaScriptCore/assembler/LinkBuffer.cpp
|
||||
+++ b/Source/JavaScriptCore/assembler/LinkBuffer.cpp
|
||||
@@ -374,6 +374,7 @@ void LinkBuffer::copyCompactAndLinkCode(MacroAssembler& macroAssembler, JITCompi
|
||||
m_executableMemory->shrink(m_size);
|
||||
}
|
||||
|
||||
+#if ENABLE(JIT)
|
||||
if (useFastJITPermissions()) {
|
||||
ASSERT(codeOutData == outData);
|
||||
if (UNLIKELY(Options::dumpJITMemoryPath()))
|
||||
@@ -382,6 +383,10 @@ void LinkBuffer::copyCompactAndLinkCode(MacroAssembler& macroAssembler, JITCompi
|
||||
ASSERT(codeOutData != outData);
|
||||
performJITMemcpy(codeOutData, outData, m_size);
|
||||
}
|
||||
+#else
|
||||
+ ASSERT(codeOutData != outData);
|
||||
+ performJITMemcpy(codeOutData, outData, m_size);
|
||||
+#endif
|
||||
|
||||
jumpsToLink.clear();
|
||||
|
||||
diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h
|
||||
index 700f90adc6c3..f703d4239bc0 100644
|
||||
--- a/Source/WTF/wtf/PlatformEnable.h
|
||||
+++ b/Source/WTF/wtf/PlatformEnable.h
|
||||
@@ -871,6 +871,6 @@
|
||||
#error "ENABLE(WEBGL2) requires ENABLE(WEBGL)"
|
||||
#endif
|
||||
|
||||
-#if CPU(ARM64) && CPU(ADDRESS64)
|
||||
+#if CPU(ARM64) && CPU(ADDRESS64) && ENABLE(JIT)
|
||||
#define USE_JUMP_ISLANDS 1
|
||||
#endif
|
||||
@ -1,9 +1,16 @@
|
||||
Index: trunk/Source/cmake/WebKitFeatures.cmake
|
||||
===================================================================
|
||||
--- trunk/Source/cmake/WebKitFeatures.cmake (revision 277012)
|
||||
+++ trunk/Source/cmake/WebKitFeatures.cmake (revision 277015)
|
||||
@@ -452,2 +452,4 @@
|
||||
option(ENABLE_EXPERIMENTAL_FEATURES "Enable experimental features" OFF)
|
||||
SET_AND_EXPOSE_TO_BUILD(ENABLE_EXPERIMENTAL_FEATURES ${ENABLE_EXPERIMENTAL_FEATURES})
|
||||
+
|
||||
+SET_AND_EXPOSE_TO_BUILD(USE_64KB_PAGE_BLOCK ${USE_64KB_PAGE_BLOCK})
|
||||
diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h
|
||||
index c655a50c2c89..c4a6b8d09f16 100644
|
||||
--- a/Source/WTF/wtf/PageBlock.h
|
||||
+++ b/Source/WTF/wtf/PageBlock.h
|
||||
@@ -49,9 +49,9 @@ namespace WTF {
|
||||
// Use 64 KiB for any unknown CPUs to be conservative.
|
||||
#if OS(DARWIN) || PLATFORM(PLAYSTATION)
|
||||
constexpr size_t CeilingOnPageSize = 16 * KB;
|
||||
-#elif USE(64KB_PAGE_BLOCK) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN)
|
||||
+#elif USE(64KB_PAGE_BLOCK) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) || CPU(ARM64)
|
||||
constexpr size_t CeilingOnPageSize = 64 * KB;
|
||||
-#elif OS(WINDOWS) || CPU(MIPS) || CPU(MIPS64) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64)
|
||||
+#elif OS(WINDOWS) || CPU(MIPS) || CPU(MIPS64) || CPU(X86) || CPU(X86_64) || CPU(ARM)
|
||||
constexpr size_t CeilingOnPageSize = 4 * KB;
|
||||
#else
|
||||
#error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture!
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
|
||||
index af43f9acfd24..3ac762417a98 100644
|
||||
index 6dd9f20e4ff2..995f355f6ee3 100644
|
||||
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
|
||||
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
|
||||
@@ -397,7 +397,7 @@ static void webkitWebContextConstructed(GObject* object)
|
||||
configuration.setProcessSwapsOnNavigation(priv->psonEnabled);
|
||||
if (!priv->psonEnabled) {
|
||||
const char* useSingleWebProcess = getenv("WEBKIT_USE_SINGLE_WEB_PROCESS");
|
||||
- if (useSingleWebProcess && strcmp(useSingleWebProcess, "0"))
|
||||
+ if ((useSingleWebProcess && strcmp(useSingleWebProcess, "0")) || !g_strcmp0(g_get_prgname(), "evolution"))
|
||||
configuration.setUsesSingleWebProcess(true);
|
||||
}
|
||||
|
||||
@@ -400,6 +400,9 @@ static void webkitWebContextConstructed(GObject* object)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+ if (!g_strcmp0(g_get_prgname(), "evolution"))
|
||||
+ configuration.setUsesSingleWebProcess(true);
|
||||
+
|
||||
if (!priv->websiteDataManager)
|
||||
priv->websiteDataManager = adoptGRef(webkit_website_data_manager_new("local-storage-directory", priv->localStorageDirectory.data(), nullptr));
|
||||
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
%bcond_without docs
|
||||
|
||||
Name: webkit2gtk3
|
||||
Version: 2.30.4
|
||||
Release: 3%{?dist}
|
||||
Version: 2.32.3
|
||||
Release: 2%{?dist}
|
||||
Summary: GTK Web content engine library
|
||||
|
||||
License: LGPLv2
|
||||
@ -22,14 +22,12 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=193749
|
||||
Patch0: evolution-shared-secondary-process.patch
|
||||
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=219288
|
||||
Patch1: aarch64-build.patch
|
||||
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=225393
|
||||
Patch2: aarch64-page-size.patch
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=217989
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=227905
|
||||
Patch1: aarch64-page-size.patch
|
||||
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=229375
|
||||
Patch3: CVE-2021-30858.patch
|
||||
Patch2: CVE-2021-30858.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: bubblewrap
|
||||
@ -94,18 +92,9 @@ BuildRequires: pkgconfig(wayland-egl)
|
||||
BuildRequires: pkgconfig(wayland-server)
|
||||
BuildRequires: pkgconfig(xt)
|
||||
|
||||
# These are hard requirements of WebKit's bubblewrap sandbox.
|
||||
#Requires: bubblewrap
|
||||
#Requires: xdg-dbus-proxy
|
||||
|
||||
# If Geoclue is not running, the geolocation API will not work.
|
||||
Recommends: geoclue2
|
||||
|
||||
# If no xdg-desktop-portal backend is installed, many features will be broken
|
||||
# inside the sandbox. In particular, the -gtk backend has to be installed for
|
||||
# desktop settings access, including font settings.
|
||||
#Recommends: xdg-desktop-portal-gtk
|
||||
|
||||
# Obsolete libwebkit2gtk from the webkitgtk3 package
|
||||
Obsoletes: libwebkit2gtk < 2.5.0
|
||||
Provides: libwebkit2gtk = %{version}-%{release}
|
||||
@ -206,9 +195,6 @@ rm -rf Source/ThirdParty/qunit/
|
||||
# bmalloc and JIT are disabled on aarch64 only in RHEL because of the nonstandard
|
||||
# page size that's causing problems there. WebKit's build system sets appropriate
|
||||
# defaults for all other architectures, and all other distros except RHEL.
|
||||
#
|
||||
# TODO: Package xdg-dbus-proxy for RHEL so we can enable bubblewrap sandbox.
|
||||
# TODO: Package libwpe and wpebackend-fdo for RHEL so we can enable WPE renderer.
|
||||
mkdir -p %{_target_platform}
|
||||
pushd %{_target_platform}
|
||||
%cmake \
|
||||
@ -221,9 +207,11 @@ pushd %{_target_platform}
|
||||
%endif
|
||||
-DENABLE_MINIBROWSER=ON \
|
||||
-DUSE_WPE_RENDERER=OFF \
|
||||
-DENABLE_GAMEPAD=OFF \
|
||||
%if 0%{?rhel}
|
||||
%ifarch aarch64
|
||||
-DUSE_64KB_PAGE_BLOCK=ON \
|
||||
-DENABLE_JIT=OFF \
|
||||
-DUSE_SYSTEM_MALLOC=ON \
|
||||
%endif
|
||||
%endif
|
||||
..
|
||||
@ -304,13 +292,25 @@ export NINJA_STATUS="[%f/%t][%e] "
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Oct 05 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.4-3
|
||||
- Fix crashing on aarch64
|
||||
- Resolves: #2010825
|
||||
|
||||
* Tue Sep 28 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.4-2
|
||||
* Tue Sep 28 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.3-2
|
||||
- Fix CVE-2021-30858
|
||||
- Resolves: #2006427
|
||||
- Resolves: #2006428
|
||||
|
||||
* Fri Jul 23 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.3-1
|
||||
- Update to 2.32.3
|
||||
- Related: #1937416
|
||||
|
||||
* Tue Jul 13 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.2-1
|
||||
- Update to 2.32.2
|
||||
- Related: #1937416
|
||||
|
||||
* Mon May 10 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.1-1
|
||||
- Update to 2.32.1
|
||||
- Related: #1937416
|
||||
|
||||
* Fri Apr 30 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.0-1
|
||||
- Update to 2.32.0
|
||||
- Related: #1937416
|
||||
|
||||
* Tue Dec 15 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.4-1
|
||||
- Update to 2.30.4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user