diff --git a/programming/language/python3/pyside6/actions.py b/programming/language/python3/pyside6/actions.py index 7cf426589c..8b22b49b1e 100644 --- a/programming/language/python3/pyside6/actions.py +++ b/programming/language/python3/pyside6/actions.py @@ -15,7 +15,7 @@ def setup(): shelltools.cd("sources/pyside6") pisitools.dosed("libpyside/CMakeLists.txt", 'LIBRARY DESTINATION "PySide6"', 'LIBRARY DESTINATION "${LIB_INSTALL_DIR}"') pisitools.dosed("libpysideqml/CMakeLists.txt", 'LIBRARY DESTINATION "PySide6"', 'LIBRARY DESTINATION "${LIB_INSTALL_DIR}"') - pisitools.dosed("CMakeLists.txt", '/wheels/cmake/PySide6', '/cmake/PySide6') + # pisitools.dosed("CMakeLists.txt", '/wheels/cmake/PySide6', '/cmake/PySide6') cmaketools.configure("-B build -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTS=OFF \ @@ -32,3 +32,6 @@ def install(): shelltools.cd("sources/pyside6/build") # shelltools.system("DESTDIR=%s ninja install" % get.installDIR()) cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dosed("%s/usr/lib/cmake/PySide6/PySide6Config.abi3.cmake" % get.installDIR(), "/typesystems", "/share/PySide6/typesystems") + pisitools.dosed("%s/usr/lib/cmake/PySide6/PySide6Config.abi3.cmake" % get.installDIR(), "/glue", "/share/PySide6/glue") diff --git a/programming/language/python3/pyside6/files/0001-Always-link-to-python-libraries.patch b/programming/language/python3/pyside6/files/0001-Always-link-to-python-libraries.patch new file mode 100644 index 0000000000..2c58cb1243 --- /dev/null +++ b/programming/language/python3/pyside6/files/0001-Always-link-to-python-libraries.patch @@ -0,0 +1,33 @@ +From e9591e27db4ae3412d4504a69a8afebee9a1b83e Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +Date: Tue, 27 Jul 2021 14:54:00 +0200 +Subject: [PATCH] Always link to python libraries. + +Change-Id: I687191431adaff55927de353db8f81dfa30ba1b1 +--- + sources/shiboken6/cmake/ShibokenHelpers.cmake | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/sources/shiboken6/cmake/ShibokenHelpers.cmake b/sources/shiboken6/cmake/ShibokenHelpers.cmake +index 27ee333..4be2ad1 100644 +--- a/sources/shiboken6/cmake/ShibokenHelpers.cmake ++++ b/sources/shiboken6/cmake/ShibokenHelpers.cmake +@@ -425,13 +425,9 @@ macro(shiboken_compute_python_libraries) + "SHIBOKEN_COMPUTE_LIBS" "shiboken_compute_python_libraries" + "IS_CALLED_FROM_EXPORT" "" "" ${ARGN}) + +- if (NOT SHIBOKEN_PYTHON_LIBRARIES) +- set(SHIBOKEN_PYTHON_LIBRARIES "") +- endif() +- +- if(WIN32 AND NOT SHIBOKEN_PYTHON_LIBRARIES) +- set(SHIBOKEN_PYTHON_LIBRARIES ${Python_LIBRARIES}) +- endif() ++ # Always link to python libraries. ++ message(STATUS "Linking shiboken to ${Python_LIBRARIES}") ++ set(SHIBOKEN_PYTHON_LIBRARIES ${Python_LIBRARIES}) + + # If the resulting variable + # contains a "debug;X;optimized;Y" list like described in shiboken_check_if_limited_api, +-- +2.46.1 diff --git a/programming/language/python3/pyside6/files/0001-Fix-installation.patch b/programming/language/python3/pyside6/files/0001-Fix-installation.patch new file mode 100644 index 0000000000..8a1b595374 --- /dev/null +++ b/programming/language/python3/pyside6/files/0001-Fix-installation.patch @@ -0,0 +1,57 @@ +From c069622d35a00485742b125caf9439b31b1b972f Mon Sep 17 00:00:00 2001 +From: Christophe Marin +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/programming/language/python3/pyside6/pspec.xml b/programming/language/python3/pyside6/pspec.xml index fffc0ed649..b7335c4a5b 100644 --- a/programming/language/python3/pyside6/pspec.xml +++ b/programming/language/python3/pyside6/pspec.xml @@ -54,7 +54,9 @@ python3-shiboken6-devel - fix-header-install-dir.patch + fix-header-install-dir.patch + 0001-Always-link-to-python-libraries.patch + 0001-Fix-installation.patch