diff --git a/programming/language/python3/python3-shiboken6/actions.py b/programming/language/python3/python3-shiboken6/actions.py index 5bbba3ec45..933894594b 100644 --- a/programming/language/python3/python3-shiboken6/actions.py +++ b/programming/language/python3/python3-shiboken6/actions.py @@ -9,14 +9,27 @@ from pisi.actionsapi import cmaketools from pisi.actionsapi import shelltools -# WorkDir="pyside-setup-everywhere-src-%s/sources/shiboken6" % get.srcVERSION() +# WorkDir="pyside-setup-everywhere-src-%s/sources" % get.srcVERSION() def setup(): shelltools.cd("sources/shiboken6") pisitools.dosed("libshiboken/CMakeLists.txt", 'LIBRARY DESTINATION "shiboken6"', 'LIBRARY DESTINATION "${LIB_INSTALL_DIR}"') + pisitools.dosed("libshiboken/CMakeLists.txt", 'wheels/cmake/Shiboken6', '/cmake/Shiboken6') cmaketools.configure("-B build -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTS=OFF \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DSHIBOKEN_PYTHON_LIBRARIES=`pkgconf python3-embed --libs` \ + -DUSE_PYTHON_VERSION=3") + + shelltools.cd("../shiboken6_generator") + # pisitools.dosed("generator/CMakeLists.txt", 'EXPORT "${package_name}Targets"', 'EXPORT "/usr/bin/Targets"') + pisitools.dosed("generator/CMakeLists.txt", 'wheels/cmake', '/cmake') + cmaketools.configure("-B build -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_TESTS=OFF \ + -DCMAKE_BIN_INSTALL_DIR:PATH=/usr/bin \ + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DSHIBOKEN_PYTHON_LIBRARIES=`pkgconf python3-embed --libs` \ -DUSE_PYTHON_VERSION=3") @@ -25,9 +38,18 @@ def build(): shelltools.cd("sources/shiboken6/build") cmaketools.make() + shelltools.cd("../../shiboken6_generator/build") + cmaketools.make() + def install(): shelltools.cd("sources/shiboken6/build") cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) # pisitools.removeDir("/usr/shiboken6") + shelltools.cd("../../shiboken6_generator/build") + cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) + pisitools.removeDir("/usr/shiboken6_generator") + + pisitools.dosed("%s/usr/lib/cmake/Shiboken6Tools/Shiboken6ToolsTargets-release.cmake" % get.installDIR(), "shiboken6_generator", "bin") + # pisitools.dosed("%s/usr/lib/cmake/Shiboken6/Shiboken6Targets-release.cmake" % get.installDIR(), "/shiboken6/", "/lib/") diff --git a/programming/language/python3/python3-shiboken6/files/0001-Fix-installation.patch b/programming/language/python3/python3-shiboken6/files/0001-Fix-installation.patch index 8a1b595374..2643959e6e 100644 --- a/programming/language/python3/python3-shiboken6/files/0001-Fix-installation.patch +++ b/programming/language/python3/python3-shiboken6/files/0001-Fix-installation.patch @@ -1,17 +1,17 @@ -From c069622d35a00485742b125caf9439b31b1b972f Mon Sep 17 00:00:00 2001 -From: Christophe Marin -Date: Tue, 7 Oct 2025 15:54:32 +0200 +From 6d4ac91913f8dbc061a03fca1bd699a6248f3ad4 Mon Sep 17 00:00:00 2001 +From: Jan Grulich +Date: Wed, 15 Apr 2026 15:54:49 +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 +- + sources/pyside6/CMakeLists.txt | 2 +- + sources/shiboken6/libshiboken/CMakeLists.txt | 2 +- + sources/shiboken6_generator/generator/CMakeLists.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sources/pyside6/CMakeLists.txt b/sources/pyside6/CMakeLists.txt -index 6b73d70..74aaba5 100644 +index bfe3956..b3f9946 100644 --- a/sources/pyside6/CMakeLists.txt +++ b/sources/pyside6/CMakeLists.txt @@ -40,7 +40,7 @@ install(EXPORT PySide6Targets @@ -23,11 +23,23 @@ index 6b73d70..74aaba5 100644 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" +diff --git a/sources/shiboken6/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt +index bc3569b..de7b06b 100644 +--- a/sources/shiboken6/libshiboken/CMakeLists.txt ++++ b/sources/shiboken6/libshiboken/CMakeLists.txt +@@ -221,6 +221,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() +diff --git a/sources/shiboken6_generator/generator/CMakeLists.txt b/sources/shiboken6_generator/generator/CMakeLists.txt +index 33bb413..fd2a9f3 100644 +--- a/sources/shiboken6_generator/generator/CMakeLists.txt ++++ b/sources/shiboken6_generator/generator/CMakeLists.txt +@@ -72,11 +72,11 @@ install(EXPORT "${package_name}Targets" if(NOT is_pyside6_superproject_build) install(TARGETS shiboken6 EXPORT "${package_name}WheelTargets" @@ -41,17 +53,6 @@ index 997468f..d0948d9 100644 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 +2.53.0 + diff --git a/programming/language/python3/python3-shiboken6/pspec.xml b/programming/language/python3/python3-shiboken6/pspec.xml index f283742a16..59ca85121d 100644 --- a/programming/language/python3/python3-shiboken6/pspec.xml +++ b/programming/language/python3/python3-shiboken6/pspec.xml @@ -14,17 +14,18 @@ app:console Shiboken the Binding Generator Shiboken is the CPython-based binding code generator for C or C++ libraries. It uses an ApiExtractor library to parse the C or C++ headers and get the type information, using Clang. - https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.10.3-src/pyside-setup-everywhere-src-6.10.3.tar.xz + https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.11.1-src/pyside-setup-everywhere-src-6.11.1.tar.xz llvm cmake llvm-mlir libxslt-devel python3-devel - qt6-base-devel + qt6-base-devel llvm-clang-devel python3-sphinx python3-build + python3-shiboken6-devel - fix-header-install-dir.patch - 0001-Always-link-to-python-libraries.patch - 0001-Fix-installation.patch + fix-header-install-dir.patch --> + + @@ -90,10 +91,18 @@ /usr/lib/cmake/ /usr/include/shiboken6/ /usr/lib/pkgconfig/shiboken6.pc + /usr/lib/wheels/cmake/Shiboken6 + + 2026-06-11 + 6.11.1 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2026-06-07 6.10.3