import webkit2gtk3-2.34.6-1.el9

This commit is contained in:
CentOS Sources 2022-03-01 05:54:45 -05:00 committed by Stepan Oksanichenko
parent cb13493f0c
commit 792ff9fd83
7 changed files with 38 additions and 16 deletions

3
.gitignore vendored
View File

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

View File

@ -1 +1,2 @@
18b3bb61524d543c59d5018062f3139568332a1e SOURCES/webkitgtk-2.34.2.tar.xz bb82517289baf9c858fa406d1d845274f81e25cb SOURCES/webkitgtk-2.34.6.tar.xz
cf57cbbadf2a07c6ede1c886f9742b7d352460c0 SOURCES/webkitgtk-keys.gpg

View File

@ -1,13 +1,16 @@
diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h 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 --- a/Source/WTF/wtf/PageBlock.h
+++ b/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. // 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; constexpr size_t CeilingOnPageSize = 16 * KB;
-#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) -#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; 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(ARM64) || CPU(RISCV64)
+#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(RISCV64) +#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(RISCV64)

View File

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYZ4NMgAKCRDz0yLQ7EWC
w8dDAJ0XlodXEOu4mMkcTEkMi4zbGIvsmgCfdFSkmaAmrr+hSSh5/975VJzhj4M=
=zndL
-----END PGP SIGNATURE-----

View File

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

View File

@ -16,7 +16,7 @@
%bcond_without docs %bcond_without docs
Name: webkit2gtk3 Name: webkit2gtk3
Version: 2.34.2 Version: 2.34.6
Release: 1%{?dist} Release: 1%{?dist}
Summary: GTK Web content engine library Summary: GTK Web content engine library
@ -24,8 +24,10 @@ License: LGPLv2
URL: https://www.webkitgtk.org/ URL: https://www.webkitgtk.org/
Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
# Created from http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322D0EC4582C3 # Use the keys from https://webkitgtk.org/verifying.html
Source2: https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.gpg # $ 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=217989
# https://bugs.webkit.org/show_bug.cgi?id=227905 # https://bugs.webkit.org/show_bug.cgi?id=227905
@ -92,6 +94,7 @@ BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(wayland-egl)
BuildRequires: pkgconfig(wayland-protocols)
BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wayland-server)
BuildRequires: pkgconfig(wpe-1.0) BuildRequires: pkgconfig(wpe-1.0)
BuildRequires: pkgconfig(wpebackend-fdo-1.0) BuildRequires: pkgconfig(wpebackend-fdo-1.0)
@ -105,7 +108,7 @@ Requires: xdg-dbus-proxy
Recommends: geoclue2 Recommends: geoclue2
# Needed for various GStreamer elements. # Needed for various GStreamer elements.
Recommends: gstreamer1-plugins-bad-freeworld Recommends: gstreamer1-plugins-bad-free
Recommends: gstreamer1-plugins-good Recommends: gstreamer1-plugins-good
# If no xdg-desktop-portal backend is installed, many features will be broken # If no xdg-desktop-portal backend is installed, many features will be broken
@ -310,6 +313,20 @@ export NINJA_STATUS="[%f/%t][%e] "
%endif %endif
%changelog %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 * Wed Nov 24 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.2-1
- Update to 2.34.2 - Update to 2.34.2
Related: #1985041 Related: #1985041