From 585bc3bfe8178800634172431720d83d3e4e8fe5 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Thu, 21 Apr 2022 15:07:10 -0500
Subject: [PATCH] Update to 2.36.1

  Related: #2061996
Resolves: #2075493
Resolves: #2075495
Resolves: #2075497
---
 .gitignore       |  2 ++
 sources          |  4 ++--
 webkit2gtk3.spec | 20 ++++++++++++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index e0b3e37..e2ce001 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,3 +89,5 @@
 /webkitgtk-2.34.5.tar.xz.asc
 /webkitgtk-2.34.6.tar.xz
 /webkitgtk-2.34.6.tar.xz.asc
+/webkitgtk-2.36.1.tar.xz
+/webkitgtk-2.36.1.tar.xz.asc
diff --git a/sources b/sources
index 6ef6c90..1b3c706 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.34.6.tar.xz) = 57ab25af027ae39820622743c258f3e6d0af86376f2a4c3a8ede560ca6652c98c49056c716aace56291264c18164cb60395be9779a9d12455e6a0f7d2c197343
-SHA512 (webkitgtk-2.34.6.tar.xz.asc) = 10bf9b007a69dd35c194852d98e1a54af0fb54c1618d5737deaf665e51840fe107a64b1466e28acffe278c0fcc01566c1908d4babaeeee1462a6c40f22170b17
+SHA512 (webkitgtk-2.36.1.tar.xz) = c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4
+SHA512 (webkitgtk-2.36.1.tar.xz.asc) = b3c005aef5b5da0d381abb5af13aeb58bf66049021ea6740786b67f0bcabe4e1a516ac69235eafadbb75c5386ed0e7ab5d8a4f582233a28ec47b10da3ac934e0
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 8b657b7..b423598 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -16,7 +16,7 @@
 %bcond_without docs
 
 Name:           webkit2gtk3
-Version:        2.34.6
+Version:        2.36.1
 Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
@@ -29,9 +29,11 @@ Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
 # $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
 Source2:        webkitgtk-keys.gpg
 
+%if 0%{?rhel}
 # https://bugs.webkit.org/show_bug.cgi?id=217989
 # https://bugs.webkit.org/show_bug.cgi?id=227905
 Patch0:         aarch64-page-size.patch
+%endif
 
 BuildRequires:  bison
 BuildRequires:  bubblewrap
@@ -212,6 +214,14 @@ rm -rf Source/ThirdParty/qunit/
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
 
+# Warning: although RHEL 9 aarch64 now uses 4 KB page sizes, we still have to
+# support 64 KB page sizes until the *builders* use RHEL 9. This means we still
+# have to disable JIT and bmalloc, even though this disables important heap
+# security features. We can't simply disable them only during this build,
+# because gobject-introspection will crash when building anything that depends
+# on WebKitGTK, because it calls each object's get_type() function, which will
+# initialize bmalloc and JIT.
+
 %cmake \
   -GNinja \
   -DPORT=GTK \
@@ -248,7 +258,6 @@ export NINJA_STATUS="[%f/%t][%e] "
 %add_to_license_files Source/JavaScriptCore/COPYING.LIB
 %add_to_license_files Source/ThirdParty/ANGLE/LICENSE
 %add_to_license_files Source/ThirdParty/ANGLE/src/common/third_party/smhasher/LICENSE
-%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/compiler/LICENSE
 %add_to_license_files Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/LICENSE
 %add_to_license_files Source/WebCore/LICENSE-APPLE
 %add_to_license_files Source/WebCore/LICENSE-LGPL-2
@@ -313,6 +322,13 @@ export NINJA_STATUS="[%f/%t][%e] "
 %endif
 
 %changelog
+* Thu Apr 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.1-1
+- Update to 2.36.1
+  Related: #2061996
+- Resolves: #2075493
+- Resolves: #2075495
+- Resolves: #2075497
+
 * Thu Feb 17 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.6-1
 - Update to 2.34.6
   Related: #1985041