From 6744c83f65f2dfc9a83c58d73bc9b3a2647a6491 Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Wed, 16 Aug 2023 17:18:44 +0800 Subject: [PATCH] add loongarch64 support for qt5-qtbase --- add-loongarch64-support-for-qt5-qtbase.patch | 53 ++++++++++++++++++++ qt5-qtbase.spec | 6 ++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 add-loongarch64-support-for-qt5-qtbase.patch diff --git a/add-loongarch64-support-for-qt5-qtbase.patch b/add-loongarch64-support-for-qt5-qtbase.patch new file mode 100644 index 0000000..5cc13b6 --- /dev/null +++ b/add-loongarch64-support-for-qt5-qtbase.patch @@ -0,0 +1,53 @@ +From e5874965c7e3fcb057c40f6357256fd9403e95a7 Mon Sep 17 00:00:00 2001 +From: Your Name +Date: Tue, 15 Aug 2023 11:43:42 +0000 +Subject: [PATCH] add loongarch64 support for qt5-qtbase + +--- + .../double-conversion/include/double-conversion/utils.h | 1 + + src/corelib/global/archdetect.cpp | 2 ++ + src/corelib/global/qprocessordetection.h | 3 +++ + 3 files changed, 6 insertions(+) + +diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h +index 70e697ca..9be294a2 100644 +--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h ++++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h +@@ -102,6 +102,7 @@ int main(int argc, char** argv) { + defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ + defined(__riscv) || \ + defined(__or1k__) || defined(__arc__) || \ ++ defined(__loongarch64) || \ + defined(__EMSCRIPTEN__) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(__mc68000__) || \ +diff --git a/src/corelib/global/archdetect.cpp b/src/corelib/global/archdetect.cpp +index 1d00b7f5..74f3c8fc 100644 +--- a/src/corelib/global/archdetect.cpp ++++ b/src/corelib/global/archdetect.cpp +@@ -59,6 +59,8 @@ + # define ARCH_PROCESSOR "x86_64" + #elif defined(Q_PROCESSOR_IA64) + # define ARCH_PROCESSOR "ia64" ++#elif defined(Q_PROCESSOR_LOONGARCH_64) ++# define ARCH_PROCESSOR "loongarch64" + #elif defined(Q_PROCESSOR_MIPS_64) + # define ARCH_PROCESSOR "mips64" + #elif defined(Q_PROCESSOR_MIPS) +diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h +index 8d657208..6c69c0ce 100644 +--- a/src/corelib/global/qprocessordetection.h ++++ b/src/corelib/global/qprocessordetection.h +@@ -222,6 +222,9 @@ + # define Q_PROCESSOR_IA64 + # define Q_PROCESSOR_WORDSIZE 8 + // Q_BYTE_ORDER not defined, use endianness auto-detection ++#elif defined(__loongarch64) ++# define Q_PROCESSOR_LOONGARCH_64 ++# define Q_PROCESSOR_WORDSIZE 8 + + /* + MIPS family, known revisions: I, II, III, IV, 32, 64 +-- +2.40.1 + diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 3c3bae6..68237db 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 %global openssl -openssl-linked %global zstd 1 @@ -78,6 +78,7 @@ Patch105: CVE-2023-32762-qtbase-5.15.patch Patch106: CVE-2023-32763-qtbase-5.15.patch Patch107: CVE-2023-33285-qtbase-5.15.patch Patch108: CVE-2023-34410-qtbase-5.15.patch +Patch109: add-loongarch64-support-for-qt5-qtbase.patch %global __requires_exclude_from ^%{_qt5_plugindir}/platformthemes/.*$ # filter plugin provides @@ -267,6 +268,7 @@ Qt5 libraries used for drawing widgets and OpenGL items. %patch106 -p1 %patch107 -p1 %patch108 -p1 +%patch109 -p1 pushd src/3rdparty mkdir UNUSED @@ -894,6 +896,8 @@ fi %changelog +* Wed Aug 16 2023 Wenlong Zhang - 5.15.9-3 +- add loongarch64 support for qt5-qtbase * Tue Jun 06 2023 Funda Wang - 5.15.9-2 - Fix CVE-2023-33285 & CVE-2023-34410 -- Gitee