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

Refresh quilt patches.

Browse Source
ci/unstable
Simon Quigley 1 month ago
parent 6d621a24dd
commit 30dad4a60f
9 changed files with 16 additions and 122 deletions
Show Stats Download Patch File Download Diff File

6
debian/changelog vendored
Unescape View File

@ -1,3 +1,9 @@
qt6-base (6.7.2+dfsg-5) UNRELEASED; urgency=medium
* Refresh quilt patches.
-- Simon Quigley <tsimonq2@ubuntu.com> Tue, 26 Nov 2024 02:12:10 -0600
qt6-base (6.7.2+dfsg-4) unstable; urgency=medium
* Team upload.

4
debian/patches/armv4.diff vendored
Unescape View File

@ -5,7 +5,7 @@ Last-Update: 2016-07-01
--- a/src/corelib/global/qprocessordetection.h
+++ b/src/corelib/global/qprocessordetection.h
@@ -132,6 +132,8 @@
@@ -99,6 +99,8 @@
# elif defined(__ARM_ARCH_5TEJ__) \
|| defined(__ARM_ARCH_5TE__)
# define Q_PROCESSOR_ARM 5
@ -14,7 +14,7 @@ Last-Update: 2016-07-01
# else
# define Q_PROCESSOR_ARM 0
# endif
@@ -146,6 +148,9 @@
@@ -113,6 +115,9 @@
# endif
# if Q_PROCESSOR_ARM >= 5
# define Q_PROCESSOR_ARM_V5

2
debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch vendored
Unescape View File

@ -14,7 +14,7 @@ https://reproducible-builds.org/docs/build-path/
--- a/cmake/QtBuildInternalsExtra.cmake.in
+++ b/cmake/QtBuildInternalsExtra.cmake.in
@@ -74,9 +74,6 @@ endif()
@@ -77,9 +77,6 @@ endif()
set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL
"Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE)

10
debian/patches/enable_skip_plugins.patch vendored
Unescape View File

@ -18,22 +18,22 @@ Forwarded: not-needed
--- a/cmake/QtPlugins.cmake.in
+++ b/cmake/QtPlugins.cmake.in
@@ -6,7 +6,7 @@ include_guard(DIRECTORY)
# Distributions should probably change this default.
if(NOT DEFINED QT_SKIP_AUTO_PLUGIN_INCLUSION)
- set(QT_SKIP_AUTO_PLUGIN_INCLUSION OFF)
+ set(QT_SKIP_AUTO_PLUGIN_INCLUSION ON)
endif()
if(NOT QT_NO_CREATE_TARGETS AND NOT QT_SKIP_AUTO_PLUGIN_INCLUSION)
--- a/cmake/QtPostProcessHelpers.cmake
+++ b/cmake/QtPostProcessHelpers.cmake
@@ -448,7 +448,7 @@ function(qt_internal_create_plugins_auto_inclusion_files)
@@ -507,7 +507,7 @@ function(qt_internal_create_plugins_auto
# Distributions should probably change this default.
if(NOT DEFINED QT_SKIP_AUTO_QML_PLUGIN_INCLUSION)
- set(QT_SKIP_AUTO_QML_PLUGIN_INCLUSION OFF)
+ set(QT_SKIP_AUTO_QML_PLUGIN_INCLUSION ON)
endif()
set(__qt_qml_plugins_config_file_list \"\")

4
debian/patches/remove_rpath_from_examples.patch vendored
Unescape View File

@ -11,12 +11,12 @@ Last-Update: 2024-02-15
--- a/cmake/QtBuildRepoExamplesHelpers.cmake
+++ b/cmake/QtBuildRepoExamplesHelpers.cmake
@@ -97,7 +97,7 @@ macro(qt_examples_build_begin)
@@ -113,7 +113,7 @@ macro(qt_examples_build_begin)
# This means that installed examples are not relocatable at the moment. We would need to
# annotate where each example is installed to, to be able to derive a relative rpath, and it
# seems there's no way to query such information from CMake itself.
- set(CMAKE_INSTALL_RPATH "${_default_install_rpath}")
+ #set(CMAKE_INSTALL_RPATH "${_default_install_rpath}")
install(CODE "
# Backup CMAKE_INSTALL_PREFIX because we're going to change it in each example subdirectory

7
debian/patches/series vendored
Unescape View File

@ -1,13 +1,6 @@
# fixed in 6.9.0
upstream_IPC-add-PATH_MAX-less-fallback-definition-for-MAX_PA.patch
upstream_QStorageInfo-Unix-fix-declaration-of-mnt-on-Hurd.patch
# Needs to be fixed upstream.
Add-SH-detection.patch
# Pushed to gerrit
use_float16_only_with_sse2.patch
# Debian specific
remove_privacy_breaches.diff
build_path_embedded_qtbuildinternalsextra_cmake.patch

36
debian/patches/upstream_IPC-add-PATH_MAX-less-fallback-definition-for-MAX_PA.patch vendored
Unescape View File

@ -1,36 +0,0 @@
From f319895389705a3db7c2134d1ed47ceade1b204e Mon Sep 17 00:00:00 2001
From: Pino Toscano <toscano.pino@tiscali.it>
Date: Sat, 22 Jun 2024 19:55:15 +0200
Subject: [PATCH] IPC: add PATH_MAX-less fallback definition for MAX_PATH
Define MAX_PATH also when PATH_MAX is not defined (e.g on GNU/Hurd).
MAX_PATH is Windows constant, and it is used in this file only in a
code path for Windows; because of this, the static fallback define
should be good enough.
Change-Id: Ic1b9fee3b62505f86aa8ec89bbd20493bfe1f67c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
src/corelib/ipc/qsharedmemory.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/corelib/ipc/qsharedmemory.cpp b/src/corelib/ipc/qsharedmemory.cpp
index 02761c0263..6ee662dc53 100644
--- a/src/corelib/ipc/qsharedmemory.cpp
+++ b/src/corelib/ipc/qsharedmemory.cpp
@@ -14,7 +14,11 @@
#endif
#ifndef MAX_PATH
-# define MAX_PATH PATH_MAX
+# ifdef PATH_MAX
+# define MAX_PATH PATH_MAX
+# else
+# define MAX_PATH 1024
+# endif
#endif
QT_BEGIN_NAMESPACE
--
2.43.0

30
debian/patches/upstream_QStorageInfo-Unix-fix-declaration-of-mnt-on-Hurd.patch vendored
Unescape View File

@ -1,30 +0,0 @@
From fc3e3d033584c62dfb2f3e3da551a7dbd7c0150d Mon Sep 17 00:00:00 2001
From: Pino Toscano <toscano.pino@tiscali.it>
Date: Sun, 6 Oct 2024 09:40:14 +0200
Subject: [PATCH] QStorageInfo/Unix: fix declaration of 'mnt' on Hurd
Directly use the right type for it, after the Linux code was dropped.
Fixes commit 543ae6e6a43519b9fca6758c4a8c78625fcb2c86.
Change-Id: I1417853153d2851262f40713b3318f0dae09c391
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
src/corelib/io/qstorageinfo_unix.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp
index b809a52f97..526c75c00a 100644
--- a/src/corelib/io/qstorageinfo_unix.cpp
+++ b/src/corelib/io/qstorageinfo_unix.cpp
@@ -98,7 +98,7 @@ private:
#elif defined(Q_OS_HURD)
FILE *fp;
QByteArray buffer;
- mountinfoent mnt;
+ struct mntent mnt;
#elif defined(Q_OS_HAIKU)
BVolumeRoster m_volumeRoster;
--
2.45.2

39
debian/patches/use_float16_only_with_sse2.patch vendored
Unescape View File

@ -1,39 +0,0 @@
Description: use _Float16 only when SSE2 is enabled
The GCC documentation [1] says: “On x86 targets with SSE2 enabled, GCC
supports half-precision (16-bit) floating point via the _Float16 type”.
.
On non-SSE2 x86 (such as Debian i386 baseline [2]), __FLT16_MAX__ is
defined starting with GCC 14 [3], however any non-trivial use of the
_Float16 type results in an error:
.
error: operation not permitted on type ‘_Float16’ without option ‘-msse2’
.
which makes some packages fail to build on i386 architecture [4].
.
[1]: https://gcc.gnu.org/onlinedocs/gcc/Half-Precision.html
[2]: https://wiki.debian.org/ArchitectureSpecificsMemo#i386-1
[3]: https://gcc.gnu.org/g:9a19fa8b616f83474c35cc5b34a3865073ced829
[4]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1076986
Author: Dmitry Shachnev <mitya57@debian.org>
Forwarded: https://codereview.qt-project.org/c/qt/qtbase/+/579205
Last-Update: 2024-08-01
--- a/src/corelib/global/qtypes.h
+++ b/src/corelib/global/qtypes.h
@@ -263,13 +263,12 @@ using NativeFloat16Type = std::float16_t
// disabled due to https://github.com/llvm/llvm-project/issues/56963
# define QFLOAT16_IS_NATIVE 1
using NativeFloat16Type = decltype(__FLT16_MAX__);
-#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__)
+#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__) && defined(__ARM_FP16_FORMAT_IEEE)
# define QFLOAT16_IS_NATIVE 1
-# ifdef __ARM_FP16_FORMAT_IEEE
using NativeFloat16Type = __fp16;
-# else
+#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__) && defined(__SSE2__)
+# define QFLOAT16_IS_NATIVE 1
using NativeFloat16Type = _Float16;
-# endif
#else
# define QFLOAT16_IS_NATIVE 0
using NativeFloat16Type = void;
Write Preview
Loading…
Cancel
Save