From 9308f134f23663268713a60847c8d375dfa4e767 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 01 2022 10:54:45 +0000
Subject: import webkit2gtk3-2.34.6-1.el9


---

diff --git a/.gitignore b/.gitignore
index 5e71e54..56eef8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-SOURCES/webkitgtk-2.34.2.tar.xz
+SOURCES/webkitgtk-2.34.6.tar.xz
+SOURCES/webkitgtk-keys.gpg
diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata
index e119a5a..5079354 100644
--- a/.webkit2gtk3.metadata
+++ b/.webkit2gtk3.metadata
@@ -1 +1,2 @@
-18b3bb61524d543c59d5018062f3139568332a1e SOURCES/webkitgtk-2.34.2.tar.xz
+bb82517289baf9c858fa406d1d845274f81e25cb SOURCES/webkitgtk-2.34.6.tar.xz
+cf57cbbadf2a07c6ede1c886f9742b7d352460c0 SOURCES/webkitgtk-keys.gpg
diff --git a/SOURCES/aarch64-page-size.patch b/SOURCES/aarch64-page-size.patch
index dfee197..15aaacb 100644
--- a/SOURCES/aarch64-page-size.patch
+++ b/SOURCES/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/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.gpg b/SOURCES/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.gpg
deleted file mode 100644
index b3ea120..0000000
Binary files a/SOURCES/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.gpg and /dev/null differ
diff --git a/SOURCES/webkitgtk-2.34.2.tar.xz.asc b/SOURCES/webkitgtk-2.34.2.tar.xz.asc
deleted file mode 100644
index 8b752dd..0000000
--- a/SOURCES/webkitgtk-2.34.2.tar.xz.asc
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYZ4NMgAKCRDz0yLQ7EWC
-w8dDAJ0XlodXEOu4mMkcTEkMi4zbGIvsmgCfdFSkmaAmrr+hSSh5/975VJzhj4M=
-=zndL
------END PGP SIGNATURE-----
diff --git a/SOURCES/webkitgtk-2.34.6.tar.xz.asc b/SOURCES/webkitgtk-2.34.6.tar.xz.asc
new file mode 100644
index 0000000..0d86d8f
--- /dev/null
+++ b/SOURCES/webkitgtk-2.34.6.tar.xz.asc
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYg5JzQAKCRCRxVnb5MkS
+O2fTAJ0bM+z81IRILK3jrBeY2FvVF9XMgACffrCY/lTW8tvkhMt+xNQvn5aPLO4=
+=duRI
+-----END PGP SIGNATURE-----
diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec
index 28d3002..8b657b7 100644
--- a/SPECS/webkit2gtk3.spec
+++ b/SPECS/webkit2gtk3.spec
@@ -16,7 +16,7 @@
 %bcond_without docs
 
 Name:           webkit2gtk3
-Version:        2.34.2
+Version:        2.34.6
 Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
@@ -24,8 +24,10 @@ License:        LGPLv2
 URL:            https://www.webkitgtk.org/
 Source0:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
-# Created from http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322D0EC4582C3
-Source2:        https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.gpg
+# Use the keys from https://webkitgtk.org/verifying.html
+# $ gpg --import aperez.key carlosgc.key
+# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
+Source2:        webkitgtk-keys.gpg
 
 # https://bugs.webkit.org/show_bug.cgi?id=217989
 # https://bugs.webkit.org/show_bug.cgi?id=227905
@@ -92,6 +94,7 @@ BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(upower-glib)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-egl)
+BuildRequires:  pkgconfig(wayland-protocols)
 BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(wpe-1.0)
 BuildRequires:  pkgconfig(wpebackend-fdo-1.0)
@@ -105,7 +108,7 @@ Requires:       xdg-dbus-proxy
 Recommends:     geoclue2
 
 # Needed for various GStreamer elements.
-Recommends:     gstreamer1-plugins-bad-freeworld
+Recommends:     gstreamer1-plugins-bad-free
 Recommends:     gstreamer1-plugins-good
 
 # If no xdg-desktop-portal backend is installed, many features will be broken
@@ -310,6 +313,20 @@ 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
+
+* Fri Jan 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.4-1
+- Update to 2.34.4
+  Related: #1985041
+
 * Wed Nov 24 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.2-1
 - Update to 2.34.2
   Related: #1985041