[neon/qt6/qt6-base/Neon/release] debian/patches: update patches for Qt 6.7
Jonathan Riddell
null at kde.org
Tue Apr 2 17:13:12 BST 2024
Git commit 50233b45dd51d3931f0039fcdd2c7397ee1b7e3a by Jonathan Riddell.
Committed on 02/04/2024 at 16:13.
Pushed by jriddell into branch 'Neon/release'.
update patches for Qt 6.7
D +0 -18 debian/patches/armel-noyield.patch
M +14 -10 debian/patches/be_verbose_on_plugin_inclusion.patch
M +5 -3 debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch
M +10 -6 debian/patches/enable_skip_plugins.patch
M +0 -3 debian/patches/series
https://invent.kde.org/neon/qt6/qt6-base/-/commit/50233b45dd51d3931f0039fcdd2c7397ee1b7e3a
diff --git a/debian/patches/armel-noyield.patch b/debian/patches/armel-noyield.patch
deleted file mode 100644
index 6cdf4a3..0000000
--- a/debian/patches/armel-noyield.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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
-@@ -417,7 +417,9 @@
- https://stackoverflow.com/a/70076751/134841
- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105416
- */
-+# if !defined(Q_CC_GNU) || (__ARM_ARCH >= 7)
- asm volatile("yield"); /* this works everywhere */
-+# endif
- # else
- __yield(); /* this is what should work everywhere */
- # endif
diff --git a/debian/patches/be_verbose_on_plugin_inclusion.patch b/debian/patches/be_verbose_on_plugin_inclusion.patch
index 08bb76e..fde379b 100644
--- a/debian/patches/be_verbose_on_plugin_inclusion.patch
+++ b/debian/patches/be_verbose_on_plugin_inclusion.patch
@@ -37,11 +37,13 @@ Gerrit: https://codereview.qt-project.org/c/qt/qtbase/+/515440
cmake/QtPostProcessHelpers.cmake | 9 +++++++++
2 files changed, 18 insertions(+)
---- a/cmake/QtPlugins.cmake.in
-+++ b/cmake/QtPlugins.cmake.in
-@@ -1,6 +1,15 @@
- include_guard(DIRECTORY)
- @QT_MODULE_PLUGIN_INCLUDES@
+Index: qtbase-everywhere-src-6.7.0/cmake/QtPlugins.cmake.in
+===================================================================
+--- qtbase-everywhere-src-6.7.0.orig/cmake/QtPlugins.cmake.in
++++ qtbase-everywhere-src-6.7.0/cmake/QtPlugins.cmake.in
+@@ -9,6 +9,15 @@ if(NOT DEFINED QT_SKIP_AUTO_PLUGIN_INCLU
+ set(QT_SKIP_AUTO_PLUGIN_INCLUSION OFF)
+ endif()
+# Distributions should probably change this default.
+if(NOT DEFINED QT_SKIP_AUTO_PLUGIN_INCLUSION)
@@ -55,11 +57,13 @@ Gerrit: https://codereview.qt-project.org/c/qt/qtbase/+/515440
if(NOT QT_NO_CREATE_TARGETS AND NOT QT_SKIP_AUTO_PLUGIN_INCLUSION)
__qt_internal_include_plugin_packages(@QT_MODULE@)
endif()
---- a/cmake/QtPostProcessHelpers.cmake
-+++ b/cmake/QtPostProcessHelpers.cmake
-@@ -446,6 +446,15 @@
- # TODO: Find a better way to deal with this, perhaps by using find_package() instead of include
- # for the Qml PluginConfig.cmake files.
+Index: qtbase-everywhere-src-6.7.0/cmake/QtPostProcessHelpers.cmake
+===================================================================
+--- qtbase-everywhere-src-6.7.0.orig/cmake/QtPostProcessHelpers.cmake
++++ qtbase-everywhere-src-6.7.0/cmake/QtPostProcessHelpers.cmake
+@@ -451,6 +451,15 @@ if(NOT DEFINED QT_SKIP_AUTO_QML_PLUGIN_I
+ set(QT_SKIP_AUTO_QML_PLUGIN_INCLUSION OFF)
+ endif()
+# Distributions should probably change this default.
+if(NOT DEFINED QT_SKIP_AUTO_QML_PLUGIN_INCLUSION)
diff --git a/debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch b/debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch
index 737dfc0..314fb80 100644
--- a/debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch
+++ b/debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch
@@ -12,9 +12,11 @@ https://reproducible-builds.org/docs/build-path/
cmake/QtBuildInternalsExtra.cmake.in | 3 ---
1 file changed, 3 deletions(-)
---- a/cmake/QtBuildInternalsExtra.cmake.in
-+++ b/cmake/QtBuildInternalsExtra.cmake.in
-@@ -74,9 +74,6 @@
+Index: qtbase-everywhere-src-6.7.0/cmake/QtBuildInternalsExtra.cmake.in
+===================================================================
+--- qtbase-everywhere-src-6.7.0.orig/cmake/QtBuildInternalsExtra.cmake.in
++++ qtbase-everywhere-src-6.7.0/cmake/QtBuildInternalsExtra.cmake.in
+@@ -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)
diff --git a/debian/patches/enable_skip_plugins.patch b/debian/patches/enable_skip_plugins.patch
index 3b15019..520b89a 100644
--- a/debian/patches/enable_skip_plugins.patch
+++ b/debian/patches/enable_skip_plugins.patch
@@ -15,9 +15,11 @@ Forwarded: not-needed
cmake/QtPostProcessHelpers.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---- a/cmake/QtPlugins.cmake.in
-+++ b/cmake/QtPlugins.cmake.in
-@@ -3,7 +3,7 @@
+Index: qtbase-everywhere-src-6.7.0/cmake/QtPlugins.cmake.in
+===================================================================
+--- qtbase-everywhere-src-6.7.0.orig/cmake/QtPlugins.cmake.in
++++ qtbase-everywhere-src-6.7.0/cmake/QtPlugins.cmake.in
+@@ -11,7 +11,7 @@ endif()
# Distributions should probably change this default.
if(NOT DEFINED QT_SKIP_AUTO_PLUGIN_INCLUSION)
@@ -26,9 +28,11 @@ Forwarded: not-needed
endif()
if(QT_REPO_MODULE_VERSION)
---- a/cmake/QtPostProcessHelpers.cmake
-+++ b/cmake/QtPostProcessHelpers.cmake
-@@ -448,7 +448,7 @@
+Index: qtbase-everywhere-src-6.7.0/cmake/QtPostProcessHelpers.cmake
+===================================================================
+--- qtbase-everywhere-src-6.7.0.orig/cmake/QtPostProcessHelpers.cmake
++++ qtbase-everywhere-src-6.7.0/cmake/QtPostProcessHelpers.cmake
+@@ -453,7 +453,7 @@ endif()
# Distributions should probably change this default.
if(NOT DEFINED QT_SKIP_AUTO_QML_PLUGIN_INCLUSION)
diff --git a/debian/patches/series b/debian/patches/series
index 9fc1d27..13dd96e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,6 +13,3 @@ enable_skip_plugins.patch
forkfd_grow_stack_upwards_on_hppa.patch
remove_privacy_breaches.diff
remove_rpath_from_examples.patch
-
-# Don't use yield on CPUs that might not support it
-armel-noyield.patch
More information about the Neon-commits
mailing list