Update to 2.34.6

Related: #1985041
Resolves: #2037016
Resolves: #2037269
This commit is contained in:
Michael Catanzaro 2022-02-17 10:38:05 -06:00
parent d402c4eaad
commit 251122dc83
4 changed files with 18 additions and 7 deletions

2
.gitignore vendored
View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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