From eb03ebe096917498d5cac682c7c3ffe18e4b49d0 Mon Sep 17 00:00:00 2001 From: renjianquan Date: Fri, 11 Oct 2024 09:22:44 +0000 Subject: [PATCH] =?UTF-8?q?!28=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(?= =?UTF-8?q?=E5=AF=B95.15.10+dfsg-3ok2.10=E8=BF=9B=E8=A1=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9)=20Merge=20pull=20request=20!28=20from=20renjianquan/?= =?UTF-8?q?openkylin/nile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 8 +++++++ ...28-v11-QProcess-5.15.10-dfsg-3ok2.10.patch | 23 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 32 insertions(+) create mode 100644 debian/patches/0051-28-v11-QProcess-5.15.10-dfsg-3ok2.10.patch diff --git a/debian/changelog b/debian/changelog index dc20ed17..ce2836d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 11 Oct 2024 17:14:33 +0800 + qtbase-opensource-src (5.15.10+dfsg-3ok2.10) nile; urgency=medium * BUG号：无 diff --git a/debian/patches/0051-28-v11-QProcess-5.15.10-dfsg-3ok2.10.patch b/debian/patches/0051-28-v11-QProcess-5.15.10-dfsg-3ok2.10.patch new file mode 100644 index 00000000..cecb5eac --- /dev/null +++ b/debian/patches/0051-28-v11-QProcess-5.15.10-dfsg-3ok2.10.patch @@ -0,0 +1,23 @@ +From: renjianquan +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); diff --git a/debian/patches/series b/debian/patches/series index ba996abb..a54d366f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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