!28 修复v11龙芯QProcess接口异常问题(对5.15.10+dfsg-3ok2.10进行修改)
Merge pull request !28 from renjianquan/openkylin/nile
This commit is contained in:
parent
053be96599
commit
eb03ebe096
|
@ -1,3 +1,11 @@
|
|||
qtbase-opensource-src (5.15.10+dfsg-3ok2.11) nile; urgency=medium
|
||||
|
||||
* BUG号:无
|
||||
* 需求号:无
|
||||
* 其他更改:修复v11龙芯QProcess接口异常问题(对5.15.10+dfsg-3ok2.10进行修改)
|
||||
|
||||
-- renjianquan <renjianquan@kylinos.cn> Fri, 11 Oct 2024 17:14:33 +0800
|
||||
|
||||
qtbase-opensource-src (5.15.10+dfsg-3ok2.10) nile; urgency=medium
|
||||
|
||||
* BUG号:无
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
From: renjianquan <renjianquan@kylinos.cn>
|
||||
Date: Fri, 11 Oct 2024 09:22:44 +0000
|
||||
Subject: =?utf-8?b?ITI4IOS/ruWkjXYxMem+meiKr1FQcm9jZXNz5o6l5Y+j5byC5bi46Zeu?=
|
||||
=?utf-8?b?6aKYKOWvuTUuMTUuMTArZGZzZy0zb2syLjEw6L+b6KGM5L+u5pS5KSBNZXJnZSBw?=
|
||||
=?utf-8?b?dWxsIHJlcXVlc3QgITI4IGZyb20gcmVuamlhbnF1YW4vb3Blbmt5bGluL25pbGU=?=
|
||||
|
||||
---
|
||||
src/3rdparty/forkfd/forkfd_linux.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/3rdparty/forkfd/forkfd_linux.c b/src/3rdparty/forkfd/forkfd_linux.c
|
||||
index a31ff59..7b5bd21 100644
|
||||
--- a/src/3rdparty/forkfd/forkfd_linux.c
|
||||
+++ b/src/3rdparty/forkfd/forkfd_linux.c
|
||||
@@ -83,7 +83,7 @@ static int sys_clone(unsigned long cloneflags, int *ptid)
|
||||
#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(loongarch64)
|
||||
+ 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);
|
|
@ -48,3 +48,4 @@ revert_startBlocking_removal.diff
|
|||
0048-25.patch
|
||||
0049-26-forward-the-property-to-the-window-handle-if-it-i.patch
|
||||
0050-27-v11-QProcess.patch
|
||||
0051-28-v11-QProcess-5.15.10-dfsg-3ok2.10.patch
|
||||
|
|
Loading…
Reference in New Issue