[neon/qt6/pyside6/Neon/unstable] debian/patches: refresh patch
Carlos De Maine
null at kde.org
Thu May 21 21:32:23 BST 2026
Git commit 4b720c0ba93b04f6ccdebaa2c2c093a2cb8f48aa by Carlos De Maine.
Committed on 21/05/2026 at 20:32.
Pushed by carlosdem into branch 'Neon/unstable'.
refresh patch
M +351 -48 debian/patches/0001-Fix-installation.patch
https://invent.kde.org/neon/qt6/pyside6/-/commit/4b720c0ba93b04f6ccdebaa2c2c093a2cb8f48aa
diff --git a/debian/patches/0001-Fix-installation.patch b/debian/patches/0001-Fix-installation.patch
index 8a1b595..676b16a 100644
--- a/debian/patches/0001-Fix-installation.patch
+++ b/debian/patches/0001-Fix-installation.patch
@@ -1,57 +1,360 @@
-From c069622d35a00485742b125caf9439b31b1b972f Mon Sep 17 00:00:00 2001
-From: Christophe Marin <christophe at krop.fr>
-Date: Tue, 7 Oct 2025 15:54:32 +0200
-Subject: [PATCH] Fix installation
-
-Upstream decided to install files in non-standard locations.
----
- sources/pyside6/CMakeLists.txt | 2 +-
- sources/shiboken6/generator/CMakeLists.txt | 4 ++--
- sources/shiboken6/libshiboken/CMakeLists.txt | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/sources/pyside6/CMakeLists.txt b/sources/pyside6/CMakeLists.txt
-index 6b73d70..74aaba5 100644
---- a/sources/pyside6/CMakeLists.txt
-+++ b/sources/pyside6/CMakeLists.txt
-@@ -40,7 +40,7 @@ install(EXPORT PySide6Targets
- if(NOT is_pyside6_superproject_build)
- install(EXPORT PySide6WheelTargets
- NAMESPACE PySide6::
-- DESTINATION "${LIB_INSTALL_DIR}/wheels/cmake/PySide6"
-+ DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide6"
- FILE PySide6Targets.cmake)
- endif()
+diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
+index 59c63fda3b84181fa876fd731bd4f3810795d968..1d8ec9f0837d3e28d2af0b0472a728cdaae11d0d 100644
+--- a/build_scripts/platforms/unix.py
++++ b/build_scripts/platforms/unix.py
+@@ -109,10 +109,11 @@ def prepare_packages_posix(pyside_build, _vars, cross_build=False):
+ force=False, _vars=_vars)
+
+ if config.is_internal_shiboken_module_build() or config.is_internal_pyside_build():
+- # <install>/{cmake_package_name}/include/* -> <package_for_wheels>/{st_package_name}/include
++ # <install>/include/{cmake_package_name}/* ->
++ # <package_for_wheels>/{st_package_name}/include/{cmake_package_name}
+ copydir(
+- "{install_dir}/{cmake_package_name}/include",
+- destination_dir / "include",
++ "{install_dir}/include/{cmake_package_name}",
++ destination_dir / "include" / _vars["cmake_package_name"],
+ _vars=_vars)
+
+ if config.is_internal_pyside_build():
+diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py
+index 55b92873a89a82750c5aa0f5a5490de9e9866737..3d5d53ff8390f163cdba9e93bc1abf07d867d05e 100644
+--- a/build_scripts/platforms/windows_desktop.py
++++ b/build_scripts/platforms/windows_desktop.py
+@@ -97,10 +97,11 @@ def prepare_packages_win32(pyside_build, _vars):
+ recursive=False, _vars=_vars)
+
+ if config.is_internal_shiboken_module_build() or config.is_internal_pyside_build():
+- # <install>/{cmake_package_name}/include/* -> <package_for_wheels>/{st_package_name}/include
++ # <install>/include/{cmake_package_name}/* ->
++ # <package_for_wheels>/{st_package_name}/include/{cmake_package_name}
+ copydir(
+- "{install_dir}/{cmake_package_name}/include",
+- destination_dir / "include",
++ "{install_dir}/include/{cmake_package_name}",
++ destination_dir / "include" / _vars["cmake_package_name"],
+ _vars=_vars)
+
+ if config.is_internal_pyside_build():
+diff --git a/examples/utils/pyside_config.py b/examples/utils/pyside_config.py
+index ec4cb61d1ed44cde18f4f70b199f0d550aa76942..536162fc9d9d6113b109c25587e5eb56b9679e06 100644
+--- a/examples/utils/pyside_config.py
++++ b/examples/utils/pyside_config.py
+@@ -273,9 +273,12 @@ def get_package_include_path(which_package):
+ if package_path is None:
+ return None
+
+- includes = f"{package_path}/include"
+-
+- return includes
++ # TODO: Switch to pathlib. Using this for consistency
++ pkg_name = os.path.basename(package_path)
++ subdir_path = f"{package_path}/include/{pkg_name}"
++ if os.path.isdir(subdir_path):
++ return subdir_path
++ return f"{package_path}/include"
-diff --git a/sources/shiboken6/generator/CMakeLists.txt b/sources/shiboken6/generator/CMakeLists.txt
-index 997468f..d0948d9 100644
---- a/sources/shiboken6/generator/CMakeLists.txt
-+++ b/sources/shiboken6/generator/CMakeLists.txt
-@@ -73,11 +73,11 @@ install(EXPORT "${package_name}Targets"
- if(NOT is_pyside6_superproject_build)
- install(TARGETS shiboken6
- EXPORT "${package_name}WheelTargets"
-- DESTINATION "shiboken6_generator")
-+ DESTINATION "${BIN_INSTALL_DIR}")
-
- install(EXPORT "${package_name}WheelTargets"
- NAMESPACE "Shiboken6::"
-- DESTINATION "${LIB_INSTALL_DIR}/wheels/cmake/${package_name}"
-+ DESTINATION "${LIB_INSTALL_DIR}/cmake/${package_name}"
- FILE "${package_name}Targets.cmake")
+
+ def get_package_qmake_lflags(which_package):
+diff --git a/sources/pyside6/PySide6/CMakeLists.txt b/sources/pyside6/PySide6/CMakeLists.txt
+index c1934d9ca7aa43eac44438f2033ca07b41c3125e..ccfa8430f12eaefc19609272afc269a28a35ef82 100644
+--- a/sources/pyside6/PySide6/CMakeLists.txt
++++ b/sources/pyside6/PySide6/CMakeLists.txt
+@@ -119,7 +119,7 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/widgets_common.xml
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/datavisualization_common.xml
+ DESTINATION share/PySide6${pyside_SUFFIX}/typesystems)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside6_global.h
+- DESTINATION ${BINDING_NAME}${pyside6_SUFFIX}/include)
++ DESTINATION include/${BINDING_NAME}${pyside6_SUFFIX})
+
+ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/QtAsyncio"
+ DESTINATION "${PYTHON_SITE_PACKAGES}/${BINDING_NAME}${pyside6_SUFFIX}")
+diff --git a/sources/pyside6/PySide6/QtCore/CMakeLists.txt b/sources/pyside6/PySide6/QtCore/CMakeLists.txt
+index 997b0fe0dff35e70b03a9b6e7b75e5d4fe3d3616..ac6b451e64e3812c6c6b2ee3ac6e2ddbabe48b65 100644
+--- a/sources/pyside6/PySide6/QtCore/CMakeLists.txt
++++ b/sources/pyside6/PySide6/QtCore/CMakeLists.txt
+@@ -307,4 +307,4 @@ if (APPLE)
endif()
+ install(FILES ${pyside6_SOURCE_DIR}/qtcorehelper.h ${pyside6_SOURCE_DIR}/qiopipe.h
+- DESTINATION PySide6/include/QtCore/)
++ DESTINATION include/PySide6/QtCore/)
+diff --git a/sources/pyside6/PySide6/QtDBus/CMakeLists.txt b/sources/pyside6/PySide6/QtDBus/CMakeLists.txt
+index 49e86d1217389b3591c5a9accd7a36857de83317..5ee8dc67c08d384e11172cf6792363cd37399b0e 100644
+--- a/sources/pyside6/PySide6/QtDBus/CMakeLists.txt
++++ b/sources/pyside6/PySide6/QtDBus/CMakeLists.txt
+@@ -51,4 +51,4 @@ create_pyside_module(NAME QtDBus
+ TYPESYSTEM_PATH QtDBus_SOURCE_DIR
+ SOURCES QtDBus_SRC)
+
+-install(FILES ${pyside6_SOURCE_DIR}/qtdbushelper.h DESTINATION PySide6/include/QtDBus)
++install(FILES ${pyside6_SOURCE_DIR}/qtdbushelper.h DESTINATION include/PySide6/QtDBus)
+diff --git a/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt b/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt
+index 424799b225a7b64ebbc876599cb99b6582e5c6ec..1276b424f6fb6261dc043d356d2cb9ec64b46905 100644
+--- a/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt
++++ b/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt
+@@ -68,4 +68,4 @@ create_pyside_module(NAME QtDataVisualization
+ STATIC_SOURCES QtDataVisualization_src)
+
+ install(FILES ${pyside6_SOURCE_DIR}/qtdatavisualization_helper.h
+- DESTINATION PySide6/include/QtDataVisualization)
++ DESTINATION include/PySide6/QtDataVisualization)
+diff --git a/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt b/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt
+index 570ed0f0b154e9cd4c2d209077bb95c1d3eb93d7..e91532b87b228e7b26bf2c47c9208854638b3efc 100644
+--- a/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt
++++ b/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt
+@@ -67,4 +67,4 @@ create_pyside_module(NAME QtDesigner
+ STATIC_SOURCES QtDesigner_static_src
+ TYPESYSTEM_NAME ${QtDesigner_BINARY_DIR}/typesystem_designer.xml)
+
+-install(FILES ${pyside6_SOURCE_DIR}/qpydesignerextensions.h DESTINATION PySide6/include/QtDesigner)
++install(FILES ${pyside6_SOURCE_DIR}/qpydesignerextensions.h DESTINATION include/PySide6/QtDesigner)
+diff --git a/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt b/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt
+index 1846f59e61220ccf43d2b0628deabb864b8d3f2f..768960718e1551e3a75db0d74ba54863690cf9c4 100644
+--- a/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt
++++ b/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt
+@@ -97,4 +97,4 @@ create_pyside_module(NAME QtGraphs
+ DROPPED_ENTRIES QtGraphs_DROPPED_ENTRIES)
+
+ install(FILES ${pyside6_SOURCE_DIR}/qtgraphs_helper.h
+- DESTINATION PySide6/include/QtGraphs)
++ DESTINATION include/PySide6/QtGraphs)
+diff --git a/sources/pyside6/PySide6/QtGui/CMakeLists.txt b/sources/pyside6/PySide6/QtGui/CMakeLists.txt
+index 778b1d64170b2036e596d9dbc478739f2852ece6..3dd93803baac8dcefe5227e16d0b62b0d9109e0c 100644
+--- a/sources/pyside6/PySide6/QtGui/CMakeLists.txt
++++ b/sources/pyside6/PySide6/QtGui/CMakeLists.txt
+@@ -367,4 +367,4 @@ create_pyside_module(NAME QtGui
+
+ install(FILES ${pyside6_SOURCE_DIR}/qpytextobject.h
+ ${pyside6_SOURCE_DIR}/qtguihelper.h
+- DESTINATION PySide6/include/QtGui/)
++ DESTINATION include/PySide6/QtGui/)
+diff --git a/sources/pyside6/cmake/Macros/PySideModules.cmake b/sources/pyside6/cmake/Macros/PySideModules.cmake
+index c54b86994d9a30c330fa32bf2787f5cb72e2a28e..6dbc1fcf1b12835c13f9da35cc7086da807f908d 100644
+--- a/sources/pyside6/cmake/Macros/PySideModules.cmake
++++ b/sources/pyside6/cmake/Macros/PySideModules.cmake
+@@ -379,7 +379,7 @@ macro(create_pyside_module)
+
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide6/${module_NAME}/pyside6_${lower_module_name}_python.h
+- DESTINATION PySide6${pyside6_SUFFIX}/include/${module_NAME}/)
++ DESTINATION include/PySide6${pyside6_SUFFIX}/${module_NAME}/)
+ file(GLOB typesystem_files ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_*.xml ${typesystem_path})
+
+ # Copy typesystem files and remove module names from the <load-typesystem> element
+diff --git a/sources/pyside6/libpyside/CMakeLists.txt b/sources/pyside6/libpyside/CMakeLists.txt
+index 0fef50796daff3c0291271d25e4295fd5717b93c..56b1bfe6de7a1ffc0410c095c6bb19f6cc9bb82a 100644
+--- a/sources/pyside6/libpyside/CMakeLists.txt
++++ b/sources/pyside6/libpyside/CMakeLists.txt
+@@ -103,7 +103,6 @@ append_size_optimization_flags(pyside6)
+
+ target_include_directories(pyside6 PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+- $<INSTALL_INTERFACE:PySide6/include>
+ )
+
+ target_compile_definitions(pyside6 PRIVATE -DQT_LEAN_HEADERS=1 -DQT_NO_KEYWORDS=1)
+@@ -191,13 +190,14 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PySide6ConfigVersion.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/PySide6ConfigVersion.cmake" @ONLY)
+
+ install(FILES ${libpyside_HEADERS}
+- DESTINATION ${BINDING_NAME}${pyside6_SUFFIX}/include)
++ DESTINATION include/${BINDING_NAME}${pyside6_SUFFIX})
+
+ # build-time installation
+ install(TARGETS pyside6 EXPORT PySide6Targets
+ LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
+ ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
+- RUNTIME DESTINATION bin)
++ RUNTIME DESTINATION bin
++ INCLUDES DESTINATION "include/PySide6")
+
+ # wheel installation
+ set_target_properties(pyside6 PROPERTIES
+@@ -207,7 +207,8 @@ if(NOT is_pyside6_superproject_build)
+ install(TARGETS pyside6 EXPORT PySide6WheelTargets
+ LIBRARY DESTINATION "PySide6"
+ ARCHIVE DESTINATION "PySide6"
+- RUNTIME DESTINATION "PySide6")
++ RUNTIME DESTINATION "PySide6"
++ INCLUDES DESTINATION "pyside6/include/PySide6")
+
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/wheel/PySide6Config${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake"
+ DESTINATION "${LIB_INSTALL_DIR}/wheels/cmake/PySide6")
+diff --git a/sources/pyside6/libpysideqml/CMakeLists.txt b/sources/pyside6/libpysideqml/CMakeLists.txt
+index 4c6ef386cdc733c4e1e4843d755abc30d214d8c5..f2ebe515f70408c5ef9917e04cc27093db1a2454 100644
+--- a/sources/pyside6/libpysideqml/CMakeLists.txt
++++ b/sources/pyside6/libpysideqml/CMakeLists.txt
+@@ -86,7 +86,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T
+ qfp_strip_library("pyside6qml")
+
+ install(FILES ${libpysideqml_HEADERS}
+- DESTINATION ${BINDING_NAME}${pyside6qml_SUFFIX}/include)
++ DESTINATION include/${BINDING_NAME}${pyside6qml_SUFFIX})
+
+ #built-time installation
+ install(TARGETS pyside6qml EXPORT PySide6Targets
+diff --git a/sources/pyside6/libpysideremoteobjects/CMakeLists.txt b/sources/pyside6/libpysideremoteobjects/CMakeLists.txt
+index 4196eb367a8610469c695676188646830e266234..3857cd6bb7f50bc8ead14bf2513d00c858c4e329 100644
+--- a/sources/pyside6/libpysideremoteobjects/CMakeLists.txt
++++ b/sources/pyside6/libpysideremoteobjects/CMakeLists.txt
+@@ -80,7 +80,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_T
+ #
+
+ install(FILES ${libpysideremoteobjects_HEADERS}
+- DESTINATION ${BINDING_NAME}${pyside6remoteobjects_SUFFIX}/include)
++ DESTINATION include/${BINDING_NAME}${pyside6remoteobjects_SUFFIX})
+
+ install(TARGETS pyside6remoteobjects EXPORT PySide6RemoteObjectsTargets
+ LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
+diff --git a/sources/shiboken6/data/shiboken6.pc.in b/sources/shiboken6/data/shiboken6.pc.in
+index 917b706a3defb871d3ece50b07109c7e0a537440..a82d23168958f42e85d3359ce07881e0a32d07a9 100644
+--- a/sources/shiboken6/data/shiboken6.pc.in
++++ b/sources/shiboken6/data/shiboken6.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+ libdir=@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/shiboken6/include
++includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken6
+ python_interpreter=@Python_EXECUTABLE@
+ python_include_dir=@Python_INCLUDE_DIRS@
+
diff --git a/sources/shiboken6/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt
-index 973d14b..c4235f8 100644
+index d3fef1bed64f3a92808da6cf09f8b9dd421672dc..5713fe09cf5acba880a771fc31ed8fa7d20eb914 100644
--- a/sources/shiboken6/libshiboken/CMakeLists.txt
+++ b/sources/shiboken6/libshiboken/CMakeLists.txt
-@@ -217,6 +217,6 @@ if(NOT is_pyside6_superproject_build)
+@@ -115,7 +115,6 @@ endif()
+ target_include_directories(libshiboken PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+- $<INSTALL_INTERFACE:shiboken6/include>
+ )
+
+ if (NOT "${NUMPY_INCLUDE_DIR}" STREQUAL "")
+@@ -203,11 +202,12 @@ install(FILES
+ signature.h
+ signature_p.h
+
+- DESTINATION shiboken6${shiboken6_SUFFIX}/include)
++ DESTINATION include/shiboken6${shiboken6_SUFFIX})
+ install(TARGETS libshiboken EXPORT Shiboken6Targets
+ LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
+ ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
+- RUNTIME DESTINATION bin)
++ RUNTIME DESTINATION bin
++ INCLUDES DESTINATION "include/shiboken6")
+ install(EXPORT Shiboken6Targets NAMESPACE Shiboken6::
+ DESTINATION ${LIB_INSTALL_DIR}/cmake/Shiboken6)
+
+@@ -220,7 +220,8 @@ if(NOT is_pyside6_superproject_build)
+ install(TARGETS libshiboken EXPORT Shiboken6WheelTargets
+ LIBRARY DESTINATION "shiboken6"
+ ARCHIVE DESTINATION "shiboken6"
+- RUNTIME DESTINATION "shiboken6")
++ RUNTIME DESTINATION "shiboken6"
++ INCLUDES DESTINATION "shiboken6/include/shiboken6")
install(EXPORT Shiboken6WheelTargets
NAMESPACE Shiboken6::
-- DESTINATION "${LIB_INSTALL_DIR}/wheels/cmake/Shiboken6"
-+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6"
- FILE Shiboken6Targets.cmake)
- endif()
---
-2.51.0
+diff --git a/build_scripts/wheel_files.py b/build_scripts/wheel_files.py
+index db59a9f8146032dd563eb9a4d36a0e6275bc1bdc..103bd3481252bfd5f0248b384c0c60be8042d948 100644
+--- a/build_scripts/wheel_files.py
++++ b/build_scripts/wheel_files.py
+@@ -87,7 +87,7 @@ class ModuleData:
+ self.qml.append(f"Qt{self.name}")
+ self.pyi.append(f"Qt{self.name}.pyi")
+ self.typesystems.append(f"typesystem_{_lo}.xml")
+- self.include.append(f"Qt{self.name}/*.h")
++ self.include.append(f"PySide6/Qt{self.name}/*.h")
+ self.glue.append(f"qt{_lo}.cpp")
+ self.doc_glue.append(f"qt{_lo}.rst")
+ if not len(self.metatypes):
+@@ -250,7 +250,7 @@ def module_QtCore() -> ModuleData:
+ ]
+
+ data.typesystems.extend(_typesystems)
+- data.include.append("*.h")
++ data.include.append("PySide6/*.h")
+ if sys.platform == "win32":
+ data.qtlib.append("pyside6.*")
+ data.extra_files.append("qt.conf")
+@@ -319,7 +319,7 @@ def module_QtCore() -> ModuleData:
+
+ # add the include folders for libpyside binaries
+ # this is useful for downstream cmake projects like QtBridges
+- data.include.append("pyside6/*.h")
++ data.include.append("PySide6/*.h")
+
+ return data
+
+@@ -485,9 +485,9 @@ def module_QtQml() -> ModuleData:
+ ]
+
+ _include = [
+- "pysideqml.h",
+- "pysideqmlmacros.h",
+- "pysideqmlregistertype.h",
++ "PySide6/pysideqml.h",
++ "PySide6/pysideqmlmacros.h",
++ "PySide6/pysideqmlregistertype.h",
+ ]
+
+ _metatypes = [
+diff --git a/examples/utils/pyside_config.py b/examples/utils/pyside_config.py
+index 536162fc9d9d6113b109c25587e5eb56b9679e06..c8c37039f7049383e6dbba1e691b8428a471f4b8 100644
+--- a/examples/utils/pyside_config.py
++++ b/examples/utils/pyside_config.py
+@@ -276,9 +276,13 @@ def get_package_include_path(which_package):
+ # TODO: Switch to pathlib. Using this for consistency
+ pkg_name = os.path.basename(package_path)
+ subdir_path = f"{package_path}/include/{pkg_name}"
++ base_path = f"{package_path}/include"
+ if os.path.isdir(subdir_path):
+- return subdir_path
+- return f"{package_path}/include"
++ # Return both the sub-package dir and the base include dir so
++ # that both new and old wheel layout works (also system installation
++ # paths)
++ return f"{subdir_path} {base_path}"
++ return base_path
+
+
+ def get_package_qmake_lflags(which_package):
+diff --git a/sources/pyside6/libpyside/CMakeLists.txt b/sources/pyside6/libpyside/CMakeLists.txt
+index 56b1bfe6de7a1ffc0410c095c6bb19f6cc9bb82a..2e578a84aea5f9c1f5a101d8630e9cc6409ee545 100644
+--- a/sources/pyside6/libpyside/CMakeLists.txt
++++ b/sources/pyside6/libpyside/CMakeLists.txt
+@@ -208,7 +208,7 @@ if(NOT is_pyside6_superproject_build)
+ LIBRARY DESTINATION "PySide6"
+ ARCHIVE DESTINATION "PySide6"
+ RUNTIME DESTINATION "PySide6"
+- INCLUDES DESTINATION "pyside6/include/PySide6")
++ INCLUDES DESTINATION "PySide6/include/PySide6")
+
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/wheel/PySide6Config${SHIBOKEN_PYTHON_CONFIG_SUFFIX}.cmake"
+ DESTINATION "${LIB_INSTALL_DIR}/wheels/cmake/PySide6")
+diff --git a/sources/shiboken6_generator/data/Shiboken6ToolsMacros.cmake b/sources/shiboken6_generator/data/Shiboken6ToolsMacros.cmake
+index 27a2ec5337d1d5b314294741f1b438cc731ef6d8..5b159079096d7b86c4d18a2fd8246d9ff90d0069 100644
+--- a/sources/shiboken6_generator/data/Shiboken6ToolsMacros.cmake
++++ b/sources/shiboken6_generator/data/Shiboken6ToolsMacros.cmake
+@@ -25,11 +25,18 @@ function(shiboken_generator_create_binding)
+
+ get_target_property(shiboken_include_dirs Shiboken6::libshiboken INTERFACE_INCLUDE_DIRECTORIES)
+
+- # Get Shiboken path based on build type
++ # Get Shiboken path, falling back to the other config if the requested one is absent
++ # (e.g. consumer project is Release but wheel was built as Debug, or vice versa).
+ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+ get_target_property(shiboken_path Shiboken6::shiboken6 IMPORTED_LOCATION_DEBUG)
++ if(NOT shiboken_path)
++ get_target_property(shiboken_path Shiboken6::shiboken6 IMPORTED_LOCATION_RELEASE)
++ endif()
+ else()
+ get_target_property(shiboken_path Shiboken6::shiboken6 IMPORTED_LOCATION_RELEASE)
++ if(NOT shiboken_path)
++ get_target_property(shiboken_path Shiboken6::shiboken6 IMPORTED_LOCATION_DEBUG)
++ endif()
+ endif()
+
+ # Basic shiboken options
More information about the Neon-commits
mailing list