Refresh patches.

ci/unstable
Lisandro Damián Nicanor Pérez Meyer 1 year ago
parent 476a2655b0
commit 182699f2da

1
debian/changelog vendored

@ -7,6 +7,7 @@ qt6-base (6.6.0+dfsg-5) UNRELEASED; urgency=medium
These set QT_SKIP_AUTO_PLUGIN_INCLUSION and These set QT_SKIP_AUTO_PLUGIN_INCLUSION and
QT_SKIP_AUTO_QML_PLUGIN_INCLUSION to ON by default, thus avoiding QT_SKIP_AUTO_QML_PLUGIN_INCLUSION to ON by default, thus avoiding
unnecesary build dependencies on plugins. unnecesary build dependencies on plugins.
* Refresh patches.
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 01 Nov 2023 18:16:57 -0300 -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 01 Nov 2023 18:16:57 -0300

@ -7,11 +7,13 @@ Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1043225 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1043225
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
Index: qt6-base-6.4.2+dfsg/src/corelib/global/qprocessordetection.h ---
=================================================================== src/corelib/global/qprocessordetection.h | 12 ++++++------
--- qt6-base-6.4.2+dfsg.orig/src/corelib/global/qprocessordetection.h 1 file changed, 6 insertions(+), 6 deletions(-)
+++ qt6-base-6.4.2+dfsg/src/corelib/global/qprocessordetection.h
@@ -294,12 +294,12 @@ --- a/src/corelib/global/qprocessordetection.h
+++ b/src/corelib/global/qprocessordetection.h
@@ -311,12 +311,12 @@
SuperH is bi-endian, use endianness auto-detection implemented below. SuperH is bi-endian, use endianness auto-detection implemented below.
*/ */

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

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

@ -1,11 +1,12 @@
--- ---
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 -- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 --
examples/sql/CMakeLists.txt | 2 +-
src/tools/configure.cmake | 2 +- src/tools/configure.cmake | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-) 3 files changed, 2 insertions(+), 4 deletions(-)
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -151,8 +151,6 @@ function(qt_build_internals_disable_pkg_ @@ -170,8 +170,6 @@ function(qt_build_internals_disable_pkg_
set(FEATURE_pkg_config "${pkg_config_enabled}" CACHE STRING "Using pkg-config") set(FEATURE_pkg_config "${pkg_config_enabled}" CACHE STRING "Using pkg-config")
if(NOT pkg_config_enabled) if(NOT pkg_config_enabled)
qt_build_internals_disable_pkg_config() qt_build_internals_disable_pkg_config()
@ -27,7 +28,7 @@
SECTION "Deployment" SECTION "Deployment"
--- a/examples/sql/CMakeLists.txt --- a/examples/sql/CMakeLists.txt
+++ b/examples/sql/CMakeLists.txt +++ b/examples/sql/CMakeLists.txt
@@ -12,6 +12,6 @@ if(TARGET Qt::Xml) @@ -15,6 +15,6 @@ if(TARGET Qt6::Xml)
qt_internal_add_example(masterdetail) qt_internal_add_example(masterdetail)
endif() endif()

@ -25,7 +25,7 @@ Forwarded: not-needed
+ set(QT_SKIP_AUTO_PLUGIN_INCLUSION ON) + set(QT_SKIP_AUTO_PLUGIN_INCLUSION ON)
endif() endif()
message(STATUS "Skip auto plugin inclusion is set to ${QT_SKIP_AUTO_PLUGIN_INCLUSION}") if(QT_REPO_MODULE_VERSION)
--- a/cmake/QtPostProcessHelpers.cmake --- a/cmake/QtPostProcessHelpers.cmake
+++ b/cmake/QtPostProcessHelpers.cmake +++ b/cmake/QtPostProcessHelpers.cmake
@@ -448,7 +448,7 @@ function(qt_internal_create_plugins_auto @@ -448,7 +448,7 @@ function(qt_internal_create_plugins_auto
@ -36,4 +36,4 @@ Forwarded: not-needed
+ set(QT_SKIP_AUTO_QML_PLUGIN_INCLUSION ON) + set(QT_SKIP_AUTO_QML_PLUGIN_INCLUSION ON)
endif() endif()
message(STATUS \"Skip auto QML plugin inclusion is set to \${QT_SKIP_AUTO_QML_PLUGIN_INCLUSION}\") if(QT_REPO_MODULE_VERSION)

@ -6,9 +6,13 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1042018
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
Last-Update: 2023-07-28 Last-Update: 2023-07-28
--- ./src/3rdparty/forkfd/forkfd_linux.c.save 2023-07-27 12:04:02.940466337 +0000 ---
+++ ./src/3rdparty/forkfd/forkfd_linux.c 2023-07-27 12:06:53.522077424 +0000 src/3rdparty/forkfd/forkfd_linux.c | 5 +++++
@@ -168,7 +168,12 @@ 1 file changed, 5 insertions(+)
--- a/src/3rdparty/forkfd/forkfd_linux.c
+++ b/src/3rdparty/forkfd/forkfd_linux.c
@@ -169,7 +169,12 @@ int system_vforkfd(int flags, pid_t *ppi
} }
*system = 1; *system = 1;

@ -13,11 +13,13 @@ Change-Id: I55861868f2bb29c553d68365fa9b9b6ed01c9aea
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
--- ---
diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp ---
index 26d87c5..7b61179 100644 src/gui/platform/unix/qxkbcommon.cpp | 4 ++++
1 file changed, 4 insertions(+)
--- a/src/gui/platform/unix/qxkbcommon.cpp --- a/src/gui/platform/unix/qxkbcommon.cpp
+++ b/src/gui/platform/unix/qxkbcommon.cpp +++ b/src/gui/platform/unix/qxkbcommon.cpp
@@ -237,10 +237,14 @@ @@ -239,10 +239,14 @@ static constexpr const auto KeyTbl = qMa
Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>, Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>,
Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>, Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>,
Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>, Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>,

@ -11,7 +11,7 @@ Last-Update: 2023-10-10
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -981,7 +981,7 @@ macro(qt_examples_build_begin) @@ -979,7 +979,7 @@ macro(qt_examples_build_begin)
# This means that installed examples are not relocatable at the moment. We would need to # 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 # 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. # seems there's no way to query such information from CMake itself.

Loading…
Cancel
Save