Lubuntu/qt6-base
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refresh patches.

Browse Source
This commit is contained in:
Lisandro Damián Nicanor Pérez Meyer 2023-05-22 10:42:08 -03:00
parent 4e3679f4fb
commit cf0603f037
6 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ qt6-base (6.4.2+dfsg-8) UNRELEASED; urgency=medium
[ Lisandro Damián Nicanor Pérez Meyer ]
* Add patch for solving CVE-2023-32763.
* Refresh patches.
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 22 May 2023 10:33:34 -0300

6
debian/patches/armel-noyield.patch vendored
View File

@ -1,8 +1,12 @@
Description: Don't use yield on CPUs that might not support it
---
src/corelib/global/qsimd_p.h | 2 ++
1 file changed, 2 insertions(+)
--- a/src/corelib/global/qsimd_p.h
+++ b/src/corelib/global/qsimd_p.h
@@ -428,7 +428,9 @@ static inline void qYieldCpu()
@@ -401,7 +401,9 @@ static inline void qYieldCpu()
https://stackoverflow.com/a/70076751/134841
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105416
*/

10
debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch vendored
View File

@ -9,22 +9,18 @@ and causes reproducibility issues when built in different paths.
https://reproducible-builds.org/docs/build-path/
---
cmake/QtBuildInternalsExtra.cmake.in | 3 ---
cmake/QtBuildInternalsExtra.cmake.in | 3 ---
1 file changed, 3 deletions(-)
diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in
index cbd70b1..23b2391 100644
--- a/cmake/QtBuildInternalsExtra.cmake.in
+++ b/cmake/QtBuildInternalsExtra.cmake.in
@@ -53,9 +53,6 @@ endif()
@@ -75,9 +75,6 @@ endif()
set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL
"Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE)
-set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH
-"A path to the source tree of the previously configured QtBase project." FORCE)
-
# Propagate decision of building tests and examples to other repositories.
set(QT_BUILD_TESTS @QT_BUILD_TESTS@ CACHE BOOL "Build the testing tree.")
set(QT_BUILD_EXAMPLES @QT_BUILD_EXAMPLES@ CACHE BOOL "Build Qt examples")
--
2.35.1

9
debian/patches/cross.patch vendored
View File

@ -1,6 +1,11 @@
---
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 --
src/tools/configure.cmake | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -146,8 +146,6 @@
@@ -151,8 +151,6 @@ function(qt_build_internals_disable_pkg_
set(FEATURE_pkg_config "${pkg_config_enabled}" CACHE STRING "Using pkg-config")
if(NOT pkg_config_enabled)
qt_build_internals_disable_pkg_config()
@ -11,7 +16,7 @@
--- a/src/tools/configure.cmake
+++ b/src/tools/configure.cmake
@@ -2,7 +2,7 @@
@@ -2,7 +2,7 @@ qt_feature("androiddeployqt" PRIVATE
SECTION "Deployment"
LABEL "Android deployment tool"
PURPOSE "The Android deployment tool automates the process of creating Android packages."

12
debian/patches/upstream_Add-HPPA-detection.patch vendored
View File

@ -9,10 +9,10 @@ Subject: [PATCH] Add HPPA detection
Change-Id: I5214ce64ef1fdd0ecca3d6c1694c5db9b2852a22
Reviewed-by: Thiago Macieira <thiago.macieira@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 +++
src/corelib/global/archdetect.cpp | 2 ++
src/corelib/global/qglobal.cpp | 9 +++++++++
src/corelib/global/qprocessordetection.h | 9 +++++++++
src/corelib/plugin/qelfparser_p.cpp | 3 +++
4 files changed, 23 insertions(+)
--- a/src/corelib/global/archdetect.cpp
@ -46,7 +46,7 @@ Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
X86 is little-endian.
--- a/src/corelib/plugin/qelfparser_p.cpp
+++ b/src/corelib/plugin/qelfparser_p.cpp
@@ -113,6 +113,8 @@ struct ElfMachineCheck
@@ -118,6 +118,8 @@ struct ElfMachineCheck
EM_AARCH64
#elif defined(Q_PROCESSOR_BLACKFIN)
EM_BLACKFIN
@ -55,7 +55,7 @@ Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
#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
@@ -383,6 +385,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION stati
#endif
case EM_IA_64: d << ", IA-64"; break;
case EM_MIPS: d << ", MIPS"; break;

12
debian/patches/upstream_Add-M68k-detection.patch vendored
View File

@ -10,10 +10,10 @@ Subject: [PATCH] Add M68k detection
Change-Id: Ie5694abbe1ae2bfeb5692defba0ca6062c1d60ac
Reviewed-by: Thiago Macieira <thiago.macieira@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 +++
src/corelib/global/archdetect.cpp | 2 ++
src/corelib/global/qglobal.cpp | 9 +++++++++
src/corelib/global/qprocessordetection.h | 9 +++++++++
src/corelib/plugin/qelfparser_p.cpp | 3 +++
4 files changed, 23 insertions(+)
--- a/src/corelib/global/archdetect.cpp
@ -47,7 +47,7 @@ Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
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
@@ -122,6 +122,8 @@ struct ElfMachineCheck
EM_PARISC
#elif defined(Q_PROCESSOR_IA64)
EM_IA_64
@ -56,7 +56,7 @@ Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
#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
@@ -378,6 +380,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION stati
switch (r.machine) {
// list definitely not exhaustive!
case EM_NONE: d << ", no machine"; break;