diff --git a/.gitignore b/.gitignore index ee1eede..cc83147 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,5 @@ /webkitgtk-2.30.0.tar.xz /webkitgtk-2.30.1.tar.xz /webkitgtk-2.30.1.tar.xz.asc +/webkitgtk-2.30.2.tar.xz +/webkitgtk-2.30.2.tar.xz.asc diff --git a/sources b/sources index c78ee90..ab6eb51 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (webkitgtk-2.30.1.tar.xz) = 059f87a35468d3984187c6afb2c9142baf21a3fb6d69db1abcea567a5e910581596a3e420820ffe23c3ec87832eaca282bc3c0f86c7031f728eb168dae27147e -SHA512 (webkitgtk-2.30.1.tar.xz.asc) = 358ea379156295f65193305e5fcb2b19131754eba2f3d785eda293e7c2de7d9f6c13ca6ea476cb59b61278068036d8cf42d5f210dd734fe88e43676a01352f08 +SHA512 (webkitgtk-2.30.2.tar.xz) = caecd765ce92942fc07d0d18b834b8f1acb13e6dc1e504ed9f104862285a6032a8824ab98a7439e6f8664d83dacb4ece2011f4ec822308e5b40d1f82ca601243 +SHA512 (webkitgtk-2.30.2.tar.xz.asc) = 1d4ddf2bd926f29b1f6d0f464b3e76774c111f2dc6480eb3f1f12efb10529071d29d9b1e7fd276898f29506a80b27133918d19919e2ef9c693661197072566d7 diff --git a/webkit-aarch64_page_size.patch b/webkit-aarch64_page_size.patch new file mode 100644 index 0000000..4df6fdb --- /dev/null +++ b/webkit-aarch64_page_size.patch @@ -0,0 +1,16 @@ +diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h +index cf5cf31b2c93..412ab0836209 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 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; +-#elif CPU(UNKNOWN) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) ++#elif CPU(UNKNOWN) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(ARM64) + constexpr size_t CeilingOnPageSize = 64 * KB; + #else + #error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture! diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 8c58739..30b6004 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -8,7 +8,7 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: webkit2gtk3 -Version: 2.30.1 +Version: 2.30.2 Release: 1%{?dist} Summary: GTK Web content engine library @@ -19,8 +19,13 @@ 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 +%if 0%{?rhel} +# https://bugs.webkit.org/show_bug.cgi?id=217989 +Patch0: webkit-aarch64_page_size.patch +%endif + # https://github.com/WebPlatformForEmbedded/libwpe/issues/59 -Patch0: wpebackend-fdo-soname.patch +Patch1: wpebackend-fdo-soname.patch BuildRequires: bison BuildRequires: bubblewrap @@ -197,6 +202,9 @@ rm -rf Source/ThirdParty/qunit/ %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif +# 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. %cmake \ -GNinja \ -DPORT=GTK \ @@ -206,6 +214,14 @@ rm -rf Source/ThirdParty/qunit/ -DPYTHON_EXECUTABLE=%{_bindir}/python3 \ %if 0%{?fedora} -DUSER_AGENT_BRANDING="Fedora" \ +%endif +%if 0%{?rhel} +%ifarch aarch64 + -DENABLE_C_LOOP=ON \ + -DENABLE_JIT=OFF \ + -DENABLE_SAMPLING_PROFILER=OFF \ + -DUSE_SYSTEM_MALLOC=ON \ +%endif %endif %{nil} @@ -285,6 +301,9 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Mon Oct 26 2020 Michael Catanzaro - 2.30.2-1 +- Update to 2.30.2 + * Mon Sep 21 2020 Michael Catanzaro - 2.30.1-1 - Update to 2.30.1