[neon/snap-packaging/kde-pyside6-core-sdk/work.core24] /: pyside6 6.10.1
Carlos De Maine
null at kde.org
Tue Dec 2 00:51:12 GMT 2025
Git commit a836f63da2f4ca5ef2ee0b3937bf63ca2b8155c9 by Carlos De Maine.
Committed on 02/12/2025 at 00:51.
Pushed by carlosdem into branch 'work.core24'.
pyside6 6.10.1
R +2 -1 patches/0001-Always-link-to-python-libraries.patch [from: patches/Always-link-to-python-libraries.patch - 099% similarity]
A +57 -0 patches/0001-Fix-installation.patch
A +201 -0 patches/0001-Revert-Modify-headers-installation-for-CMake-builds.patch
A +27 -0 patches/0001-test-with-current-interpreter.patch
D +0 -18 patches/0002-disable-qtexampleicons.patch
A +21 -0 patches/0003-Fix-missing-subparser-in-test-harness.patch
M +5 -2 patches/series
M +1 -1 snapcraft.yaml
https://invent.kde.org/neon/snap-packaging/kde-pyside6-core-sdk/-/commit/a836f63da2f4ca5ef2ee0b3937bf63ca2b8155c9
diff --git a/patches/Always-link-to-python-libraries.patch b/patches/0001-Always-link-to-python-libraries.patch
similarity index 99%
rename from patches/Always-link-to-python-libraries.patch
rename to patches/0001-Always-link-to-python-libraries.patch
index 9147337..7e3aa88 100644
--- a/patches/Always-link-to-python-libraries.patch
+++ b/patches/0001-Always-link-to-python-libraries.patch
@@ -29,4 +29,5 @@ index 27ee333..4be2ad1 100644
# If the resulting variable
# contains a "debug;X;optimized;Y" list like described in shiboken_check_if_limited_api,
-
+--
+2.46.1
\ No newline at end of file
diff --git a/patches/0001-Fix-installation.patch b/patches/0001-Fix-installation.patch
new file mode 100644
index 0000000..8a1b595
--- /dev/null
+++ b/patches/0001-Fix-installation.patch
@@ -0,0 +1,57 @@
+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/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")
+ endif()
+
+diff --git a/sources/shiboken6/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt
+index 973d14b..c4235f8 100644
+--- a/sources/shiboken6/libshiboken/CMakeLists.txt
++++ b/sources/shiboken6/libshiboken/CMakeLists.txt
+@@ -217,6 +217,6 @@ if(NOT is_pyside6_superproject_build)
+
+ 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/patches/0001-Revert-Modify-headers-installation-for-CMake-builds.patch b/patches/0001-Revert-Modify-headers-installation-for-CMake-builds.patch
new file mode 100644
index 0000000..d24c410
--- /dev/null
+++ b/patches/0001-Revert-Modify-headers-installation-for-CMake-builds.patch
@@ -0,0 +1,201 @@
+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/patches/0001-test-with-current-interpreter.patch b/patches/0001-test-with-current-interpreter.patch
new file mode 100644
index 0000000..e32857b
--- /dev/null
+++ b/patches/0001-test-with-current-interpreter.patch
@@ -0,0 +1,27 @@
+From: Dmitry Shachnev <mitya57 at debian.org>
+Date: Sun, 14 Nov 2021 21:08:50 +0300
+Subject: Find the build directory matching the current interpreter
+
+This is needed to allow us to run tests with all supported Python versions.
+Without this patch, the latest build directory will be always picked, no
+matter what the current interpreter is.
+---
+ testing/buildlog.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/testing/buildlog.py b/testing/buildlog.py
+index 90ff436..034f103 100644
+--- a/testing/buildlog.py
++++ b/testing/buildlog.py
+@@ -63,6 +63,11 @@ class BuildLog:
+ )
+ sys.exit(1)
+
++ # We need to find the build directory for the current interpreter
++ py_version = "{}.{}".format(sys.version_info[0], sys.version_info[1])
++ if py_version not in build_classifiers:
++ continue
++
+ if not os.path.exists(build_dir):
+ rel_dir, low_part = os.path.split(build_dir)
+ rel_dir, two_part = os.path.split(rel_dir)
diff --git a/patches/0002-disable-qtexampleicons.patch b/patches/0002-disable-qtexampleicons.patch
deleted file mode 100644
index 17f3c1e..0000000
--- a/patches/0002-disable-qtexampleicons.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Fri, 3 May 2024 16:47:57 +1000
-Subject: disable-qtexampleicons
-
----
- sources/pyside6/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sources/pyside6/CMakeLists.txt b/sources/pyside6/CMakeLists.txt
-index f45c071..fbb55a6 100644
---- a/sources/pyside6/CMakeLists.txt
-+++ b/sources/pyside6/CMakeLists.txt
-@@ -42,4 +42,4 @@ endif()
-
- add_subdirectory(doc)
-
--add_subdirectory(qtexampleicons)
-+# add_subdirectory(qtexampleicons)
diff --git a/patches/0003-Fix-missing-subparser-in-test-harness.patch b/patches/0003-Fix-missing-subparser-in-test-harness.patch
new file mode 100644
index 0000000..346ce73
--- /dev/null
+++ b/patches/0003-Fix-missing-subparser-in-test-harness.patch
@@ -0,0 +1,21 @@
+From: Stuart Prescott <stuart at debian.org>
+Date: Fri, 3 May 2024 16:48:49 +1000
+Subject: Fix missing subparser in test harness
+
+Not needed in the build but needed for debugging the test harness...
+---
+ testing/command.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/testing/command.py b/testing/command.py
+index be4ed8a..e0b73d0 100644
+--- a/testing/command.py
++++ b/testing/command.py
+@@ -199,6 +199,7 @@ def main():
+ type=int,
+ help="use build number n (0-based), latest = -1 (default)",
+ )
++ parser_list = subparsers.add_parser("list")
+ args = parser.parse_args()
+
+ if hasattr(args, "buildno"):
diff --git a/patches/series b/patches/series
index f085fba..b4b1724 100644
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1,7 @@
-0002-disable-qtexampleicons.patch
+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
+0003-Fix-missing-subparser-in-test-harness.patch
0005-Fix-numpy-header-detection.patch
0010-Fix-python-module-paths-in-CMake.patch
-Always-link-to-python-libraries.patch
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 0d271c0..fd7f8aa 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,6 +1,6 @@
name: kde-pyside6-core24-sdk
base: core24
-version: 6.9.3
+version: 6.10.1
summary: KDE fork Qt Pyside6 SDK for core24
description: |
Qt is a cross-platform application development framework widely used
More information about the Neon-commits
mailing list