From f0eb648d5eab1be2aed19a6e351a16a3eec9e54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= Date: Mon, 7 Aug 2023 21:27:05 -0300 Subject: [PATCH] Add Patch in order to detect SH. --- debian/changelog | 4 ++++ debian/patches/Add-SH-detection.patch | 32 +++++++++++++++++++++++++++ debian/patches/series | 3 +++ 3 files changed, 39 insertions(+) create mode 100644 debian/patches/Add-SH-detection.patch diff --git a/debian/changelog b/debian/changelog index bcc089c..d19cac5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ qt6-base (6.4.2+dfsg-18) UNRELEASED; urgency=medium * Move from deprecated QT_BUILD_TOOLS_WHEN_CROSSCOMPILING to QT_FORCE_BUILD_TOOLS. + [ John Paul Adrian Glaubitz ] + * Add Add-SH-detection.patch in order to restore SH detection + (Closes: #1043225). + -- Debian Qt/KDE Maintainers Tue, 01 Aug 2023 19:47:16 -0300 qt6-base (6.4.2+dfsg-17) unstable; urgency=medium diff --git a/debian/patches/Add-SH-detection.patch b/debian/patches/Add-SH-detection.patch new file mode 100644 index 0000000..6d50e59 --- /dev/null +++ b/debian/patches/Add-SH-detection.patch @@ -0,0 +1,32 @@ +Description: Add SH description + Upstream processes archs from time to time and tends to disable those that + they do not know wether they are working or not. + . + SH is working on Debian, so as an intermediate measure re enable it here. +Author: John Paul Adrian Glaubitz +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1043225 +Reviewed-by: Lisandro Damián Nicanor Pérez Meyer + +Index: qt6-base-6.4.2+dfsg/src/corelib/global/qprocessordetection.h +=================================================================== +--- qt6-base-6.4.2+dfsg.orig/src/corelib/global/qprocessordetection.h ++++ qt6-base-6.4.2+dfsg/src/corelib/global/qprocessordetection.h +@@ -294,12 +294,12 @@ + + SuperH is bi-endian, use endianness auto-detection implemented below. + */ +-// #elif defined(__sh__) +-// # define Q_PROCESSOR_SH +-// # if defined(__sh4a__) +-// # define Q_PROCESSOR_SH_4A +-// # endif +-// Q_BYTE_ORDER not defined, use endianness auto-detection ++#elif defined(__sh__) ++# define Q_PROCESSOR_SH ++# if defined(__sh4a__) ++# define Q_PROCESSOR_SH_4A ++# endif ++# define Q_BYTE_ORDER Q_LITTLE_ENDIAN + + /* + SPARC family, optional revision: V9 diff --git a/debian/patches/series b/debian/patches/series index db96599..d3a4af2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,6 +13,9 @@ upstream_Add-enable-Alpha-detection.patch # fixed in 6.4.3 cve-2023-24607.patch +# Needs to be fixed upstream. +Add-SH-detection.patch + # Debian specific remove_privacy_breaches.diff build_path_embedded_qtbuildinternalsextra_cmake.patch