import webkit2gtk3-2.36.7-1.el9_0

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/webkitgtk-2.34.6.tar.xz
+SOURCES/webkitgtk-2.36.7.tar.xz
 SOURCES/webkitgtk-keys.gpg

.webkit2gtk3.metadata

@@ -1,2 +1,2 @@
-bb82517289baf9c858fa406d1d845274f81e25cb SOURCES/webkitgtk-2.34.6.tar.xz
+36078148b6e0ef002f0279b25b1caf173f851ac8 SOURCES/webkitgtk-2.36.7.tar.xz
 cf57cbbadf2a07c6ede1c886f9742b7d352460c0 SOURCES/webkitgtk-keys.gpg

SOURCES/webkitgtk-2.34.6.tar.xz.asc

@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYg5JzQAKCRCRxVnb5MkS
-O2fTAJ0bM+z81IRILK3jrBeY2FvVF9XMgACffrCY/lTW8tvkhMt+xNQvn5aPLO4=
-=duRI
------END PGP SIGNATURE-----

SOURCES/webkitgtk-2.36.7.tar.xz.asc

@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYwaNMwAKCRCRxVnb5MkS
+OwFGAJ9cz5+l3fKydXxOgJWDLBvlavsI1ACfbkmK0bmhBExS7febO1y16Ftd91Q=
+=Zhg7
+-----END PGP SIGNATURE-----

SPECS/webkit2gtk3.spec

@@ -16,7 +16,7 @@
 %bcond_without docs
 
 Name:           webkit2gtk3
-Version:        2.34.6
+Version:        2.36.7
 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
@@ -47,10 +49,8 @@ BuildRequires:  hyphen-devel
 BuildRequires:  libatomic
 BuildRequires:  ninja-build
 BuildRequires:  perl(English)
-BuildRequires:  perl(File::Copy::Recursive)
 BuildRequires:  perl(FindBin)
 BuildRequires:  perl(JSON::PP)
-BuildRequires:  perl(Switch)
 BuildRequires:  python3
 BuildRequires:  ruby
 BuildRequires:  rubygems
@@ -212,6 +212,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 +256,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 +320,10 @@ export NINJA_STATUS="[%f/%t][%e] "
 %endif
 
 %changelog
+* Wed Aug 24 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.7-1
+- Update to 2.36.7
+  Related: #2123430
+
 * Thu Feb 17 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.6-1
 - Update to 2.34.6
   Related: #1985041