From f14fe1738e940255228f6a32eda4ecb5b2a90460 Mon Sep 17 00:00:00 2001 From: peijiankang Date: Thu, 11 Sep 2025 15:52:46 +0800 Subject: [PATCH] update qt6-qtbase-add-sw64-support.patch (cherry picked from commit 87672935597ed54438ff767cfd5930bca964cc7b) --- qt6-qtbase-add-sw64-support.patch | 8 +++++--- qt6-qtbase.spec | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/qt6-qtbase-add-sw64-support.patch b/qt6-qtbase-add-sw64-support.patch index ebba418..c6d9ec4 100644 --- a/qt6-qtbase-add-sw64-support.patch +++ b/qt6-qtbase-add-sw64-support.patch @@ -10,10 +10,10 @@ Subject: [PATCH] add sw64 support src/corelib/global/archdetect.cpp | 2 ++ src/corelib/global/qprocessordetection.h | 2 ++ src/corelib/io/qfilesystemwatcher_inotify.cpp | 4 +++ - src/corelib/plugin/qelfparser_p.cpp | 3 ++ + src/corelib/plugin/qelfparser_p.cpp | 5 ++ src/gui/image/qimage.cpp | 4 +++ src/testlib/3rdparty/cycle_p.h | 35 +++++++++++++++++++ - 9 files changed, 53 insertions(+), 2 deletions(-) + 9 files changed, 55 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/double-conversion/double-conversion/utils.h b/src/3rdparty/double-conversion/double-conversion/utils.h index 4f4dd71b..4c4fdde7 100644 @@ -107,11 +107,13 @@ index ffc4a14b..7b8749eb 100644 #elif defined(Q_PROCESSOR_ARM_32) EM_ARM #elif defined(Q_PROCESSOR_ARM_64) -@@ -380,6 +382,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade +@@ -380,6 +382,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade // list definitely not exhaustive! case EM_NONE: d << ", no machine"; break; case EM_ALPHA: d << ", Alpha"; break; ++#ifdef EM_SW_64 + case EM_SW_64: d << ", SW_64"; break; ++#endif case EM_68K: d << ", MC68000"; break; case EM_ARM: d << ", ARM"; break; case EM_AARCH64: d << ", AArch64"; break; diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index bf00319..354d60b 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -27,7 +27,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components Version: 6.5.2 -Release: 12 +Release: 13 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://qt-project.org/ @@ -810,6 +810,9 @@ make check -k ||: %changelog +* Thu Sep 11 2025 peijiankang - 6.5.2-13 +- update qt6-qtbase-add-sw64-support.patch + * Fri Jun 27 2025 Funda Wang - 6.5.2-12 - fix CVE-2025-6338 -- Gitee