From a3f6457fa2cfe17b8a09cfb03d3eb4f7aec440f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=B9=BF=E6=85=A7?= Date: Wed, 12 Mar 2025 16:18:50 +0800 Subject: [PATCH] Add sw_64 native compiler support. Project:TC2024110202 --- add-sw_64-support-for-syscall_fork.patch | 12 ++++++++++++ qt5-qtbase.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 add-sw_64-support-for-syscall_fork.patch diff --git a/add-sw_64-support-for-syscall_fork.patch b/add-sw_64-support-for-syscall_fork.patch new file mode 100644 index 0000000..12c78d4 --- /dev/null +++ b/add-sw_64-support-for-syscall_fork.patch @@ -0,0 +1,12 @@ +diff -Nur qtbase-everywhere-src-5.15.11-orig/src/3rdparty/forkfd/forkfd_linux.c qtbase-everywhere-src-5.15.11-mody/src/3rdparty/forkfd/forkfd_linux.c +--- qtbase-everywhere-src-5.15.11-orig/src/3rdparty/forkfd/forkfd_linux.c 2025-03-12 16:13:35.348877882 +0800 ++++ qtbase-everywhere-src-5.15.11-mody/src/3rdparty/forkfd/forkfd_linux.c 2025-03-12 16:14:26.364432186 +0800 +@@ -83,7 +83,7 @@ + #elif defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ + defined(__nds32__) || defined(__hppa__) || defined(__powerpc__) || defined(__i386__) || \ + defined(__x86_64__) || defined(__xtensa__) || defined(__alpha__) || defined(__riscv) || \ +- defined(__loongarch__) ++ defined(__loongarch__) || defined(__sw_64__) + /* ctid and newtls are inverted on CONFIG_CLONE_BACKWARDS architectures, + * but since both values are 0, there's no harm. */ + return syscall(__NR_clone, cloneflags, child_stack, ptid, ctid, newtls); diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index a7afdfb..ad4dd28 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -1,4 +1,4 @@ -%define anolis_release 5 +%define anolis_release 6 %global openssl -openssl-linked %global zstd 1 @@ -79,6 +79,7 @@ Patch104: qtbase-QTBUG-103393.patch Patch105: CVE-2023-51714.patch Patch106: CVE-2024-25580-qtbase-5.15.patch Patch107: CVE-2024-39936.patch +Patch108: add-sw_64-support-for-syscall_fork.patch %global __requires_exclude_from ^%{_qt5_plugindir}/platformthemes/.*$ # filter plugin provides %global __provides_exclude_from ^%{_qt5_plugindir}/.*\\.so$ @@ -267,6 +268,7 @@ Qt5 libraries used for drawing widgets and OpenGL items. %patch -P 105 -p1 %patch -P 106 -p1 %patch -P 107 -p1 +%patch -P 108 -p1 pushd src/3rdparty mkdir UNUSED mv freetype libjpeg libpng zlib UNUSED/ @@ -893,6 +895,9 @@ fi %changelog +* Wed Mar 12 2025 yangguanghui - 5.15.11-6 +- Add sw_64 native compiler support. + * Wed Nov 20 2024 Yuki Zhu - 5.15.11-5 - fix CVE-2024-33936 * Tue Jun 04 2024 yangxianzhao - 5.15.11-4 -- Gitee