From c64e485169edac56ae2918c1d8a7202edb09fe61 Mon Sep 17 00:00:00 2001 From: mahailiang Date: Wed, 22 Sep 2021 12:19:06 -0400 Subject: [PATCH] Sync loongsons patch webkitgtk-add-loongarch.patch --- 0001-webkitgtk-add-loongarch.patch | 11 +++++++++++ webkit2gtk3.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 0001-webkitgtk-add-loongarch.patch diff --git a/0001-webkitgtk-add-loongarch.patch b/0001-webkitgtk-add-loongarch.patch new file mode 100644 index 0000000..bcecd2d --- /dev/null +++ b/0001-webkitgtk-add-loongarch.patch @@ -0,0 +1,11 @@ +--- webkitgtk-2.28.4.orig/Source/WTF/wtf/dtoa/utils.h 2020-02-04 10:24:07.000000000 +0000 ++++ webkitgtk-2.28.4/Source/WTF/wtf/dtoa/utils.h 2021-01-20 05:38:56.527343750 +0000 +@@ -86,7 +86,7 @@ int main(int argc, char** argv) { + 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(__loongarch64) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ + defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ + defined(__riscv) || \ diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index b5a7c4c..a2fd416 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.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. @@ -12,7 +13,7 @@ Name: webkit2gtk3 Version: 2.36.7 -Release: 1%{?dist}.2 +Release: 1%{anolis_release}%{?dist}.2 Summary: GTK Web content engine library License: LGPLv2 @@ -40,6 +41,8 @@ Patch3: CVE-2022-42856.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2169934 Patch4: CVE-2023-23529.patch +Patch1000: 0001-webkitgtk-add-loongarch.patch + BuildRequires: bison BuildRequires: cmake BuildRequires: flex @@ -309,6 +312,9 @@ export NINJA_STATUS="[%f/%t][%e] " %endif %changelog +* Thu Feb 23 2023 Liwei Ge - 2.36.7-1.0.2.2 +- Sync loongsons patch webkitgtk-add-loongarch.patch (XueZhixin) + * Wed Feb 15 2023 Michael Catanzaro - 2.36.7-1.2 - Add patch for CVE-2023-23529 Resolves: #2170007 -- Gitee