From 053be965998d094498e787dc4d9c739d965e2ac2 Mon Sep 17 00:00:00 2001 From: renjianquan Date: Tue, 8 Oct 2024 03:44:59 +0000 Subject: [PATCH] =?UTF-8?q?!27=20=E4=BF=AE=E5=A4=8Dv11=E9=BE=99=E8=8A=AFQP?= =?UTF-8?q?rocess=E6=8E=A5=E5=8F=A3=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?Merge=20pull=20request=20!27=20from=20renjianquan/openkylin/nil?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 8 ++++++++ debian/patches/0050-27-v11-QProcess.patch | 24 +++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 33 insertions(+) create mode 100644 debian/patches/0050-27-v11-QProcess.patch diff --git a/debian/changelog b/debian/changelog index c912ec78..dc20ed17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +qtbase-opensource-src (5.15.10+dfsg-3ok2.10) nile; urgency=medium + + * BUG号：无 + * 需求号：无 + * 其他更改：修复v11龙芯QProcess接口异常问题——Add macro definition loongarch64 + + -- renjianquan Tue, 08 Oct 2024 11:39:39 +0800 + qtbase-opensource-src (5.15.10+dfsg-3ok2.9) nile; urgency=medium * BUG号：无 diff --git a/debian/patches/0050-27-v11-QProcess.patch b/debian/patches/0050-27-v11-QProcess.patch new file mode 100644 index 00000000..2a0de331 --- /dev/null +++ b/debian/patches/0050-27-v11-QProcess.patch @@ -0,0 +1,24 @@ +From: renjianquan +Date: Tue, 8 Oct 2024 03:44:59 +0000 +Subject: =?utf-8?b?ITI3IOS/ruWkjXYxMem+meiKr1FQcm9jZXNz5o6l5Y+j5byC5bi46Zeu?= + =?utf-8?b?6aKYIE1lcmdlIHB1bGwgcmVxdWVzdCAhMjcgZnJvbSByZW5qaWFucXVhbi9vcGVu?= + =?utf-8?b?a3lsaW4vbmlsZQ==?= + +--- + src/3rdparty/forkfd/forkfd_linux.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/3rdparty/forkfd/forkfd_linux.c b/src/3rdparty/forkfd/forkfd_linux.c +index ffe0e9a..a31ff59 100644 +--- a/src/3rdparty/forkfd/forkfd_linux.c ++++ b/src/3rdparty/forkfd/forkfd_linux.c +@@ -82,7 +82,8 @@ static int sys_clone(unsigned long cloneflags, int *ptid) + return syscall(__NR_clone, cloneflags, child_stack, stack_size, ptid, newtls, ctid); + #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(__x86_64__) || defined(__xtensa__) || defined(__alpha__) || defined(__riscv) || \ ++ defined(loongarch64) + /* 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/debian/patches/series b/debian/patches/series index 92d9d4e9..ba996abb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -47,3 +47,4 @@ revert_startBlocking_removal.diff 0047-Fix-build-with-libxkbcommon-1.6.0.patch 0048-25.patch 0049-26-forward-the-property-to-the-window-handle-if-it-i.patch +0050-27-v11-QProcess.patch