From 251122dc838e1b6fa2eb934f3c164e86837704e1 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Thu, 17 Feb 2022 10:38:05 -0600
Subject: [PATCH] Update to 2.34.6

  Related: #1985041
Resolves: #2037016
Resolves: #2037269
---
 .gitignore              |  2 ++
 aarch64-page-size.patch | 11 +++++++----
 sources                 |  4 ++--
 webkit2gtk3.spec        |  8 +++++++-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 07641ef..e0b3e37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,5 @@
 /webkitgtk-2.34.4.tar.xz.asc
 /webkitgtk-2.34.5.tar.xz
 /webkitgtk-2.34.5.tar.xz.asc
+/webkitgtk-2.34.6.tar.xz
+/webkitgtk-2.34.6.tar.xz.asc
diff --git a/aarch64-page-size.patch b/aarch64-page-size.patch
index dfee197..15aaacb 100644
--- a/aarch64-page-size.patch
+++ b/aarch64-page-size.patch
@@ -1,13 +1,16 @@
 diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h
-index 8ff8443d0e25..2fa880a97d1d 100644
+index 9bb7fffcc1ae..3e1e24aa69f5 100644
 --- a/Source/WTF/wtf/PageBlock.h
 +++ b/Source/WTF/wtf/PageBlock.h
-@@ -46,9 +46,9 @@ namespace WTF {
+@@ -45,11 +45,11 @@ namespace WTF {
+ // On Linux, Power systems normally use 64 KiB pages.
+ //
  // Use 64 KiB for any unknown CPUs to be conservative.
- #if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64)
+-#if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64) || (OS(LINUX) && CPU(ARM64))
++#if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64)
  constexpr size_t CeilingOnPageSize = 16 * KB;
 -#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN)
-+#elif CPU(ARM64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN)
++#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) || CPU(ARM64)
  constexpr size_t CeilingOnPageSize = 64 * KB;
 -#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(RISCV64)
 +#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(RISCV64)
diff --git a/sources b/sources
index 59b882d..6ef6c90 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.34.5.tar.xz) = a708e23bb6bcc6b281f1de35f4c56a5360b8212a3749d931f8a3c39402761f30d7524d0bddf4e6cfb1b2fc753df28853dceb476c432bac3c453e4b2123e7e9d5
-SHA512 (webkitgtk-2.34.5.tar.xz.asc) = ce66a6f4c7872fe7861aa04e9be6d45a76a4d8caf37bad46cda91e270ceaaaf7d6f36a5ac04d87ca1f0566736c4a8cb244204ff2eaab6903394bceab223ef835
+SHA512 (webkitgtk-2.34.6.tar.xz) = 57ab25af027ae39820622743c258f3e6d0af86376f2a4c3a8ede560ca6652c98c49056c716aace56291264c18164cb60395be9779a9d12455e6a0f7d2c197343
+SHA512 (webkitgtk-2.34.6.tar.xz.asc) = 10bf9b007a69dd35c194852d98e1a54af0fb54c1618d5737deaf665e51840fe107a64b1466e28acffe278c0fcc01566c1908d4babaeeee1462a6c40f22170b17
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 1dce039..8b657b7 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -16,7 +16,7 @@
 %bcond_without docs
 
 Name:           webkit2gtk3
-Version:        2.34.5
+Version:        2.34.6
 Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
@@ -313,6 +313,12 @@ export NINJA_STATUS="[%f/%t][%e] "
 %endif
 
 %changelog
+* Thu Feb 17 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.6-1
+- Update to 2.34.6
+  Related: #1985041
+- Resolves: #2037016
+- Resolves: #2037269
+
 * Wed Feb 09 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.5-1
 - Update to 2.34.5
   Related: #1985041