From 0056f62610216bb824d005c29c89cc33d1117044 Mon Sep 17 00:00:00 2001 From: lingsheng <860373352@qq.com> Date: Thu, 29 Aug 2024 03:06:49 +0000 Subject: [PATCH] Modfiy loongarch64 and sw_64 support use all arch (cherry picked from commit edcae5c6f614b7bf2e6eca72b707abe019fbeee1) --- webkit2gtk3.spec | 12 +++++------- webkit2gtk4_1.spec | 12 +++++------- webkit2gtk5_0.spec | 12 +++++------- webkitgtk-2.32.1-sw.patch | 12 ------------ ...rch.patch => webkitgtk-add-loongarch-and-sw.patch | 2 +- 5 files changed, 16 insertions(+), 34 deletions(-) delete mode 100755 webkitgtk-2.32.1-sw.patch rename 0001-webkitgtk-add-loongarch.patch => webkitgtk-add-loongarch-and-sw.patch (95%) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 11965c8..cb500ca 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -14,19 +14,14 @@ Name: webkit2gtk3 Version: 2.38.2 -Release: 9 +Release: 10 Summary: GTK web content engine library License: LGPLv2 URL: https://www.webkitgtk.org/ Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc -%ifarch loongarch64 -Patch0001: 0001-webkitgtk-add-loongarch.patch -%endif -%ifarch sw_64 -Patch0002: webkitgtk-2.32.1-sw.patch -%endif +Patch1000: webkitgtk-add-loongarch-and-sw.patch Patch6000: backport-CVE-2023-28204.patch Patch6001: backport-CVE-2023-32373.patch @@ -294,6 +289,9 @@ popd %endif %changelog +* Thu Aug 29 2024 lingsheng - 2.38.2-10 +- Modfiy loongarch64 and sw_64 support use all arch + * Mon Aug 26 2024 lingsheng - 2.38.2-9 - fix CVE-2024-4558 CVE-2024-40779 CVE-2024-40780 diff --git a/webkit2gtk4_1.spec b/webkit2gtk4_1.spec index ca5ef4a..f04858c 100644 --- a/webkit2gtk4_1.spec +++ b/webkit2gtk4_1.spec @@ -14,19 +14,14 @@ Name: webkit2gtk4.1 Version: 2.38.2 -Release: 9 +Release: 10 Summary: GTK web content engine library License: LGPLv2 URL: https://www.webkitgtk.org/ Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc -%ifarch loongarch64 -Patch0001: 0001-webkitgtk-add-loongarch.patch -%endif -%ifarch sw_64 -Patch0002: webkitgtk-2.32.1-sw.patch -%endif +Patch1000: webkitgtk-add-loongarch-and-sw.patch Patch6000: backport-CVE-2023-28204.patch Patch6001: backport-CVE-2023-32373.patch @@ -263,6 +258,9 @@ popd %endif %changelog +* Thu Aug 29 2024 lingsheng - 2.38.2-10 +- Modfiy loongarch64 and sw_64 support use all arch + * Mon Aug 26 2024 lingsheng - 2.38.2-9 - fix CVE-2024-4558 CVE-2024-40779 CVE-2024-40780 diff --git a/webkit2gtk5_0.spec b/webkit2gtk5_0.spec index 5f2de0a..1792ed3 100644 --- a/webkit2gtk5_0.spec +++ b/webkit2gtk5_0.spec @@ -14,19 +14,14 @@ Name: webkit2gtk5.0 Version: 2.38.2 -Release: 9 +Release: 10 Summary: GTK web content engine library License: LGPLv2 URL: https://www.webkitgtk.org/ Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc -%ifarch loongarch64 -Patch0001: 0001-webkitgtk-add-loongarch.patch -%endif -%ifarch sw_64 -Patch0002: webkitgtk-2.32.1-sw.patch -%endif +Patch1000: webkitgtk-add-loongarch-and-sw.patch Patch6000: backport-CVE-2023-28204.patch Patch6001: backport-CVE-2023-32373.patch @@ -263,6 +258,9 @@ popd %endif %changelog +* Thu Aug 29 2024 lingsheng - 2.38.2-10 +- Modfiy loongarch64 and sw_64 support use all arch + * Mon Aug 26 2024 lingsheng - 2.38.2-9 - fix CVE-2024-4558 CVE-2024-40779 CVE-2024-40780 diff --git a/webkitgtk-2.32.1-sw.patch b/webkitgtk-2.32.1-sw.patch deleted file mode 100755 index 5c35d14..0000000 --- a/webkitgtk-2.32.1-sw.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur webkitgtk-2.32.1.org/Source/WTF/wtf/dtoa/utils.h webkitgtk-2.32.1.sw/Source/WTF/wtf/dtoa/utils.h ---- webkitgtk-2.32.1.org/Source/WTF/wtf/dtoa/utils.h 2022-06-06 15:32:28.840000000 +0000 -+++ webkitgtk-2.32.1.sw/Source/WTF/wtf/dtoa/utils.h 2022-06-06 15:33:01.600000000 +0000 -@@ -86,7 +86,7 @@ - defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ - defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ -- defined(__SH4__) || defined(__alpha__) || \ -+ defined(__SH4__) || defined(__alpha__) || defined(__sw_64__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ - defined(__riscv) || \ diff --git a/0001-webkitgtk-add-loongarch.patch b/webkitgtk-add-loongarch-and-sw.patch similarity index 95% rename from 0001-webkitgtk-add-loongarch.patch rename to webkitgtk-add-loongarch-and-sw.patch index bcecd2d..74a1d26 100644 --- a/0001-webkitgtk-add-loongarch.patch +++ b/webkitgtk-add-loongarch-and-sw.patch @@ -5,7 +5,7 @@ defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ - defined(__SH4__) || defined(__alpha__) || \ -+ defined(__SH4__) || defined(__alpha__) || defined(__loongarch64) || \ ++ defined(__SH4__) || defined(__alpha__) || defined(__loongarch64) || defined(__sw_64__) || \ defined(_MIPS_ARCH_MIPS32R2) || \ defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ defined(__riscv) || \ -- Gitee