diff --git a/.gitignore b/.gitignore index 79cff57..1b9df1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/webkitgtk-2.32.1.tar.xz +SOURCES/webkitgtk-2.32.2.tar.xz diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata index 49052b3..6b343cf 100644 --- a/.webkit2gtk3.metadata +++ b/.webkit2gtk3.metadata @@ -1 +1 @@ -c8c507d3c98c891ea5bfcfb6407320959dc77a2b SOURCES/webkitgtk-2.32.1.tar.xz +958777627972b18501e5520d0aba9e274a2b151f SOURCES/webkitgtk-2.32.2.tar.xz diff --git a/SOURCES/aarch64-page-size.patch b/SOURCES/aarch64-page-size.patch new file mode 100644 index 0000000..5606dca --- /dev/null +++ b/SOURCES/aarch64-page-size.patch @@ -0,0 +1,16 @@ +diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h +index c655a50c2c89..c4a6b8d09f16 100644 +--- a/Source/WTF/wtf/PageBlock.h ++++ b/Source/WTF/wtf/PageBlock.h +@@ -49,9 +49,9 @@ namespace WTF { + // Use 64 KiB for any unknown CPUs to be conservative. + #if OS(DARWIN) || PLATFORM(PLAYSTATION) + constexpr size_t CeilingOnPageSize = 16 * KB; +-#elif USE(64KB_PAGE_BLOCK) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) ++#elif USE(64KB_PAGE_BLOCK) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) || CPU(ARM64) + constexpr size_t CeilingOnPageSize = 64 * KB; +-#elif OS(WINDOWS) || CPU(MIPS) || CPU(MIPS64) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) ++#elif OS(WINDOWS) || CPU(MIPS) || CPU(MIPS64) || CPU(X86) || CPU(X86_64) || CPU(ARM) + constexpr size_t CeilingOnPageSize = 4 * KB; + #else + #error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture! diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec index 2c84296..5a98a8d 100644 --- a/SPECS/webkit2gtk3.spec +++ b/SPECS/webkit2gtk3.spec @@ -11,7 +11,7 @@ %bcond_without docs Name: webkit2gtk3 -Version: 2.32.1 +Version: 2.32.2 Release: 1%{?dist} Summary: GTK Web content engine library @@ -22,6 +22,10 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz # https://bugs.webkit.org/show_bug.cgi?id=193749 Patch0: evolution-shared-secondary-process.patch +# https://bugs.webkit.org/show_bug.cgi?id=217989 +# https://bugs.webkit.org/show_bug.cgi?id=227905 +Patch1: aarch64-page-size.patch + BuildRequires: bison BuildRequires: bubblewrap BuildRequires: cmake @@ -85,18 +89,9 @@ BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(xt) -# These are hard requirements of WebKit's bubblewrap sandbox. -#Requires: bubblewrap -#Requires: xdg-dbus-proxy - # If Geoclue is not running, the geolocation API will not work. Recommends: geoclue2 -# If no xdg-desktop-portal backend is installed, many features will be broken -# inside the sandbox. In particular, the -gtk backend has to be installed for -# desktop settings access, including font settings. -#Recommends: xdg-desktop-portal-gtk - # Obsolete libwebkit2gtk from the webkitgtk3 package Obsoletes: libwebkit2gtk < 2.5.0 Provides: libwebkit2gtk = %{version}-%{release} @@ -197,9 +192,6 @@ rm -rf Source/ThirdParty/qunit/ # bmalloc and JIT are disabled on aarch64 only in RHEL because of the nonstandard # page size that's causing problems there. WebKit's build system sets appropriate # defaults for all other architectures, and all other distros except RHEL. -# -# TODO: Package xdg-dbus-proxy for RHEL so we can enable bubblewrap sandbox. -# TODO: Package libwpe and wpebackend-fdo for RHEL so we can enable WPE renderer. mkdir -p %{_target_platform} pushd %{_target_platform} %cmake \ @@ -215,7 +207,8 @@ pushd %{_target_platform} -DENABLE_GAMEPAD=OFF \ %if 0%{?rhel} %ifarch aarch64 - -DUSE_64KB_PAGE_BLOCK=ON \ + -DENABLE_JIT=OFF \ + -DUSE_SYSTEM_MALLOC=ON \ %endif %endif .. @@ -296,6 +289,10 @@ export NINJA_STATUS="[%f/%t][%e] " %endif %changelog +* Tue Jul 13 2021 Michael Catanzaro - 2.32.2-1 +- Update to 2.32.2 +- Related: #1937416 + * Mon May 10 2021 Michael Catanzaro - 2.32.1-1 - Update to 2.32.1 - Related: #1937416