diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2023-11-07 06:37:37 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2023-11-07 06:37:37 +0000 |
| commit | 47006271d9d716be989b85e053df696e8f636a6a (patch) | |
| tree | 35a313831b3c53a5b963d461da0ea820cd593197 /dev-python | |
| parent | 23402ef6b570ec9c48a546dd68c217e8e4567036 (diff) | |
| download | baldeagleos-repo-47006271d9d716be989b85e053df696e8f636a6a.tar.gz baldeagleos-repo-47006271d9d716be989b85e053df696e8f636a6a.tar.xz baldeagleos-repo-47006271d9d716be989b85e053df696e8f636a6a.zip | |
Adding metadata
Diffstat (limited to 'dev-python')
17 files changed, 2 insertions, 878 deletions
diff --git a/dev-python/pykka/Manifest b/dev-python/pykka/Manifest index d376c53a4db7..6a16c65f8e0b 100644 --- a/dev-python/pykka/Manifest +++ b/dev-python/pykka/Manifest @@ -1,2 +1,2 @@ -DIST pykka-3.1.1.gh.tar.gz 44312 BLAKE2B cb50f01e27ca7b6aec10b61fb41d59e1d4fec29b65595afbab1e931137ef35efe8860bab0ce3b7a6a30a44aa215deb237a4e13abc541c537dab062b7d14acf0d SHA512 0cb5ca7924f77d9d0ba8b2f288e2a635f7ce70ae49bd5f5ddf574f37f76252b575cb95898ab244d27b96090345bcbbe82bad1c97f5cca73fb8fffa707e553e55 DIST pykka-4.0.0.gh.tar.gz 48507 BLAKE2B c394f493884b5f6a97d52e1f7038615510cfb1f75ef9f639fb3b1a4feb8ea5206edda6b647fd782fe16902cd1d9d210f168d0846942ed0f1b720a869029c2b34 SHA512 2078df598c23a742a62f374b1de76ba94f671e4af458532ba16245b32579462574c75adebf625aaab0a5875bc9e9803a10d2f8c82f783537ad893b896be00f12 +DIST pykka-4.0.1.gh.tar.gz 48549 BLAKE2B 4aaeb31b9e9aa9cdc5125719a6a26e9d0b400d5df09bc55d240528bf3623aa46aaf70c2bafb868f8ec82accef239673fd8019571c48341305cac209213ba065c SHA512 fd49250cc641ffcfd3ad71f3716452ef6dbc54e201e56d8fb3d13d8315379058e5648b773327830d1e2eb60fe6a9576aac81d5613cd02af3ce5b42866716e030 diff --git a/dev-python/pykka/pykka-3.1.1.ebuild b/dev-python/pykka/pykka-4.0.1.ebuild index 2c2c0eeb3e08..2c2c0eeb3e08 100644 --- a/dev-python/pykka/pykka-3.1.1.ebuild +++ b/dev-python/pykka/pykka-4.0.1.ebuild diff --git a/dev-python/pylatex/pylatex-1.4.2.ebuild b/dev-python/pylatex/pylatex-1.4.2.ebuild index 1a8d540e7b29..b15a31c6299e 100644 --- a/dev-python/pylatex/pylatex-1.4.2.ebuild +++ b/dev-python/pylatex/pylatex-1.4.2.ebuild @@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P} LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="examples" RDEPEND=" diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest index 5f19cf5fdc33..d7602001a4a7 100644 --- a/dev-python/pyside2-tools/Manifest +++ b/dev-python/pyside2-tools/Manifest @@ -1,2 +1 @@ -DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B 7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e91858888e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56 SHA512 dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2 DIST pyside-setup-opensource-src-5.15.11.tar.xz 3584760 BLAKE2B c4d60439a218451eb0c505031524fe1e30a117b7e89a28b5cd7518c193a8d2de01a5db8cb3acdd97c81da6dddff99f786c6c763427f78cdd0af4031122ac2d24 SHA512 377b3f6a793313cf7f5bea0dcef6630bac32d79b247e213d0b1b719805b35692aa8dd9a8896c75c6266f05af38809f574051d64b1a2f958a48c90167feccfb91 diff --git a/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch b/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch deleted file mode 100644 index 60de6aa07ee7..000000000000 --- a/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 20a5e19..575c1df 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -55,38 +55,6 @@ else() - set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}") - endif() - --install(FILES "${UIC_PATH}" -- DESTINATION bin -- PERMISSIONS -- OWNER_EXECUTE OWNER_WRITE OWNER_READ -- GROUP_EXECUTE GROUP_READ -- WORLD_EXECUTE WORLD_READ) -- --install(FILES "${RCC_PATH}" -- DESTINATION bin -- PERMISSIONS -- OWNER_EXECUTE OWNER_WRITE OWNER_READ -- GROUP_EXECUTE GROUP_READ -- WORLD_EXECUTE WORLD_READ) -- --if (EXISTS ${DESIGNER_PATH}) -- if (APPLE) -- install(DIRECTORY "${DESIGNER_PATH}" -- DESTINATION bin -- FILE_PERMISSIONS -- OWNER_EXECUTE OWNER_WRITE OWNER_READ -- GROUP_EXECUTE GROUP_READ -- WORLD_EXECUTE WORLD_READ) -- else() -- install(FILES "${DESIGNER_PATH}" -- DESTINATION bin -- PERMISSIONS -- OWNER_EXECUTE OWNER_WRITE OWNER_READ -- GROUP_EXECUTE GROUP_READ -- WORLD_EXECUTE WORLD_READ) -- endif() --endif() -- - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY) -@@ -113,14 +81,6 @@ endif() - - add_subdirectory(pylupdate) - --# pyside2-rcc, pyside2-uic, pyside2-designer, shiboken and pyside2-lupdate entrypoints --install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside_tool.py -- DESTINATION bin -- PERMISSIONS -- OWNER_EXECUTE OWNER_WRITE OWNER_READ -- GROUP_EXECUTE GROUP_READ -- WORLD_EXECUTE WORLD_READ) -- - if (BUILD_TESTS) - enable_testing() - add_subdirectory(tests) diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild deleted file mode 100644 index 24d169ccfa4f..000000000000 --- a/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: Add PyPy once officially supported. See also: -# https://bugreports.qt.io/browse/PYSIDE-535 -PYTHON_COMPAT=( python3_{10..11} ) -CMAKE_IN_SOURCE_BUILD=1 - -inherit cmake python-r1 - -MY_P=pyside-setup-opensource-src-${PV} - -DESCRIPTION="PySide development tools (pyside2-lupdate with support for Python)" -HOMEPAGE="https://wiki.qt.io/PySide2" -SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz" -S="${WORKDIR}/${MY_P}/sources/${PN}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm64 ~riscv x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - ~dev-python/pyside2-${PV}[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -DOCS=( README.md ) - -# the tools conflict with tools from QT -PATCHES=( - "${FILESDIR}/${PN}-5.15.1-dont-install-tools.patch" -) - -src_prepare() { - cmake_src_prepare - - python_copy_sources -} - -src_configure() { - # The tests are only related to the tools that we don't install - local mycmakeargs=( - -DBUILD_TESTS=OFF - ) - - pyside-tools_configure() { - local mycmakeargs=( - "${mycmakeargs[@]}" - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - ) - CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure - } - - python_foreach_impl pyside-tools_configure -} - -src_compile() { - pyside-tools_compile() { - CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile - } - - python_foreach_impl pyside-tools_compile -} - -src_install() { - pyside-tools_install() { - python_doexe "${BUILD_DIR}/pylupdate/pyside2-lupdate" - } - - python_foreach_impl pyside-tools_install - - doman pylupdate/pyside2-lupdate.1 - einstalldocs -} diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest index 5f19cf5fdc33..d7602001a4a7 100644 --- a/dev-python/pyside2/Manifest +++ b/dev-python/pyside2/Manifest @@ -1,2 +1 @@ -DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B 7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e91858888e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56 SHA512 dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2 DIST pyside-setup-opensource-src-5.15.11.tar.xz 3584760 BLAKE2B c4d60439a218451eb0c505031524fe1e30a117b7e89a28b5cd7518c193a8d2de01a5db8cb3acdd97c81da6dddff99f786c6c763427f78cdd0af4031122ac2d24 SHA512 377b3f6a793313cf7f5bea0dcef6630bac32d79b247e213d0b1b719805b35692aa8dd9a8896c75c6266f05af38809f574051d64b1a2f958a48c90167feccfb91 diff --git a/dev-python/pyside2/files/pyside2-5.15.2-python310.patch b/dev-python/pyside2/files/pyside2-5.15.2-python310.patch deleted file mode 100644 index cb2af4537cac..000000000000 --- a/dev-python/pyside2/files/pyside2-5.15.2-python310.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr libpyside/feature_select.cpp libpyside/feature_select.cpp ---- a/libpyside/feature_select.cpp 2020-11-11 14:51:30.000000000 +0200 -+++ b/libpyside/feature_select.cpp 2021-12-01 15:39:40.356426568 +0200 -@@ -405,6 +405,8 @@ static inline PyObject *SelectFeatureSet - if (!SelectFeatureSetSubtype(sub_type, select_id)) - break; - } -+ // PYSIDE-1436: Clear all caches for the type and subtypes. -+ PyType_Modified(type); - } - return type->tp_dict; - } diff --git a/dev-python/pyside2/files/pyside2-5.15.2-python311-fixups.patch b/dev-python/pyside2/files/pyside2-5.15.2-python311-fixups.patch deleted file mode 100644 index d91b0b6806ca..000000000000 --- a/dev-python/pyside2/files/pyside2-5.15.2-python311-fixups.patch +++ /dev/null @@ -1,54 +0,0 @@ -The Fedora / upstream fixes (shiboken2-5.15.2-python311.patch) end up breaking -Python 3.8 compatibility (maybe 3.9 too, but didn't get that far). - -Wrap them with PY_VERSION_HEX for Python 3.11. ---- a/libpyside/pysideqflags.cpp -+++ b/libpyside/pysideqflags.cpp -@@ -187,7 +187,12 @@ namespace QFlags - } - newspec.slots = SbkNewQFlagsType_spec.slots; - PyTypeObject *type = (PyTypeObject *)SbkType_FromSpec(&newspec); -- Py_SET_TYPE(type, &PyType_Type); -+ -+ #if PY_VERSION_HEX < 0x030B00A1 -+ Py_TYPE(type) = &PyType_Type; -+ #else -+ Py_SET_TYPE(type, &PyType_Type); -+ #endif - - PySideQFlagsType *flagsType = reinterpret_cast<PySideQFlagsType *>(type); - PepType_PFTP(flagsType)->converterPtr = &PepType_PFTP(flagsType)->converter; ---- a/libpyside/pysidesignal.cpp -+++ b/libpyside/pysidesignal.cpp -@@ -162,7 +162,13 @@ PyTypeObject *PySideSignalTypeF(void) - if (!type) { - type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&PySideSignalType_spec)); - PyTypeObject *hold = Py_TYPE(type); -- Py_SET_TYPE(type, PySideMetaSignalTypeF()); -+ -+ #if PY_VERSION_HEX < 0x030B00A1 -+ Py_TYPE(type) = PySideMetaSignalTypeF(); -+ #else -+ Py_SET_TYPE(type, PySideMetaSignalTypeF()); -+ #endif -+ - Py_INCREF(Py_TYPE(type)); - Py_DECREF(hold); - } ---- a/libpyside/pysideweakref.cpp -+++ b/libpyside/pysideweakref.cpp -@@ -90,7 +90,13 @@ PyObject *create(PyObject *obj, PySideWeakRefFunction func, void *userData) - - if (Py_TYPE(PySideCallableObjectTypeF()) == 0) - { -- Py_SET_TYPE(PySideCallableObjectTypeF(), &PyType_Type); -+ -+ #if PY_VERSION_HEX < 0x030B00A1 -+ Py_TYPE(PySideCallableObjectTypeF()) = &PyType_Type; -+ #else -+ Py_SET_TYPE(PySideCallableObjectTypeF(), &PyType_Type); -+ #endif -+ - PyType_Ready(PySideCallableObjectTypeF()); - } - diff --git a/dev-python/pyside2/files/pyside2-5.15.2-python311.patch b/dev-python/pyside2/files/pyside2-5.15.2-python311.patch deleted file mode 100644 index 70b07c4800fd..000000000000 --- a/dev-python/pyside2/files/pyside2-5.15.2-python311.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://src.fedoraproject.org/fork/pviktori/rpms/python-pyside2/raw/5da9902bd8732b49eb722d71f306d4ab197c84b8/f/python3.11.patch - -From 77fdd690ca14e97b4c800c4127362ca0c83a716a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz> -Date: Thu, 9 Jun 2022 13:45:07 +0200 -Subject: [PATCH] Fix usage of Py_TYPE() for Python 3.11 - -The macro was changed to a function, no longer allowing for assignment. ---- a/libpyside/pysideqflags.cpp -+++ b/libpyside/pysideqflags.cpp -@@ -187,7 +187,7 @@ namespace QFlags - } - newspec.slots = SbkNewQFlagsType_spec.slots; - PyTypeObject *type = (PyTypeObject *)SbkType_FromSpec(&newspec); -- Py_TYPE(type) = &PyType_Type; -+ Py_SET_TYPE(type, &PyType_Type); - - PySideQFlagsType *flagsType = reinterpret_cast<PySideQFlagsType *>(type); - PepType_PFTP(flagsType)->converterPtr = &PepType_PFTP(flagsType)->converter; ---- a/libpyside/pysidesignal.cpp -+++ b/libpyside/pysidesignal.cpp -@@ -162,7 +162,7 @@ PyTypeObject *PySideSignalTypeF(void) - if (!type) { - type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&PySideSignalType_spec)); - PyTypeObject *hold = Py_TYPE(type); -- Py_TYPE(type) = PySideMetaSignalTypeF(); -+ Py_SET_TYPE(type, PySideMetaSignalTypeF()); - Py_INCREF(Py_TYPE(type)); - Py_DECREF(hold); - } ---- a/libpyside/pysideweakref.cpp -+++ b/libpyside/pysideweakref.cpp -@@ -90,7 +90,7 @@ PyObject *create(PyObject *obj, PySideWeakRefFunction func, void *userData) - - if (Py_TYPE(PySideCallableObjectTypeF()) == 0) - { -- Py_TYPE(PySideCallableObjectTypeF()) = &PyType_Type; -+ Py_SET_TYPE(PySideCallableObjectTypeF(), &PyType_Type); - PyType_Ready(PySideCallableObjectTypeF()); - } - diff --git a/dev-python/pyside2/pyside2-5.15.10-r3.ebuild b/dev-python/pyside2/pyside2-5.15.10-r3.ebuild deleted file mode 100644 index fa43d3ed66e7..000000000000 --- a/dev-python/pyside2/pyside2-5.15.10-r3.ebuild +++ /dev/null @@ -1,228 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: Add PyPy once officially supported. See also: -# https://bugreports.qt.io/browse/PYSIDE-535 -PYTHON_COMPAT=( python3_{10..11} ) - -inherit cmake python-r1 virtualx - -# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects" -# USE flag after an external "dev-qt/qtremoteobjects" package has been created. -# TODO: Add conditional support for apidoc generation via a new "doc" USE flag. -# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once -# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support. -# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note -# that the "PySide2/QtGui/CMakeLists.txt" and -# "PySide2/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by -# testing whether the "Qt5::Gui" list property defined by -# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation -# time contains the substring "opengles2". Since cmake does not permit -# properties to be overridden from the command line, these files must instead -# be conditionally patched to avoid these tests. An issue should be filed with -# upstream requesting a CLI-settable variable to control this. - -MY_P=pyside-setup-opensource-src-${PV} - -DESCRIPTION="Python bindings for the Qt framework" -HOMEPAGE="https://wiki.qt.io/PySide2" -SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz" -S="${WORKDIR}/${MY_P}/sources/pyside2" - -# See "sources/pyside2/PySide2/licensecomment.txt" for licensing details. -# Shall we allow essential modules to be disabled? They are: -# (core), gui, widgets, printsupport, sql, network, testlib, concurrent, -# x11extras (for X) -LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" -IUSE=" - 3d charts +concurrent datavis designer gles2-only +gui help location - multimedia +network positioning +printsupport qml quick - scxml sensors speech +sql svg test +testlib webchannel webengine websockets - +widgets +x11extras xml xmlpatterns -" - -# Manually reextract these requirements on version bumps by running the -# following one-liners from within "${S}": -# $ grep 'set.*_deps' PySide2/Qt*/CMakeLists.txt -# $ cat /lib64/cmake/Qt5*/Qt5*.cmake | grep -i DEPENDENCIES -# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - 3d? ( gui network ) - charts? ( gui widgets ) - datavis? ( gui ) - designer? ( gui widgets xml ) - gles2-only? ( gui ) - help? ( gui sql widgets ) - location? ( gui network positioning quick ) - multimedia? ( gui network widgets ) - printsupport? ( gui widgets ) - qml? ( gui network ) - quick? ( gui network qml widgets network ) - speech? ( multimedia ) - sql? ( widgets ) - svg? ( widgets ) - testlib? ( widgets ) - webchannel? ( qml ) - webengine? ( - gui network positioning quick qml - widgets? ( printsupport network webchannel ) - ) - websockets? ( network ) - widgets? ( gui ) - x11extras? ( gui ) -" - -# Tests fail pretty bad and I'm not fixing them right now -RESTRICT="test" - -# Minimal supported version of Qt. -QT_PV="$(ver_cut 1-3)*:5" - -RDEPEND="${PYTHON_DEPS} - ~dev-python/shiboken2-${PV}[${PYTHON_USEDEP}] - =dev-qt/qtcore-${QT_PV} - =dev-qt/qtopengl-${QT_PV}[gles2-only=] - =dev-qt/qtserialport-${QT_PV} - 3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] ) - charts? ( =dev-qt/qtcharts-${QT_PV}[qml?] ) - concurrent? ( =dev-qt/qtconcurrent-${QT_PV} ) - datavis? ( =dev-qt/qtdatavis3d-${QT_PV}[qml?,gles2-only=] ) - designer? ( =dev-qt/designer-${QT_PV} ) - gui? ( =dev-qt/qtgui-${QT_PV}[jpeg,gles2-only=] ) - help? ( =dev-qt/qthelp-${QT_PV} ) - location? ( =dev-qt/qtlocation-${QT_PV} ) - multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[qml?,gles2-only=,widgets?] ) - network? ( =dev-qt/qtnetwork-${QT_PV} ) - positioning? ( =dev-qt/qtpositioning-${QT_PV}[qml?] ) - printsupport? ( =dev-qt/qtprintsupport-${QT_PV}[gles2-only=] ) - qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] ) - quick? ( - =dev-qt/qtdeclarative-${QT_PV}[widgets?] - =dev-qt/qtquickcontrols2-${QT_PV}[widgets?] - ) - scxml? ( =dev-qt/qtscxml-${QT_PV} ) - sensors? ( =dev-qt/qtsensors-${QT_PV}[qml?] ) - speech? ( =dev-qt/qtspeech-${QT_PV} ) - sql? ( =dev-qt/qtsql-${QT_PV} ) - svg? ( =dev-qt/qtsvg-${QT_PV} ) - testlib? ( =dev-qt/qttest-${QT_PV} ) - webchannel? ( =dev-qt/qtwebchannel-${QT_PV}[qml] ) - webengine? ( || ( - =dev-qt/qtwebengine-${QT_PV}[alsa,widgets?] - =dev-qt/qtwebengine-${QT_PV}[pulseaudio,widgets?] - ) - ) - websockets? ( =dev-qt/qtwebsockets-${QT_PV}[qml?] ) - widgets? ( =dev-qt/qtwidgets-${QT_PV}[gles2-only=] ) - x11extras? ( =dev-qt/qtx11extras-${QT_PV} ) - xml? ( =dev-qt/qtxml-${QT_PV} ) - xmlpatterns? ( =dev-qt/qtxmlpatterns-${QT_PV}[qml?] ) -" -DEPEND="${RDEPEND} - test? ( x11-misc/xvfb-run ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.15.2-python310.patch" - "${FILESDIR}/${PN}-5.15.2-python311.patch" - "${FILESDIR}/${PN}-5.15.2-python311-fixups.patch" -) - -src_configure() { - # See COLLECT_MODULE_IF_FOUND macros in CMakeLists.txt - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DAnimation=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DCore=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DExtras=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DInput=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DLogic=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DRender=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Charts=$(usex !charts) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DataVisualization=$(usex !datavis) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Gui=$(usex !gui) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Location=$(usex !location) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex !multimedia yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=$(usex !positioning) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !qml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !quick) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickControls2=$(usex !quick) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !quick yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=$(usex !sensors) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=$(usex !speech) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sql=$(usex !sql) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !testlib) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebChannel=$(usex !webchannel) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=$(usex !webengine) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineCore=$(usex !webengine) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebSockets=$(usex !websockets) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=$(usex !widgets) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=$(usex !x11extras) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Xml=$(usex !xml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=$(usex !xmlpatterns) - ) - - pyside2_configure() { - local mycmakeargs=( - "${mycmakeargs[@]}" - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)" - -DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}" - ) - cmake_src_configure - } - python_foreach_impl pyside2_configure -} - -src_compile() { - python_foreach_impl cmake_src_compile -} - -src_test() { - local -x PYTHONDONTWRITEBYTECODE - python_foreach_impl virtx cmake_src_test -} - -src_install() { - pyside2_install() { - cmake_src_install - python_optimize - - # Uniquify the shiboken2 pkgconfig dependency in the PySide2 pkgconfig - # file for the current Python target. See also: - # https://github.com/leycec/raiagent/issues/73 - sed -i -e 's~^Requires: shiboken2$~&-'${EPYTHON}'~' \ - "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die - - # Uniquify the PySide2 pkgconfig file for the current Python target, - # preserving an unversioned "pyside2.pc" file arbitrarily associated - # with the last Python target. (See the previously linked issue.) - cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die - } - python_foreach_impl pyside2_install - - # CMakeLists.txt installs a "PySide2Targets-gentoo.cmake" file forcing - # downstream consumers (e.g., pyside2-tools) to target one - # "libpyside2-*.so" library linked to one Python interpreter. See also: - # https://bugreports.qt.io/browse/PYSIDE-1053 - # https://github.com/leycec/raiagent/issues/74 - sed -i -e 's~pyside2-python[[:digit:]]\+\.[[:digit:]]\+~pyside2${PYTHON_CONFIG_SUFFIX}~g' \ - "${ED}/usr/$(get_libdir)"/cmake/PySide2*/PySide2Targets-${CMAKE_BUILD_TYPE,,}.cmake || die -} diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest index 5f19cf5fdc33..d7602001a4a7 100644 --- a/dev-python/shiboken2/Manifest +++ b/dev-python/shiboken2/Manifest @@ -1,2 +1 @@ -DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B 7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e91858888e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56 SHA512 dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2 DIST pyside-setup-opensource-src-5.15.11.tar.xz 3584760 BLAKE2B c4d60439a218451eb0c505031524fe1e30a117b7e89a28b5cd7518c193a8d2de01a5db8cb3acdd97c81da6dddff99f786c6c763427f78cdd0af4031122ac2d24 SHA512 377b3f6a793313cf7f5bea0dcef6630bac32d79b247e213d0b1b719805b35692aa8dd9a8896c75c6266f05af38809f574051d64b1a2f958a48c90167feccfb91 diff --git a/dev-python/shiboken2/files/shiboken2-5.15.5-add-numpy-1.23-compatibility.patch b/dev-python/shiboken2/files/shiboken2-5.15.5-add-numpy-1.23-compatibility.patch deleted file mode 100644 index 7ce30bb2e67d..000000000000 --- a/dev-python/shiboken2/files/shiboken2-5.15.5-add-numpy-1.23-compatibility.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://raw.githubusercontent.com/FreeCAD/homebrew-freecad/master/patches/libshiboken-numpy-1.23.compat.patch - -From c238f558bb72860c15da00546a7b7924d0b90848 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Thu, 21 Jul 2022 06:37:26 +0200 -Subject: [PATCH] add numpy-1.23 compatibility - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- - libshiboken/sbknumpyarrayconverter.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/libshiboken/sbknumpyarrayconverter.cpp -+++ b/libshiboken/sbknumpyarrayconverter.cpp -@@ -116,8 +116,13 @@ std::ostream &operator<<(std::ostream &str, PyArrayObject *o) - str << " NPY_ARRAY_NOTSWAPPED"; - if ((flags & NPY_ARRAY_WRITEABLE) != 0) - str << " NPY_ARRAY_WRITEABLE"; -+#if NPY_VERSION >= 0x00000010 // NPY_1_23_API_VERSION -+ if ((flags & NPY_ARRAY_WRITEBACKIFCOPY) != 0) -+ str << " NPY_ARRAY_WRITEBACKIFCOPY"; -+#else - if ((flags & NPY_ARRAY_UPDATEIFCOPY) != 0) - str << " NPY_ARRAY_UPDATEIFCOPY"; -+#endif - } else { - str << '0'; - } --- -2.35.1 - diff --git a/dev-python/shiboken2/files/shiboken2-5.15.5-python311-1.patch b/dev-python/shiboken2/files/shiboken2-5.15.5-python311-1.patch deleted file mode 100644 index 771ce2ad1886..000000000000 --- a/dev-python/shiboken2/files/shiboken2-5.15.5-python311-1.patch +++ /dev/null @@ -1,72 +0,0 @@ -From c87d4e27cd482918c1d091c09cfac749a56b0f99 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Wed, 20 Jul 2022 07:15:57 +0200 -Subject: [PATCH 1/3] - https://src.fedoraproject.org/fork/pviktori/rpms/python-pyside2/raw/5da9902bd8732b49eb722d71f306d4ab197c84b8/f/python3.11.patch - https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=52df3b8f64 - https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=73adefe22f - https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=a09a1db839 - -From b64ad27d8dfeeecaaa8a98051252a32c9d998df4 Mon Sep 17 00:00:00 2001 -From: Friedemann Kleint <Friedemann.Kleint@qt.io> -Date: Thu, 9 Jun 2022 16:50:41 +0200 -Subject: [PATCH] libshiboken: Fix a crash in Shiboken::Object::isValid() for - Python 3.11 - -The function is passed type objects for class methods, which caused -it to crash. - -The first clause did not catch this, and so it was cast to SbkObject -below. - -Add a type check to prevent this. - -Pick-to: 6.3 6.2 5.15 -Task-number: PYSIDE-1960 -Change-Id: Icfdd6fefb7156ac5961444bd5395109849a1d66e -Reviewed-by: Christian Tismer <tismer@stackless.com> -Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> - -Original patch no longer applies with 5.15.5. -Manually re-applied to respect code changes. - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/libshiboken/basewrapper.cpp -+++ b/libshiboken/basewrapper.cpp -@@ -377,7 +377,7 @@ SbkObjectType *SbkObject_TypeF(void) - static PyTypeObject *type = nullptr; - if (!type) { - type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&SbkObject_Type_spec)); -- Py_TYPE(type) = SbkObjectType_TypeF(); -+ Py_SET_TYPE(type, SbkObjectType_TypeF()); - Py_INCREF(Py_TYPE(type)); - type->tp_weaklistoffset = offsetof(SbkObject, weakreflist); - type->tp_dictoffset = offsetof(SbkObject, ob_dict); -@@ -1152,7 +1152,7 @@ introduceWrapperType(PyObject *enclosingObject, - typeSpec->slots[0].pfunc = reinterpret_cast<void *>(baseType ? baseType : SbkObject_TypeF()); - - PyObject *heaptype = SbkType_FromSpecWithBases(typeSpec, baseTypes); -- Py_TYPE(heaptype) = SbkObjectType_TypeF(); -+ Py_SET_TYPE(heaptype, SbkObjectType_TypeF()); - Py_INCREF(Py_TYPE(heaptype)); - auto *type = reinterpret_cast<SbkObjectType *>(heaptype); - #if PY_VERSION_HEX < 0x03000000 -@@ -1517,6 +1517,7 @@ bool setCppPointer(SbkObject *sbkObj, PyTypeObject *desiredType, void *cptr) - bool isValid(PyObject *pyObj) - { - if (!pyObj || pyObj == Py_None -+ || PyType_Check(pyObj) != 0 - || Py_TYPE(Py_TYPE(pyObj)) != SbkObjectType_TypeF()) { - return true; - } ---- a/libshiboken/sbkenum.cpp -+++ b/libshiboken/sbkenum.cpp -@@ -753,7 +753,7 @@ newTypeWithName(const char *name, - PyTuple_SetItem(bases, 0, reinterpret_cast<PyObject *>(basetype)); - auto *type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpecWithBases(&newspec, bases)); - PyErr_Print(); -- Py_TYPE(type) = SbkEnumType_TypeF(); -+ Py_SET_TYPE(type, SbkEnumType_TypeF()); - - auto *enumType = reinterpret_cast<SbkEnumType *>(type); - PepType_SETP(enumType)->cppName = cppName; diff --git a/dev-python/shiboken2/files/shiboken2-5.15.5-python311-2.patch b/dev-python/shiboken2/files/shiboken2-5.15.5-python311-2.patch deleted file mode 100644 index 54a54630cb0c..000000000000 --- a/dev-python/shiboken2/files/shiboken2-5.15.5-python311-2.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 6fc0af3753839839b227075cc2a9e43c7cd7a26d Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Wed, 20 Jul 2022 07:23:15 +0200 -Subject: [PATCH 2/3] From a09a1db8391243e6bb290ee66bb6e3afbb114c61 Mon Sep 17 - 00:00:00 2001 From: Friedemann Kleint <Friedemann.Kleint@qt.io> Date: Fri, 24 - Jun 2022 09:22:01 +0200 Subject: libshiboken: Fix crashes with static strings - in Python 3.11 - -In Python 3.11, some strings come with a refcount above decimal -1000000000, apparently indicating that they are interned. Replace the -mechanism by PyUnicode_InternFromString(). - -Task-number: PYSIDE-1960 -Pick-to: 6.3 6.2 5.15 -Change-Id: I6436afee351f89da5814b5d6bc76970b1b508168 -Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> -Reviewed-by: Christian Tismer <tismer@stackless.com> -Upstream: https://code.qt.io/cgit/pyside/pyside-setup.git/commit/?id=a09a1db8391243e6bb290ee66bb6e3afbb114c61 - -Original patch no longer applies. -Manually adapted to respect code changes. - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/libshiboken/sbkstring.cpp -+++ b/libshiboken/sbkstring.cpp -@@ -41,8 +41,14 @@ - #include "sbkstaticstrings_p.h" - #include "autodecref.h" - --#include <vector> --#include <unordered_set> -+#if PY_VERSION_HEX >= 0x030B0000 || defined(Py_LIMITED_API) -+# define USE_INTERN_STRINGS -+#endif -+ -+#ifndef USE_INTERN_STRINGS -+# include <vector> -+# include <unordered_set> -+#endif - - namespace Shiboken - { -@@ -233,6 +239,13 @@ Py_ssize_t len(PyObject *str) - // PyObject *attr = PyObject_GetAttr(obj, name()); - // - -+#ifdef USE_INTERN_STRINGS -+PyObject *createStaticString(const char *str) -+{ -+ return PyUnicode_InternFromString(str); -+} -+#else -+ - using StaticStrings = std::unordered_set<PyObject *>; - - static void finalizeStaticStrings(); // forward -@@ -283,6 +296,8 @@ PyObject *createStaticString(const char *str) - return result; - } - -+#endif // !USE_INTERN_STRINGS -+ - /////////////////////////////////////////////////////////////////////// - // - // PYSIDE-1019: Helper function for snake_case vs. camelCase names diff --git a/dev-python/shiboken2/files/shiboken2-5.15.5-python311-3.patch b/dev-python/shiboken2/files/shiboken2-5.15.5-python311-3.patch deleted file mode 100644 index 9c44dc621b45..000000000000 --- a/dev-python/shiboken2/files/shiboken2-5.15.5-python311-3.patch +++ /dev/null @@ -1,55 +0,0 @@ -From f62a1766e5f0cf0e503a76cd755408f2c65dc947 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Wed, 20 Jul 2022 07:29:37 +0200 -Subject: [PATCH 3/3] The Fedora / upstream fixes - (shiboken2-5.15.2-python311.patch) end up breaking Python 3.8 compatibility - (maybe 3.9 too, but didn't get that far). - -Wrap them with PY_VERSION_HEX for Python 3.11. - -Original patch no longer applied due to code changes. - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/libshiboken/basewrapper.cpp -+++ b/libshiboken/basewrapper.cpp -@@ -377,7 +377,11 @@ SbkObjectType *SbkObject_TypeF(void) - static PyTypeObject *type = nullptr; - if (!type) { - type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&SbkObject_Type_spec)); -- Py_SET_TYPE(type, SbkObjectType_TypeF()); -+ #if PY_VERSION_HEX < 0x030B00A1 -+ Py_TYPE(type) = SbkObjectType_TypeF(); -+ #else -+ Py_SET_TYPE(type, SbkObjectType_TypeF()); -+ #endif - Py_INCREF(Py_TYPE(type)); - type->tp_weaklistoffset = offsetof(SbkObject, weakreflist); - type->tp_dictoffset = offsetof(SbkObject, ob_dict); -@@ -1152,7 +1156,11 @@ introduceWrapperType(PyObject *enclosingObject, - typeSpec->slots[0].pfunc = reinterpret_cast<void *>(baseType ? baseType : SbkObject_TypeF()); - - PyObject *heaptype = SbkType_FromSpecWithBases(typeSpec, baseTypes); -- Py_SET_TYPE(heaptype, SbkObjectType_TypeF()); -+ #if PY_VERSION_HEX < 0x030B00A1 -+ Py_TYPE(heaptype) = SbkObjectType_TypeF(); -+ #else -+ Py_SET_TYPE(heaptype, SbkObjectType_TypeF()); -+ #endif - Py_INCREF(Py_TYPE(heaptype)); - auto *type = reinterpret_cast<SbkObjectType *>(heaptype); - #if PY_VERSION_HEX < 0x03000000 ---- a/libshiboken/sbkenum.cpp -+++ b/libshiboken/sbkenum.cpp -@@ -753,7 +753,11 @@ newTypeWithName(const char *name, - PyTuple_SetItem(bases, 0, reinterpret_cast<PyObject *>(basetype)); - auto *type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpecWithBases(&newspec, bases)); - PyErr_Print(); -- Py_SET_TYPE(type, SbkEnumType_TypeF()); -+ #if PY_VERSION_HEX < 0x030B00A1 -+ Py_TYPE(type) = SbkEnumType_TypeF(); -+ #else -+ Py_SET_TYPE(type, SbkEnumType_TypeF()); -+ #endif - - auto *enumType = reinterpret_cast<SbkEnumType *>(type); - PepType_SETP(enumType)->cppName = cppName; diff --git a/dev-python/shiboken2/shiboken2-5.15.10-r2.ebuild b/dev-python/shiboken2/shiboken2-5.15.10-r2.ebuild deleted file mode 100644 index e6521942e588..000000000000 --- a/dev-python/shiboken2/shiboken2-5.15.10-r2.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: Split the "/usr/bin/shiboken2" binding generator from the -# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former -# requires everything (including Clang) at runtime; the latter only requires -# Qt and Python at runtime. Note that "pip" separates these two as well. See: -# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding -# Once split, the PySide2 ebuild should be revised to require -# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime. -# TODO: Add PyPy once officially supported. See also: -# https://bugreports.qt.io/browse/PYSIDE-535 -PYTHON_COMPAT=( python3_{8,9,10,11,12} ) - -inherit cmake llvm python-r1 toolchain-funcs - -MY_P=pyside-setup-opensource-src-${PV} - -DESCRIPTION="Python binding generator for C++ libraries" -HOMEPAGE="https://wiki.qt.io/PySide2" -SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz" -S="${WORKDIR}/${MY_P}/sources/shiboken2" - -# The "sources/shiboken2/libshiboken" directory is triple-licensed under the -# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3 -# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be -# arbitrarily relicensed. (TODO) -LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" -IUSE="+docstrings numpy test vulkan" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Tests fail pretty bad and I'm not fixing them right now -RESTRICT="test" - -# Minimal supported version of Qt. -QT_PV="$(ver_cut 1-3)*:5" - -# Since Clang is required at both build- and runtime, BDEPEND is omitted here. -LLVM_MAX_SLOT=15 -RDEPEND="${PYTHON_DEPS} - =dev-qt/qtcore-${QT_PV} - <sys-devel/clang-16:= - <sys-devel/clang-runtime-16:= - docstrings? ( - >=dev-libs/libxml2-2.6.32 - >=dev-libs/libxslt-1.1.19 - =dev-qt/qtxml-${QT_PV} - =dev-qt/qtxmlpatterns-${QT_PV} - ) - numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) -" -DEPEND="${RDEPEND} - test? ( =dev-qt/qttest-${QT_PV} ) -" - -DOCS=( AUTHORS ) - -PATCHES=( - "${FILESDIR}"/${PN}-5.15.5-python311-1.patch - "${FILESDIR}"/${PN}-5.15.5-python311-2.patch - "${FILESDIR}"/${PN}-5.15.5-python311-3.patch - "${FILESDIR}"/${PN}-5.15.5-add-numpy-1.23-compatibility.patch -) - -# Ensure the path returned by get_llvm_prefix() contains clang as well. -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -src_prepare() { - # TODO: File upstream issue requesting a sane way to disable NumPy support. - if ! use numpy; then - sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \ - libshiboken/CMakeLists.txt || die - fi - - # Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include" - # or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan". - if use vulkan; then - sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \ - ApiExtractor/clangparser/compilersupport.cpp || die - fi - - local clangver="$(CPP=clang clang-major-version)" - - # Clang 15 and older used the full version as a directory name. - if [[ ${clangver} -lt 16 ]]; then - clangver="$(CPP=clang clang-fullversion)" - fi - - # Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/" - # subdirectory provides Clang builtin includes (e.g., "stddef.h") for the - # currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is - # the largest version specifier that exists under the "/usr/lib/clang/" - # subdirectory. This assumption is false in edge cases, including when - # users downgrade from newer Clang versions but fail to remove those - # versions with "emerge --depclean". See also: - # https://github.com/leycec/raiagent/issues/85 - # - # Sadly, the clang-* family of functions exported by the "toolchain-funcs" - # eclass are defective, returning nonsensical placeholder strings if the - # end user has *NOT* explicitly configured their C++ compiler to be Clang. - # PySide2 does *NOT* care whether the end user has done so or not, as - # PySide2 unconditionally requires Clang in either case. See also: - # https://bugs.gentoo.org/619490 - sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'"${clangver}"'/include"))~' \ - ApiExtractor/clangparser/compilersupport.cpp || die - - cmake_src_prepare -} - -src_configure() { - # Minimal tests for now, 2 failing with the extended version - # FIXME Subscripted generics cannot be used with class and instance checks - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DDISABLE_DOCSTRINGS=$(usex !docstrings) - ) - - shiboken2_configure() { - local mycmakeargs=( - "${mycmakeargs[@]}" - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DUSE_PYTHON_VERSION="${EPYTHON#python}" - ) - # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable. - local -x LLVM_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - cmake_src_configure - } - python_foreach_impl shiboken2_configure -} - -src_compile() { - python_foreach_impl cmake_src_compile -} - -src_test() { - python_foreach_impl cmake_src_test -} - -src_install() { - shiboken2_install() { - cmake_src_install - python_optimize - - # Uniquify the "shiboken2" executable for the current Python target, - # preserving an unversioned "shiboken2" file arbitrarily associated - # with the last Python target. - cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die - - # Uniquify the Shiboken2 pkgconfig file for the current Python target, - # preserving an unversioned "shiboken2.pc" file arbitrarily associated - # with the last Python target. See also: - # https://github.com/leycec/raiagent/issues/73 - cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die - } - python_foreach_impl shiboken2_install - - # CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing - # downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so" - # library and one "shiboken2" executable linked to one Python interpreter. - # See also: - # https://bugreports.qt.io/browse/PYSIDE-1053 - # https://github.com/leycec/raiagent/issues/74 - sed -i \ - -e 's~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \ - -e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \ - "${ED}/usr/$(get_libdir)"/cmake/Shiboken2*/Shiboken2Targets-${CMAKE_BUILD_TYPE,,}.cmake || die - - # Remove the broken "shiboken_tool.py" script. By inspection, this script - # reduces to a noop. Moreover, this script raises the following exception: - # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py' - rm "${ED}"/usr/bin/shiboken_tool.py || die -} |
