[neon/qt6/qt6-base/Neon/release] debian/patches: remove patches in tars
Jonathan Esk-Riddell
null at kde.org
Mon Apr 3 13:56:05 BST 2023
Git commit 68d4ceb758f37582674cc844f26ec1a437272aa4 by Jonathan Esk-Riddell.
Committed on 03/04/2023 at 12:56.
Pushed by jriddell into branch 'Neon/release'.
remove patches in tars
M +0 -4 debian/patches/series
D +0 -83 debian/patches/upstream_Add-HPPA-detection.patch
D +0 -84 debian/patches/upstream_Add-M68k-detection.patch
https://invent.kde.org/neon/qt6/qt6-base/commit/68d4ceb758f37582674cc844f26ec1a437272aa4
diff --git a/debian/patches/series b/debian/patches/series
index 98eae72..d598193 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
-# fixed in 6.5
-upstream_Add-HPPA-detection.patch
-upstream_Add-M68k-detection.patch
-
# Debian specific
remove_privacy_breaches.diff
build_path_embedded_qtbuildinternalsextra_cmake.patch
diff --git a/debian/patches/upstream_Add-HPPA-detection.patch b/debian/patches/upstream_Add-HPPA-detection.patch
deleted file mode 100644
index 97acf71..0000000
--- a/debian/patches/upstream_Add-HPPA-detection.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From e81cba0cd33339c2e5f5e3c670741605264b21c2 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino at tiscali.it>
-Date: Thu, 6 Oct 2022 23:15:30 +0200
-Subject: [PATCH] Add HPPA detection
-
-- detect the HPPA architecture (PA-RISC) and define Q_PROCESSOR_HPPA
-- set the right machine type in QElfParser for HPPA ELF files
-
-Change-Id: I5214ce64ef1fdd0ecca3d6c1694c5db9b2852a22
-Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
----
- src/corelib/global/archdetect.cpp | 2 ++
- src/corelib/global/qprocessordetection.h | 9 +++++++++
- src/corelib/global/qprocessordetection.qdoc | 9 +++++++++
- src/corelib/plugin/qelfparser_p.cpp | 3 +++
- 4 files changed, 23 insertions(+)
-
---- a/src/corelib/global/archdetect.cpp
-+++ b/src/corelib/global/archdetect.cpp
-@@ -17,6 +17,8 @@
- # define ARCH_PROCESSOR "bfin"
- #elif defined(Q_PROCESSOR_WASM)
- # define ARCH_PROCESSOR "wasm"
-+#elif defined(Q_PROCESSOR_HPPA)
-+# define ARCH_PROCESSOR "hppa"
- #elif defined(Q_PROCESSOR_X86_32)
- # define ARCH_PROCESSOR "i386"
- #elif defined(Q_PROCESSOR_X86_64)
---- a/src/corelib/global/qprocessordetection.h
-+++ b/src/corelib/global/qprocessordetection.h
-@@ -140,6 +140,15 @@
- // # define Q_BYTE_ORDER Q_LITTLE_ENDIAN
-
- /*
-+ PA-RISC family, no revisions or variants
-+
-+ PA-RISC is big-endian.
-+*/
-+#elif defined(__hppa__)
-+# define Q_PROCESSOR_HPPA
-+# define Q_BYTE_ORDER Q_BIG_ENDIAN
-+
-+/*
- X86 family, known variants: 32- and 64-bit
-
- X86 is little-endian.
---- a/src/corelib/plugin/qelfparser_p.cpp
-+++ b/src/corelib/plugin/qelfparser_p.cpp
-@@ -113,6 +113,8 @@ struct ElfMachineCheck
- EM_AARCH64
- #elif defined(Q_PROCESSOR_BLACKFIN)
- EM_BLACKFIN
-+#elif defined(Q_PROCESSOR_HPPA)
-+ EM_PARISC
- #elif defined(Q_PROCESSOR_IA64)
- EM_IA_64
- #elif defined(Q_PROCESSOR_MIPS)
-@@ -380,6 +382,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION stati
- #endif
- case EM_IA_64: d << ", IA-64"; break;
- case EM_MIPS: d << ", MIPS"; break;
-+ case EM_PARISC: d << ", HPPA"; break;
- case EM_PPC: d << ", PowerPC"; break;
- case EM_PPC64: d << ", PowerPC 64-bit"; break;
- #ifdef EM_RISCV
---- a/src/corelib/global/qglobal.cpp
-+++ b/src/corelib/global/qglobal.cpp
-@@ -1791,6 +1791,15 @@ bool qSharedBuild() noexcept
- */
-
- /*!
-+ \macro Q_PROCESSOR_HPPA
-+ \relates <QtGlobal>
-+
-+ Defined if the application is compiled for PA-RISC processors.
-+
-+ \sa QSysInfo::buildCpuArchitecture()
-+*/
-+
-+/*!
- \macro Q_PROCESSOR_IA64
- \relates <QtGlobal>
-
diff --git a/debian/patches/upstream_Add-M68k-detection.patch b/debian/patches/upstream_Add-M68k-detection.patch
deleted file mode 100644
index e595adc..0000000
--- a/debian/patches/upstream_Add-M68k-detection.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From ac17a394a5701174c705050640e26c9cb95d289b Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino at tiscali.it>
-Date: Thu, 6 Oct 2022 23:17:57 +0200
-Subject: [PATCH] Add M68k detection
-
-- detect the M68k architecture (Motorola 68000) and define
- Q_PROCESSOR_M68K
-- set the right machine type in QElfParser for M68k ELF files
-
-Change-Id: Ie5694abbe1ae2bfeb5692defba0ca6062c1d60ac
-Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
----
- src/corelib/global/archdetect.cpp | 2 ++
- src/corelib/global/qprocessordetection.h | 9 +++++++++
- src/corelib/global/qprocessordetection.qdoc | 9 +++++++++
- src/corelib/plugin/qelfparser_p.cpp | 3 +++
- 4 files changed, 23 insertions(+)
-
---- a/src/corelib/global/archdetect.cpp
-+++ b/src/corelib/global/archdetect.cpp
-@@ -25,6 +25,8 @@
- # define ARCH_PROCESSOR "x86_64"
- #elif defined(Q_PROCESSOR_IA64)
- # define ARCH_PROCESSOR "ia64"
-+#elif defined(Q_PROCESSOR_M68K)
-+# define ARCH_PROCESSOR "m68k"
- #elif defined(Q_PROCESSOR_MIPS_64)
- # define ARCH_PROCESSOR "mips64"
- #elif defined(Q_PROCESSOR_MIPS)
---- a/src/corelib/global/qprocessordetection.h
-+++ b/src/corelib/global/qprocessordetection.h
-@@ -197,6 +197,15 @@
- // Q_BYTE_ORDER not defined, use endianness auto-detection
-
- /*
-+ Motorola 68000 family, no revisions or variants
-+
-+ M68K is big-endian.
-+*/
-+#elif defined(__m68k__)
-+# define Q_PROCESSOR_M68K
-+# define Q_BYTE_ORDER Q_BIG_ENDIAN
-+
-+/*
- MIPS family, known revisions: I, II, III, IV, 32, 64
-
- MIPS is bi-endian, use endianness auto-detection implemented below.
---- a/src/corelib/plugin/qelfparser_p.cpp
-+++ b/src/corelib/plugin/qelfparser_p.cpp
-@@ -117,6 +117,8 @@ struct ElfMachineCheck
- EM_PARISC
- #elif defined(Q_PROCESSOR_IA64)
- EM_IA_64
-+#elif defined(Q_PROCESSOR_M68K)
-+ EM_68K
- #elif defined(Q_PROCESSOR_MIPS)
- EM_MIPS
- #elif defined(Q_PROCESSOR_POWER_32)
-@@ -375,6 +377,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION stati
- switch (r.machine) {
- // list definitely not exhaustive!
- case EM_NONE: d << ", no machine"; break;
-+ case EM_68K: d << ", MC68000"; break;
- case EM_ARM: d << ", ARM"; break;
- case EM_AARCH64: d << ", AArch64"; break;
- #ifdef EM_BLACKFIN
---- a/src/corelib/global/qglobal.cpp
-+++ b/src/corelib/global/qglobal.cpp
-@@ -1810,6 +1810,15 @@ bool qSharedBuild() noexcept
- */
-
- /*!
-+ \macro Q_PROCESSOR_M68K
-+ \relates <QtGlobal>
-+
-+ Defined if the application is compiled for Motorola 68000 processors.
-+
-+ \sa QSysInfo::buildCpuArchitecture()
-+*/
-+
-+/*!
- \macro Q_PROCESSOR_MIPS
- \relates <QtGlobal>
-
More information about the Neon-commits
mailing list