diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index eb80ad1f1dd37b41f9f81666b1708a37c11a015a..8fcf2cbb62f4fd498717733b3de301aea853534d 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -9,7 +9,7 @@ #Basic Information Name: webkit2gtk3 Version: 2.36.3 -Release: 5 +Release: 6 Summary: GTK+ Web content engine library License: LGPLv2 URL: https://www.webkitgtk.org/ @@ -20,12 +20,8 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc #Patch6000: backport-CVE-2021-42762.patch #Patch6001: backport-CVE-2022-30293-CVE-2022-30294.patch -%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 @@ -222,6 +218,9 @@ done %endif %changelog +* Tue Jun 11 2024 yangchenguang - 2.36.3-6 +- Modfiy loongarch64 and sw_64 support use all arch + * Fri May 31 2024 lingsheng - 2.36.3-5 - Type:enhancement - ID:NA diff --git a/webkitgtk-2.32.1-sw.patch b/webkitgtk-2.32.1-sw.patch deleted file mode 100755 index 5c35d14c86d136b79a889c8221477c89842571fa..0000000000000000000000000000000000000000 --- 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 bcecd2deb0686060a30002fca29939b4539f4b09..74a1d2634299c5ae32bac8c3f8c6f2cc1db5f93f 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) || \