From de1334fda78212ae3048301329878514c4a80d0c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 01 2020 10:10:15 +0000
Subject: import webkit2gtk3-2.30.3-1.el8


---

diff --git a/.gitignore b/.gitignore
index 7f84e4b..b25c549 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/webkitgtk-2.30.2.tar.xz
+SOURCES/webkitgtk-2.30.3.tar.xz
diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata
index 3a23357..6f46eef 100644
--- a/.webkit2gtk3.metadata
+++ b/.webkit2gtk3.metadata
@@ -1 +1 @@
-e27d336570226645f861b5a00116c17da39f9df4 SOURCES/webkitgtk-2.30.2.tar.xz
+6eed6e8a3c2f47533821169679fe381ceb0550be SOURCES/webkitgtk-2.30.3.tar.xz
diff --git a/SOURCES/aarch64-build.patch b/SOURCES/aarch64-build.patch
new file mode 100644
index 0000000..2504f76
--- /dev/null
+++ b/SOURCES/aarch64-build.patch
@@ -0,0 +1,35 @@
+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
diff --git a/SOURCES/webkit-aarch64_page_size.patch b/SOURCES/webkit-aarch64_page_size.patch
deleted file mode 100644
index 4df6fdb..0000000
--- a/SOURCES/webkit-aarch64_page_size.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h
-index cf5cf31b2c93..412ab0836209 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 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;
--#elif CPU(UNKNOWN) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE)
-+#elif CPU(UNKNOWN) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(ARM64)
- constexpr size_t CeilingOnPageSize = 64 * KB;
- #else
- #error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture!
diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec
index 0fe40df..73c7f20 100644
--- a/SPECS/webkit2gtk3.spec
+++ b/SPECS/webkit2gtk3.spec
@@ -11,18 +11,19 @@
 %bcond_without docs
 
 Name:           webkit2gtk3
-Version:        2.30.2
-Release:        2%{?dist}
+Version:        2.30.3
+Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
 License:        LGPLv2
 URL:            http://www.webkitgtk.org/
 Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 
-# https://bugs.webkit.org/show_bug.cgi?id=209360
-Patch0:         webkit-aarch64_page_size.patch
 # https://bugs.webkit.org/show_bug.cgi?id=193749
-Patch1:         evolution-shared-secondary-process.patch
+Patch0:         evolution-shared-secondary-process.patch
+
+# https://bugs.webkit.org/show_bug.cgi?id=219288
+Patch1:         aarch64-build.patch
 
 BuildRequires:  bison
 BuildRequires:  bubblewrap
@@ -214,13 +215,9 @@ pushd %{_target_platform}
 %endif
   -DENABLE_MINIBROWSER=ON \
   -DUSE_WPE_RENDERER=OFF \
-  -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
 %if 0%{?rhel}
 %ifarch aarch64
-  -DENABLE_C_LOOP=ON \
-  -DENABLE_JIT=OFF \
-  -DENABLE_SAMPLING_PROFILER=OFF \
-  -DUSE_SYSTEM_MALLOC=ON \
+  -DUSE_64KB_PAGE_BLOCK=ON \
 %endif
 %endif
   ..
@@ -303,6 +300,10 @@ export NINJA_STATUS="[%f/%t][%e] "
 %endif
 
 %changelog
+* Wed Nov 25 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.3-1
+- Update to 2.30.3
+- Related: #1883304
+
 * Thu Oct 29 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.2-2
 - Try to fix coverity build by disabling docs (thanks to Kamil Dudka <kdudka@redhat.com>!)
 - Related: #1883304