[neon/qt6/pyside6/Neon/unstable] debian/patches: remove upstreamed patch
Carlos De Maine
null at kde.org
Thu May 21 21:39:34 BST 2026
Git commit a9b4657171a0147817cdd244126f8d8e1d882887 by Carlos De Maine.
Committed on 21/05/2026 at 20:39.
Pushed by carlosdem into branch 'Neon/unstable'.
remove upstreamed patch
D +0 -201 debian/patches/0001-Revert-Modify-headers-installation-for-CMake-builds.patch
M +0 -1 debian/patches/series
https://invent.kde.org/neon/qt6/pyside6/-/commit/a9b4657171a0147817cdd244126f8d8e1d882887
diff --git a/debian/patches/0001-Revert-Modify-headers-installation-for-CMake-builds.patch b/debian/patches/0001-Revert-Modify-headers-installation-for-CMake-builds.patch
deleted file mode 100644
index d24c410..0000000
--- a/debian/patches/0001-Revert-Modify-headers-installation-for-CMake-builds.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From 80632681335d0dbc4b801a513a78ed921bd5377c Mon Sep 17 00:00:00 2001
-From: Christophe Marin <christophe at krop.fr>
-Date: Tue, 7 Oct 2025 14:14:43 +0200
-Subject: [PATCH] Revert "Modify headers installation for CMake builds"
-
-/usr/include/ is the correct location for include headers.
-
----
- build_scripts/platforms/unix.py | 4 ++--
- build_scripts/platforms/windows_desktop.py | 7 ++++---
- sources/pyside6/PySide6/CMakeLists.txt | 2 +-
- sources/pyside6/PySide6/QtCore/CMakeLists.txt | 2 +-
- sources/pyside6/PySide6/QtDBus/CMakeLists.txt | 2 +-
- sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt | 2 +-
- sources/pyside6/PySide6/QtDesigner/CMakeLists.txt | 2 +-
- sources/pyside6/PySide6/QtGraphs/CMakeLists.txt | 2 +-
- sources/pyside6/PySide6/QtGui/CMakeLists.txt | 2 +-
- sources/pyside6/cmake/Macros/PySideModules.cmake | 2 +-
- sources/pyside6/libpyside/CMakeLists.txt | 4 ++--
- sources/pyside6/libpysideqml/CMakeLists.txt | 2 +-
- sources/pyside6/libpysideremoteobjects/CMakeLists.txt | 2 +-
- sources/shiboken6/data/shiboken6.pc.in | 2 +-
- sources/shiboken6/libshiboken/CMakeLists.txt | 4 ++--
- 15 files changed, 21 insertions(+), 20 deletions(-)
-
---- a/build_scripts/platforms/unix.py
-+++ b/build_scripts/platforms/unix.py
-@@ -108,10 +108,10 @@
- "{st_build_dir}/{st_package_name}/scripts/shiboken_tool.py",
- 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
-+ if config.is_internal_shiboken_generator_build() or config.is_internal_pyside_build():
-+ # <install>/include/* -> <setup>/include/{st_package_name}
- copydir(
-- "{install_dir}/{cmake_package_name}/include",
-+ "{install_dir}/include/{cmake_package_name}",
- destination_dir / "include",
- _vars=_vars)
-
---- a/build_scripts/platforms/windows_desktop.py
-+++ b/build_scripts/platforms/windows_desktop.py
-@@ -94,10 +94,11 @@
- _filter=pdbs,
- 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
-+ if config.is_internal_shiboken_generator_build() or config.is_internal_pyside_build():
-+ # <install>/include/* -> <setup>/{st_package_name}/include
-+
- copydir(
-- "{install_dir}/{cmake_package_name}/include",
-+ "{install_dir}/include/{cmake_package_name}",
- destination_dir / "include",
- _vars=_vars)
-
---- a/sources/pyside6/PySide6/CMakeLists.txt
-+++ b/sources/pyside6/PySide6/CMakeLists.txt
-@@ -119,7 +119,7 @@
- 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}")
---- a/sources/pyside6/PySide6/QtCore/CMakeLists.txt
-+++ b/sources/pyside6/PySide6/QtCore/CMakeLists.txt
-@@ -306,4 +306,4 @@
- endif()
-
- install(FILES ${pyside6_SOURCE_DIR}/qtcorehelper.h ${pyside6_SOURCE_DIR}/qiopipe.h
-- DESTINATION PySide6/include/QtCore/)
-+ DESTINATION include/PySide6/QtCore/)
---- a/sources/pyside6/PySide6/QtDBus/CMakeLists.txt
-+++ b/sources/pyside6/PySide6/QtDBus/CMakeLists.txt
-@@ -51,4 +51,4 @@
- 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)
---- a/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt
-+++ b/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt
-@@ -68,4 +68,4 @@
- STATIC_SOURCES QtDataVisualization_src)
-
- install(FILES ${pyside6_SOURCE_DIR}/qtdatavisualization_helper.h
-- DESTINATION PySide6/include/QtDataVisualization)
-+ DESTINATION include/PySide6/QtDataVisualization)
---- a/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt
-+++ b/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt
-@@ -67,4 +67,4 @@
- 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)
---- a/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt
-+++ b/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt
-@@ -96,4 +96,4 @@
- DROPPED_ENTRIES QtGraphs_DROPPED_ENTRIES)
-
- install(FILES ${pyside6_SOURCE_DIR}/qtgraphs_helper.h
-- DESTINATION PySide6/include/QtGraphs)
-+ DESTINATION include/PySide6/QtGraphs)
---- a/sources/pyside6/PySide6/QtGui/CMakeLists.txt
-+++ b/sources/pyside6/PySide6/QtGui/CMakeLists.txt
-@@ -366,4 +366,4 @@
-
- install(FILES ${pyside6_SOURCE_DIR}/qpytextobject.h
- ${pyside6_SOURCE_DIR}/qtguihelper.h
-- DESTINATION PySide6/include/QtGui/)
-+ DESTINATION include/PySide6/QtGui/)
---- a/sources/pyside6/cmake/Macros/PySideModules.cmake
-+++ b/sources/pyside6/cmake/Macros/PySideModules.cmake
-@@ -378,7 +378,7 @@
-
-
- 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
---- a/sources/pyside6/libpyside/CMakeLists.txt
-+++ b/sources/pyside6/libpyside/CMakeLists.txt
-@@ -101,7 +101,7 @@
-
- target_include_directories(pyside6 PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-- $<INSTALL_INTERFACE:PySide6/include>
-+ $<INSTALL_INTERFACE:include/PySide6>
- )
-
- target_compile_definitions(pyside6 PRIVATE -DQT_LEAN_HEADERS=1 -DQT_NO_KEYWORDS=1)
-@@ -177,7 +177,7 @@
- "${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
---- a/sources/pyside6/libpysideqml/CMakeLists.txt
-+++ b/sources/pyside6/libpysideqml/CMakeLists.txt
-@@ -84,7 +84,7 @@
- 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
---- a/sources/pyside6/libpysideremoteobjects/CMakeLists.txt
-+++ b/sources/pyside6/libpysideremoteobjects/CMakeLists.txt
-@@ -80,7 +80,7 @@
- #
-
- 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}"
---- 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@
-
---- a/sources/shiboken6/libshiboken/CMakeLists.txt
-+++ b/sources/shiboken6/libshiboken/CMakeLists.txt
-@@ -111,7 +111,7 @@
- target_include_directories(libshiboken PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
-- $<INSTALL_INTERFACE:shiboken6/include>
-+ $<INSTALL_INTERFACE:include/shiboken6>
- )
-
- if (NOT "${NUMPY_INCLUDE_DIR}" STREQUAL "")
-@@ -197,7 +197,7 @@
- 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}"
diff --git a/debian/patches/series b/debian/patches/series
index 72c90d0..c7ade2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
0001-Always-link-to-python-libraries.patch
0001-Fix-installation.patch
-0001-Revert-Modify-headers-installation-for-CMake-builds.patch
0001-test-with-current-interpreter.patch
#0002-disable-qtexampleicons.patch
0003-Fix-missing-subparser-in-test-harness.patch
More information about the Neon-commits
mailing list