[neon/qt6/qt6-base/Neon/release] debian/patches: refresh patches
Carlos De Maine
null at kde.org
Fri Feb 16 08:14:52 GMT 2024
Git commit 89d50086f9ab9e88b693fa4ccdbc72b5351204f3 by Carlos De Maine.
Committed on 16/02/2024 at 08:14.
Pushed by carlosdem into branch 'Neon/release'.
refresh patches
M +3 -10 debian/patches/be_verbose_on_plugin_inclusion.patch
M +1 -12 debian/patches/cross.patch
M +6 -6 debian/patches/enable_skip_plugins.patch
D +0 -22 debian/patches/remove_rpath_from_examples.patch
M +0 -1 debian/patches/series
https://invent.kde.org/neon/qt6/qt6-base/-/commit/89d50086f9ab9e88b693fa4ccdbc72b5351204f3
diff --git a/debian/patches/be_verbose_on_plugin_inclusion.patch b/debian/patches/be_verbose_on_plugin_inclusion.patch
index f618366..08bb76e 100644
--- a/debian/patches/be_verbose_on_plugin_inclusion.patch
+++ b/debian/patches/be_verbose_on_plugin_inclusion.patch
@@ -37,14 +37,12 @@ Gerrit: https://codereview.qt-project.org/c/qt/qtbase/+/515440
cmake/QtPostProcessHelpers.cmake | 9 +++++++++
2 files changed, 18 insertions(+)
-diff --git a/cmake/QtPlugins.cmake.in b/cmake/QtPlugins.cmake.in
-index 405d5f37b9..c951eaae42 100644
--- a/cmake/QtPlugins.cmake.in
+++ b/cmake/QtPlugins.cmake.in
@@ -1,6 +1,15 @@
include_guard(DIRECTORY)
@QT_MODULE_PLUGIN_INCLUDES@
-
+
+# Distributions should probably change this default.
+if(NOT DEFINED QT_SKIP_AUTO_PLUGIN_INCLUSION)
+ set(QT_SKIP_AUTO_PLUGIN_INCLUSION OFF)
@@ -57,14 +55,12 @@ index 405d5f37b9..c951eaae42 100644
if(NOT QT_NO_CREATE_TARGETS AND NOT QT_SKIP_AUTO_PLUGIN_INCLUSION)
__qt_internal_include_plugin_packages(@QT_MODULE@)
endif()
-diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake
-index 83bcabe49b..82a88565a6 100644
--- a/cmake/QtPostProcessHelpers.cmake
+++ b/cmake/QtPostProcessHelpers.cmake
-@@ -446,6 +446,15 @@ function(qt_internal_create_plugins_auto_inclusion_files)
+@@ -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.
-
+
+# Distributions should probably change this default.
+if(NOT DEFINED QT_SKIP_AUTO_QML_PLUGIN_INCLUSION)
+ set(QT_SKIP_AUTO_QML_PLUGIN_INCLUSION OFF)
@@ -77,6 +73,3 @@ index 83bcabe49b..82a88565a6 100644
file(GLOB __qt_qml_plugins_config_file_list \"\${CMAKE_CURRENT_LIST_DIR}/QmlPlugins/${INSTALL_CMAKE_NAMESPACE}*Config.cmake\")
if (__qt_qml_plugins_config_file_list AND NOT QT_SKIP_AUTO_QML_PLUGIN_INCLUSION)
# First round of inclusions ensure all qml plugin targets are brought into scope.
---
-2.42.0
-
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
index ee464d0..08193ce 100644
--- a/debian/patches/cross.patch
+++ b/debian/patches/cross.patch
@@ -1,18 +1,7 @@
----
+ ---
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
-@@ -170,8 +170,6 @@
- set(FEATURE_pkg_config "${pkg_config_enabled}" CACHE STRING "Using pkg-config")
- if(NOT pkg_config_enabled)
- qt_build_internals_disable_pkg_config()
-- else()
-- unset(PKG_CONFIG_EXECUTABLE CACHE)
- endif()
- endfunction()
--- a/src/tools/configure.cmake
+++ b/src/tools/configure.cmake
diff --git a/debian/patches/enable_skip_plugins.patch b/debian/patches/enable_skip_plugins.patch
index cf1a9da..3b15019 100644
--- a/debian/patches/enable_skip_plugins.patch
+++ b/debian/patches/enable_skip_plugins.patch
@@ -17,23 +17,23 @@ Forwarded: not-needed
--- a/cmake/QtPlugins.cmake.in
+++ b/cmake/QtPlugins.cmake.in
-@@ -3,7 +3,7 @@ include_guard(DIRECTORY)
-
+@@ -3,7 +3,7 @@
+
# 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(QT_REPO_MODULE_VERSION)
--- a/cmake/QtPostProcessHelpers.cmake
+++ b/cmake/QtPostProcessHelpers.cmake
-@@ -448,7 +448,7 @@ function(qt_internal_create_plugins_auto
-
+@@ -448,7 +448,7 @@
+
# 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()
-
+
if(QT_REPO_MODULE_VERSION)
diff --git a/debian/patches/remove_rpath_from_examples.patch b/debian/patches/remove_rpath_from_examples.patch
deleted file mode 100644
index e15da13..0000000
--- a/debian/patches/remove_rpath_from_examples.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: remove RPATH/RUNPATH from examples' binaries.
- On Debian the examples are built against system's libraries, so there is no
- need to set RPATH/RUNPATH.
-Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Forwarded: not-needed
-Last-Update: 2023-07-23
-
----
- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-@@ -979,7 +979,7 @@
- # 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
diff --git a/debian/patches/series b/debian/patches/series
index 8f99837..e360fc9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,6 @@ be_verbose_on_plugin_inclusion.patch
remove_privacy_breaches.diff
build_path_embedded_qtbuildinternalsextra_cmake.patch
cross.patch
-remove_rpath_from_examples.patch
forkfd_grow_stack_upwards_on_hppa.patch
enable_skip_plugins.patch
More information about the Neon-commits
mailing list