[neon/qt6/qt6-base/Neon/release] debian/patches: refresh patches

[Carlos De Maine]

Git commit 1946a6c3d12c7f871c4e799077f9d8909b10cd35 by Carlos De Maine.
Committed on 24/07/2024 at 23:56.
Pushed by carlosdem into branch 'Neon/release'.

refresh patches

M  +3    -25   debian/patches/be_verbose_on_plugin_inclusion.patch

https://invent.kde.org/neon/qt6/qt6-base/-/commit/1946a6c3d12c7f871c4e799077f9d8909b10cd35

diff --git a/debian/patches/be_verbose_on_plugin_inclusion.patch b/debian/patches/be_verbose_on_plugin_inclusion.patch
index fde379b..5b62a6d 100644
--- a/debian/patches/be_verbose_on_plugin_inclusion.patch
+++ b/debian/patches/be_verbose_on_plugin_inclusion.patch
@@ -37,11 +37,9 @@ Gerrit: https://codereview.qt-project.org/c/qt/qtbase/+/515440
  cmake/QtPostProcessHelpers.cmake | 9 +++++++++
  2 files changed, 18 insertions(+)
 
-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
+--- a/cmake/QtPlugins.cmake.in
++++ b/cmake/QtPlugins.cmake.in
+@@ -9,6 +9,15 @@
      set(QT_SKIP_AUTO_PLUGIN_INCLUSION OFF)
  endif()
  
@@ -57,23 +55,3 @@ Index: qtbase-everywhere-src-6.7.0/cmake/QtPlugins.cmake.in
  if(NOT QT_NO_CREATE_TARGETS AND NOT QT_SKIP_AUTO_PLUGIN_INCLUSION)
      __qt_internal_include_plugin_packages(@QT_MODULE@)
  endif()
-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)
-+    set(QT_SKIP_AUTO_QML_PLUGIN_INCLUSION OFF)
-+endif()
-+
-+if(QT_REPO_MODULE_VERSION)
-+    message(STATUS \"Skip auto QML plugin inclusion is set to \${QT_SKIP_AUTO_QML_PLUGIN_INCLUSION}\")
-+endif()
-+
- 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.