From 0a3d51ad7594099e4e704597a648cac257aa3c53 Mon Sep 17 00:00:00 2001 From: linker Date: Wed, 21 Apr 2021 11:37:13 +0800 Subject: [PATCH 1/2] fix webkit aarch64 page size --- webkit-aarch64_page_size.patch | 15 +++++++++++++++ webkit2gtk3.spec | 16 +++++++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 webkit-aarch64_page_size.patch diff --git a/webkit-aarch64_page_size.patch b/webkit-aarch64_page_size.patch new file mode 100644 index 0000000..0e532d8 --- /dev/null +++ b/webkit-aarch64_page_size.patch @@ -0,0 +1,15 @@ +diff -Naru a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h +--- a/Source/WTF/wtf/PageBlock.h 2020-04-24 16:43:26.000000000 +0800 ++++ b/Source/WTF/wtf/PageBlock.h 2021-03-19 19:13:08.942852245 +0800 +@@ -49,9 +49,9 @@ + // Use 64 KiB for any unknown CPUs to be conservative. + #if OS(DARWIN) + 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 c750121..a752996 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -5,7 +5,7 @@ #Basic Information Name: webkit2gtk3 Version: 2.28.3 -Release: 3 +Release: 4 Summary: GTK+ Web content engine library License: LGPLv2 URL: http://www.webkitgtk.org/ @@ -13,6 +13,8 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch0: user-agent-branding.patch +Patch6000: webkit-aarch64_page_size.patch + #Dependency BuildRequires: at-spi2-core-devel bison cairo-devel cmake enchant2-devel BuildRequires: flex fontconfig-devel freetype-devel ninja-build @@ -108,15 +110,20 @@ pushd %{_target_platform} -DCMAKE_BUILD_TYPE=Release \ -DENABLE_GTKDOC=ON \ -DENABLE_MINIBROWSER=ON \ + -DUSE_WPE_RENDERER=OFF \ -DPYTHON_EXECUTABLE=%{_bindir}/python3 \ +%ifarch aarch64 + -DENABLE_JIT=OFF \ + -DUSE_SYSTEM_MALLOC=ON \ +%endif .. popd export NINJA_STATUS="[%f/%t][%e] " -%ninja_build -C %{_target_platform} +%ninja_build -C %{_target_platform} -j32 %install -%ninja_install -C %{_target_platform} +%ninja_install -C %{_target_platform} -j32 %find_lang WebKit2GTK-4.0 @@ -175,6 +182,9 @@ done %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Wed Apr 21 2021 Dehui Fan - 2.28.3-4 +- DESC: fix webkit aarch64 page size + * Tue Dec 15 2020 hanhui - 2.28.3-3 - modify license -- Gitee From 4594413bd9d3a6bcb75b43ba16bd784250598e51 Mon Sep 17 00:00:00 2001 From: linker Date: Wed, 21 Apr 2021 19:15:38 +0800 Subject: [PATCH 2/2] 3 --- webkit-aarch64_page_size.patch | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/webkit-aarch64_page_size.patch b/webkit-aarch64_page_size.patch index 0e532d8..620ee72 100644 --- a/webkit-aarch64_page_size.patch +++ b/webkit-aarch64_page_size.patch @@ -1,7 +1,7 @@ -diff -Naru a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h ---- a/Source/WTF/wtf/PageBlock.h 2020-04-24 16:43:26.000000000 +0800 -+++ b/Source/WTF/wtf/PageBlock.h 2021-03-19 19:13:08.942852245 +0800 -@@ -49,9 +49,9 @@ +diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h +--- 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) constexpr size_t CeilingOnPageSize = 16 * KB; @@ -13,3 +13,6 @@ diff -Naru a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h constexpr size_t CeilingOnPageSize = 64 * KB; #else #error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture! +-- +1.8.3.1 + -- Gitee