From 2ec4d1443010825e60ff17a167f3ea4304bef503 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 20 2022 18:19:50 +0000 Subject: import webkit2gtk3-2.34.6-1.el8 --- diff --git a/.gitignore b/.gitignore index adf71be..56eef8f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/webkitgtk-2.34.5.tar.xz +SOURCES/webkitgtk-2.34.6.tar.xz SOURCES/webkitgtk-keys.gpg diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata index 78343fb..5079354 100644 --- a/.webkit2gtk3.metadata +++ b/.webkit2gtk3.metadata @@ -1,2 +1,2 @@ -f150cdd932db81f719606428aad7978e6c9d813f SOURCES/webkitgtk-2.34.5.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 d1e4f0e..15aaacb 100644 --- a/SOURCES/aarch64-page-size.patch +++ b/SOURCES/aarch64-page-size.patch @@ -1,10 +1,13 @@ diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h -index 8ff8443d0e25..f37666d35bf2 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(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) || CPU(ARM64) diff --git a/SOURCES/webkitgtk-2.34.5.tar.xz.asc b/SOURCES/webkitgtk-2.34.5.tar.xz.asc deleted file mode 100644 index b0e4d75..0000000 --- a/SOURCES/webkitgtk-2.34.5.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYgL/CQAKCRCRxVnb5MkS -O9PRAJ4nQnid1jHjf5Oc3KRVIHBUYU4cRwCfY9brlRzYhDojNFK3C73j46VDVyY= -=oyBB ------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 f3d4525..d113401 100644 --- a/SPECS/webkit2gtk3.spec +++ b/SPECS/webkit2gtk3.spec @@ -11,7 +11,7 @@ %bcond_without docs Name: webkit2gtk3 -Version: 2.34.5 +Version: 2.34.6 Release: 1%{?dist} Summary: GTK Web content engine library @@ -299,6 +299,10 @@ export NINJA_STATUS="[%f/%t][%e] " %endif %changelog +* Thu Feb 17 2022 Michael Catanzaro - 2.34.6-1 +- Update to 2.34.6 + Related: #1985042 + * Wed Feb 09 2022 Michael Catanzaro - 2.34.5-1 - Update to 2.34.5 - Related: #1985042