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-11-02 22:30:10 -03:00
parent 476a2655b0
commit 182699f2da
9 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -7,6 +7,7 @@ qt6-base (6.6.0+dfsg-5) UNRELEASED; urgency=medium
These set QT_SKIP_AUTO_PLUGIN_INCLUSION and
QT_SKIP_AUTO_QML_PLUGIN_INCLUSION to ON by default, thus avoiding
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

12
debian/patches/Add-SH-detection.patch vendored
View File

@ -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
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
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 @@
---
src/corelib/global/qprocessordetection.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- 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.
*/

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

@ -6,7 +6,7 @@ Description: Don't use yield on CPUs that might not support it
--- a/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://gcc.gnu.org/bugzilla/show_bug.cgi?id=105416
*/

2
debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch vendored
View File

@ -14,7 +14,7 @@ https://reproducible-builds.org/docs/build-path/
--- a/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
"Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE)

9
debian/patches/cross.patch vendored
View File

@ -1,11 +1,12 @@
---
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 --
examples/sql/CMakeLists.txt | 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
+++ 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")
if(NOT pkg_config_enabled)
qt_build_internals_disable_pkg_config()
@ -22,12 +23,12 @@
PURPOSE "The Android deployment tool automates the process of creating Android packages."
- CONDITION NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression AND QT_FEATURE_settings)
+ CONDITION (QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING) AND QT_FEATURE_regularexpression)
qt_feature("macdeployqt" PRIVATE
SECTION "Deployment"
--- a/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)
endif()

4
debian/patches/enable_skip_plugins.patch vendored
View File

@ -25,7 +25,7 @@ Forwarded: not-needed
+ set(QT_SKIP_AUTO_PLUGIN_INCLUSION ON)
endif()
message(STATUS "Skip auto plugin inclusion is set to ${QT_SKIP_AUTO_PLUGIN_INCLUSION}")
if(QT_REPO_MODULE_VERSION)
--- a/cmake/QtPostProcessHelpers.cmake
+++ b/cmake/QtPostProcessHelpers.cmake
@@ -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)
endif()
message(STATUS \"Skip auto QML plugin inclusion is set to \${QT_SKIP_AUTO_QML_PLUGIN_INCLUSION}\")
if(QT_REPO_MODULE_VERSION)

10
debian/patches/forkfd_grow_stack_upwards_on_hppa.patch vendored
View File

@ -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>
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
@@ -168,7 +168,12 @@
---
src/3rdparty/forkfd/forkfd_linux.c | 5 +++++
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;

8
debian/patches/libxkbcommon_1.6.0.diff vendored
View File

@ -13,11 +13,13 @@ Change-Id: I55861868f2bb29c553d68365fa9b9b6ed01c9aea
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
+++ 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_capital_schwa, Qt::Key_Dead_Capital_Schwa>,
Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>,

4
debian/patches/remove_rpath_from_examples.patch vendored
View File

@ -11,12 +11,12 @@ Last-Update: 2023-10-10
--- a/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
# 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