import webkit2gtk3-2.32.1-1.el8

.gitignore

@@ -1 +1 @@
-SOURCES/webkitgtk-2.30.4.tar.xz
+SOURCES/webkitgtk-2.32.1.tar.xz

.webkit2gtk3.metadata

@@ -1 +1 @@
-330f45d7badf944fb01a3238ebb2ceaad8c2a91f SOURCES/webkitgtk-2.30.4.tar.xz
+c8c507d3c98c891ea5bfcfb6407320959dc77a2b SOURCES/webkitgtk-2.32.1.tar.xz

SOURCES/aarch64-build.patch

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

SOURCES/evolution-shared-secondary-process.patch

@@ -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));
+ 

SPECS/webkit2gtk3.spec

@@ -11,7 +11,7 @@
 %bcond_without docs
 
 Name:           webkit2gtk3
-Version:        2.30.4
+Version:        2.32.1
 Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
@@ -22,9 +22,6 @@ 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
-
 BuildRequires:  bison
 BuildRequires:  bubblewrap
 BuildRequires:  cmake
@@ -215,6 +212,7 @@ pushd %{_target_platform}
 %endif
   -DENABLE_MINIBROWSER=ON \
   -DUSE_WPE_RENDERER=OFF \
+  -DENABLE_GAMEPAD=OFF \
 %if 0%{?rhel}
 %ifarch aarch64
   -DUSE_64KB_PAGE_BLOCK=ON \
@@ -298,6 +296,14 @@ export NINJA_STATUS="[%f/%t][%e] "
 %endif
 
 %changelog
+* 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
 - Related: #1883304