From ac2b96c86aa832a78db88b7e7ef04f59e78f6f14 Mon Sep 17 00:00:00 2001 From: happy_orange Date: Mon, 25 Apr 2022 04:57:10 -0400 Subject: [PATCH 1/5] Bump version to rebuild with icu-71 --- webkit2gtk3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index e096d6f..75f2add 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 ## NOTE: Lots of files in various subdirectories have the same name (such as ## "LICENSE") so this short macro allows us to distinguish them by using their ## directory names (from the source tree) as prefixes for the files. @@ -255,5 +255,8 @@ export NINJA_STATUS="[%f/%t][%e] " %endif %changelog +* Mon Apr 25 2022 happy_orange - 2.36.0-2 +- Bump version to rebuild with icu-71 + * Thu Apr 14 2022 Chunmei Xu - 2.36.0-1 - init from upstream -- Gitee From fe5d0c27329e466d839f1f5fc846f081b22b92f9 Mon Sep 17 00:00:00 2001 From: happy_orange Date: Mon, 25 Apr 2022 08:04:47 -0400 Subject: [PATCH 2/5] disable docs --- webkit2gtk3.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 75f2add..bc95890 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 ## NOTE: Lots of files in various subdirectories have the same name (such as ## "LICENSE") so this short macro allows us to distinguish them by using their ## directory names (from the source tree) as prefixes for the files. @@ -6,7 +6,7 @@ mkdir -p _license_files ; \ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') -%bcond_without docs +%bcond_with docs Name: webkit2gtk3 Version: 2.36.0 @@ -255,6 +255,9 @@ export NINJA_STATUS="[%f/%t][%e] " %endif %changelog +* Mon Apr 25 2022 happy_orange - 2.36.0-2 +- diable docs + * Mon Apr 25 2022 happy_orange - 2.36.0-2 - Bump version to rebuild with icu-71 -- Gitee From 9aef12b2ca7dc912f69be953ce7b54455eee1718 Mon Sep 17 00:00:00 2001 From: happy_orange Date: Mon, 25 Apr 2022 22:45:18 -0400 Subject: [PATCH 3/5] add limit in build --- webkit2gtk3.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index bc95890..3e7e22f 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -163,6 +163,8 @@ rm -rf Source/ThirdParty/qunit/ %global _dwz_max_die_limit 250000000 %global _dwz_max_die_limit_x86_64 250000000 +%global optflags %(echo %{optflags} -Wl,--no-keep-memory | sed 's/-g /-g1 /') + %cmake \ -GNinja \ -DPORT=GTK \ -- Gitee From 3127d24cd1cc7fa6d0f17855425c0b994ae2b7cc Mon Sep 17 00:00:00 2001 From: happy_orange Date: Mon, 25 Apr 2022 22:48:50 -0400 Subject: [PATCH 4/5] add some flgas --- webkit2gtk3.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 3e7e22f..49c44ca 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -177,6 +177,11 @@ rm -rf Source/ThirdParty/qunit/ %endif %if !0%{?with_gamepad} -DENABLE_GAMEPAD=OFF \ +%endif +%ifarch aarch64 + -DENABLE_JIT=OFF \ + -DUSE_SYSTEM_MALLOC=ON \ + -DUSE_64KB_PAGE_BLOCK=ON \ %endif %{nil} -- Gitee From 079aa2002454abb44e11e41089af462929efc267 Mon Sep 17 00:00:00 2001 From: happy_orange Date: Mon, 25 Apr 2022 22:49:27 -0400 Subject: [PATCH 5/5] add some flgas --- webkit2gtk3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 49c44ca..af177f8 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -160,7 +160,7 @@ rm -rf Source/ThirdParty/qunit/ %build # Increase the DIE limit so our debuginfo packages could be size optimized. # Decreases the size for x86_64 from ~5G to ~1.1G. -%global _dwz_max_die_limit 250000000 +%global _dwz_max_die_limit 350000000 %global _dwz_max_die_limit_x86_64 250000000 %global optflags %(echo %{optflags} -Wl,--no-keep-memory | sed 's/-g /-g1 /') -- Gitee