开源软件构建与测试

Changes of Revision 3

_service:tar_scm:qt5-qtbase.spec Changed

@@ -34,7 +34,7 @@
 Name:             qt5-qtbase
 Summary:          Qt5 - QtBase components
 Version:          5.15.2
-Release:          6
+Release:          7
 
 
 # See LGPL_EXCEPTIONS.txt, for exception details
@@ -116,6 +116,7 @@
 Patch0022:        add-loongarch64-support.patch
 # https://download.qt.io/official_releases/qt/5.15/CVE-2023-24607-qtbase-5.15.diff
 Patch0023:        CVE-2023-24607.patch
+Patch0024:        Fix-lupdate-command-error-on-loongarch64.patch
 # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
 # Those themes are there for platform integration. If the required libraries are
 # not there, the platform to integrate with isn't either. Then Qt will just
@@ -374,6 +375,7 @@
 %patch0021 -p1
 %patch0022 -p1
 %patch0023 -p1
+%patch0024 -p1
 # move some bundled libs to ensure they're not accidentally used
 pushd src/3rdparty
 mkdir UNUSED
@@ -1015,6 +1017,9 @@
 
 
 %changelog
+* Thu Jun 08 2023 huajingyun <huajingyun@loongson.cn> - 5.15.2-7
+- Fix lupdate command error on loongarch64
+
 * Fri Apr 28 2023 douyan <douyan@kylinos.cn> - 5.15.2-6
 - fix CVE-2023-24607

_service:tar_scm:Fix-lupdate-command-error-on-loongarch64.patch Added

@@ -0,0 +1,44 @@
+From 0621699a4b5f9bb74355eb106afb7fe68be6db2a Mon Sep 17 00:00:00 2001
+From: Jingyun Hua <huajingyun@loongson.cn>
+Date: Thu, 8 Jun 2023 06:23:44 +0000
+Subject: PATCH Fix lupdate command execution error on loongarch64
+
+Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
+---
+ src/3rdparty/forkfd/forkfd_linux.c       | 3 ++-
+ src/corelib/global/qprocessordetection.h | 5 +++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/3rdparty/forkfd/forkfd_linux.c b/src/3rdparty/forkfd/forkfd_linux.c
+index ffe0e9a5..b1f5408d 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(__loongarch__)
+     /* 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/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h
+index ca9d4080..6f0bc7e7 100644
+--- a/src/corelib/global/qprocessordetection.h
++++ b/src/corelib/global/qprocessordetection.h
+@@ -225,8 +225,9 @@
+ // Q_BYTE_ORDER not defined, use endianness auto-detection
+ 
+ #elif defined(__loongarch64)
+-#    define Q_PROCESSOR_LOONGARCH_64
+-#    define Q_PROCESSOR_WORDSIZE 8
++#  define Q_PROCESSOR_LOONGARCH_64
++#  define Q_PROCESSOR_WORDSIZE 8
++#  define Q_BYTE_ORDER Q_LITTLE_ENDIAN
+ 
+ /*
+     MIPS family, known revisions: I, II, III, IV, 32, 64
+-- 
+2.33.0
+