[neon/qt6/qt6-base/Neon/release] debian/patches: Revert "backport patch to help qtlottie plugin biz"
Carlos De Maine
null at kde.org
Tue Nov 18 02:36:07 GMT 2025
Git commit e2347823918e1f392c68426e2c40b1986a7eb3b2 by Carlos De Maine.
Committed on 18/11/2025 at 02:36.
Pushed by carlosdem into branch 'Neon/release'.
Revert "backport patch to help qtlottie plugin biz"
This reverts commit f8c99ffe6208d466218ce613cb53e8987e09ea27.
D +0 -151 debian/patches/983e958989811e207a6a75ff4b34efe38ff43ccd.patch
M +0 -1 debian/patches/series
https://invent.kde.org/neon/qt6/qt6-base/-/commit/e2347823918e1f392c68426e2c40b1986a7eb3b2
diff --git a/debian/patches/983e958989811e207a6a75ff4b34efe38ff43ccd.patch b/debian/patches/983e958989811e207a6a75ff4b34efe38ff43ccd.patch
deleted file mode 100644
index 55587ce..0000000
--- a/debian/patches/983e958989811e207a6a75ff4b34efe38ff43ccd.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 983e958989811e207a6a75ff4b34efe38ff43ccd Mon Sep 17 00:00:00 2001
-From: Alexandru Croitor <alexandru.croitor at qt.io>
-Date: Fri, 26 Sep 2025 14:10:01 +0200
-Subject: [PATCH] CMake: Handle internal modules in
- qt_internal_wrap_private_modules
-
-If a Qt module A linked against an internal module B privately, we
-accidentally find_package()'d B when a user project looks for A.
-
-Such a case happened with QtLocation which links to
-QuickShapesPrivate.
-
-This happens because qt_internal_wrap_private_modules only wraps
-dependencies with $<BUILD_INTERFACE> if the dependency has the
-_qt_is_private_module property set, which internal modules don't have.
-This means we passed the internal module to
-qt_internal_register_target_dependencies which then adds a
-find_dependency() call for it.
-
-Add code to check for the _qt_is_internal_module property and wrap
-such a target dependency in $<BUILD_INTERFACE>, but only if it the
-consuming target is not a STATIC library.
-In the STATIC case, adding the genex would break user builds,
-because the internal module would never be looked up, even though it
-needs to be further propagated to the final consuming executable
-or shared library. This also means that we will look up the Private
-module in that case, but we can't do much about that.
-
-Amends ad7b94e163ac5c3959a7e38d7f48536be288a187
-
-Change-Id: Id89ea5bf6de8cb343c2afc0a42fd758cf57aba54
-Reviewed-by: Joerg Bornemann <joerg.bornemann at qt.io>
-(cherry picked from commit c5123bb03d8061478c1c0b1691faeb03b05ff386)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot at qt-project.org>
----
- cmake/QtPluginHelpers.cmake | 6 +++--
- cmake/QtTargetHelpers.cmake | 46 ++++++++++++++++++++++++++++++++-----
- 2 files changed, 44 insertions(+), 8 deletions(-)
-
-diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake
-index 28a2bc36cc6..1274dee2b3d 100644
---- a/cmake/QtPluginHelpers.cmake
-+++ b/cmake/QtPluginHelpers.cmake
-@@ -343,8 +343,10 @@ function(qt_internal_add_plugin target)
- list(APPEND qt_register_target_dependencies_args PUBLIC ${arg_PUBLIC_LIBRARIES})
- endif()
- if(qt_libs_private)
-- qt_internal_wrap_private_modules(qt_libs_private ${qt_libs_private})
-- list(APPEND qt_register_target_dependencies_args PRIVATE ${qt_libs_private})
-+ qt_internal_wrap_private_modules("${target}"
-+ OUT_VAR qt_libs_private
-+ LIBRARIES ${qt_libs_private})
-+ list(APPEND qt_register_target_depentdencies_args PRIVATE ${qt_libs_private})
- endif()
- qt_internal_register_target_dependencies("${target}"
- ${qt_register_target_dependencies_args})
-diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake
-index 312138dc858..632fb5b5644 100644
---- a/cmake/QtTargetHelpers.cmake
-+++ b/cmake/QtTargetHelpers.cmake
-@@ -151,7 +151,9 @@ function(qt_internal_extend_target target)
-
- list(TRANSFORM arg_PUBLIC_LIBRARIES REPLACE "^Qt::" "${QT_CMAKE_EXPORT_NAMESPACE}::")
- list(TRANSFORM arg_LIBRARIES REPLACE "^Qt::" "${QT_CMAKE_EXPORT_NAMESPACE}::")
-- qt_internal_wrap_private_modules(arg_LIBRARIES ${arg_LIBRARIES})
-+ qt_internal_wrap_private_modules("${target}"
-+ OUT_VAR arg_LIBRARIES
-+ LIBRARIES ${arg_LIBRARIES})
-
- # Set-up the target
-
-@@ -357,7 +359,8 @@ function(qt_internal_extend_target target)
- endif()
- endfunction()
-
--# Takes an output variable and a list of libraries.
-+# Takes the consuming target, an output variable and a list of libraries that the consuming target
-+# links to.
- #
- # Every library that is a private module is wrapped in $<BUILD_INTERFACE> or
- # $<BUILD_LOCAL_INTERFACE> if CMake is new enough.
-@@ -365,7 +368,28 @@ endfunction()
- # This is necessary for static builds, because if Qt6Foo links to Qt6BarPrivate, this link
- # dependency is purely internal. If we don't do this, CMake adds a target check for Qt6BarPrivate
- # in Qt6FooTargets.cmake. This breaks if Qt6BarPrivate is not find_package'ed before.
--function(qt_internal_wrap_private_modules out_var)
-+#
-+# Every library that is an internal module is wrapped in a similar way, unless the consuming target
-+# is STATIC, in which case the internal module is added as-is, otherwise linking would fail.
-+# That's because internal modules are private modules that don't have a public counterpart, so
-+# if we don't export the linkage, user builds will fail. In this case it's preferable to find
-+# the Private package, rather than fail the build.
-+function(qt_internal_wrap_private_modules target)
-+ set(option_args "")
-+ set(single_args
-+ OUT_VAR
-+ )
-+ set(multi_args
-+ LIBRARIES
-+ )
-+
-+ cmake_parse_arguments(PARSE_ARGV 1 arg
-+ "${option_args}"
-+ "${single_args}"
-+ "${multi_args}"
-+ )
-+ _qt_internal_validate_all_args_are_parsed(arg)
-+
- set(result "")
-
- if(CMAKE_VERSION VERSION_LESS "3.26")
-@@ -374,24 +398,34 @@ function(qt_internal_wrap_private_modules out_var)
- set(wrapper_genex "BUILD_LOCAL_INTERFACE")
- endif()
-
-- foreach(lib IN LISTS ARGN)
-+ get_target_property(target_type "${target}" TYPE)
-+
-+ foreach(lib IN LISTS arg_LIBRARIES)
- if(TARGET "${lib}")
- get_target_property(lib_is_private_module ${lib} _qt_is_private_module)
-+ get_target_property(lib_is_internal_module ${lib} _qt_is_internal_module)
-+
- if(lib_is_private_module)
- # Add the public module as non-wrapped link dependency. This is necessary for
- # targets that link only to the private module. Consumers of this target would then
- # get a linker error about missing symbols from that Qt module.
- get_target_property(lib_public_module_target ${lib} _qt_public_module_target_name)
- list(APPEND result "${INSTALL_CMAKE_NAMESPACE}::${lib_public_module_target}")
-+ endif()
-
-- # Wrap the private module in BUILD_LOCAL_INTERFACE.
-+ if(lib_is_private_module
-+ OR
-+ (lib_is_internal_module
-+ AND NOT target_type STREQUAL "STATIC_LIBRARY")
-+ )
-+ # Wrap the private or internal module in BUILD_LOCAL_INTERFACE.
- set(lib "$<${wrapper_genex}:${lib}>")
- endif()
- endif()
- list(APPEND result "${lib}")
- endforeach()
-
-- set("${out_var}" "${result}" PARENT_SCOPE)
-+ set("${arg_OUT_VAR}" "${result}" PARENT_SCOPE)
- endfunction()
-
- # Given CMAKE_CONFIG and ALL_CMAKE_CONFIGS, determines if a directory suffix needs to be appended
---
-GitLab
diff --git a/debian/patches/series b/debian/patches/series
index 5f62ec7..6693071 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
# Neon added
0001-fix-slow-scrolling-on-wayland.patch
-983e958989811e207a6a75ff4b34efe38ff43ccd.patch
# Needs to be fixed upstream.
Add-SH-detection.patch
More information about the Neon-commits
mailing list