packages/webkitgtk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modfiy loongarch64 and sw_64 support use all arch

Browse Source 
Signed-off-by: yangchenguang <yangchenguang@kylinsec.com.cn>
(cherry picked from commit 2e62966149cb3e6d2c0f8f11b7acf5c42ec0c0c7)
This commit is contained in:
yangchenguang 2024-06-11 09:59:58 +08:00 committed by openeuler-sync-bot
parent 73c77df27f
commit 41c1a88294
3 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webkit2gtk3.spec
View File

@ -9,7 +9,7 @@
#Basic Information #Basic Information
Name: webkit2gtk3 Name: webkit2gtk3
Version: 2.36.3 Version: 2.36.3
Release: 5 Release: 6
Summary: GTK+ Web content engine library Summary: GTK+ Web content engine library
License: LGPLv2 License: LGPLv2
URL: https://www.webkitgtk.org/ 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 #Patch6000: backport-CVE-2021-42762.patch
#Patch6001: backport-CVE-2022-30293-CVE-2022-30294.patch #Patch6001: backport-CVE-2022-30293-CVE-2022-30294.patch
%ifarch loongarch64
Patch0001: 0001-webkitgtk-add-loongarch.patch Patch1000: webkitgtk-add-loongarch-and-sw.patch
%endif
%ifarch sw_64
Patch0002: webkitgtk-2.32.1-sw.patch
%endif
Patch6000: backport-CVE-2023-28204.patch Patch6000: backport-CVE-2023-28204.patch
Patch6001: backport-CVE-2023-32373.patch Patch6001: backport-CVE-2023-32373.patch
@ -222,6 +218,9 @@ done
%endif %endif
%changelog %changelog
* Tue Jun 11 2024 yangchenguang <yangchenguang@kylinsec.com.cn> - 2.36.3-6
- Modfiy loongarch64 and sw_64 support use all arch
* Fri May 31 2024 lingsheng <lingsheng1@h-partners.com> - 2.36.3-5 * Fri May 31 2024 lingsheng <lingsheng1@h-partners.com> - 2.36.3-5
- Type:enhancement - Type:enhancement
- ID:NA - ID:NA

12
webkitgtk-2.32.1-sw.patch
View File

@ -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) || \

2
0001-webkitgtk-add-loongarch.patch → webkitgtk-add-loongarch-and-sw.patch
View File

@ -5,7 +5,7 @@
defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \
defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
- defined(__SH4__) || defined(__alpha__) || \ - defined(__SH4__) || defined(__alpha__) || \
+ defined(__SH4__) || defined(__alpha__) || defined(__loongarch64) || \ + defined(__SH4__) || defined(__alpha__) || defined(__loongarch64) || defined(__sw_64__) || \
defined(_MIPS_ARCH_MIPS32R2) || \ defined(_MIPS_ARCH_MIPS32R2) || \
defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \
defined(__riscv) || \ defined(__riscv) || \