From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D4D3915ACFB for ; Tue, 11 Apr 2023 18:12:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 074A2E0919; Tue, 11 Apr 2023 18:12:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D437FE0919 for ; Tue, 11 Apr 2023 18:12:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C838340DC6 for ; Tue, 11 Apr 2023 18:12:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5784CA1E for ; Tue, 11 Apr 2023 18:12:33 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1681236744.d40a7e25c054e8bb1448da3513480fae3fc4f109.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/shiboken2/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/shiboken2/Manifest dev-python/shiboken2/shiboken2-5.15.9.ebuild X-VCS-Directories: dev-python/shiboken2/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: d40a7e25c054e8bb1448da3513480fae3fc4f109 X-VCS-Branch: master Date: Tue, 11 Apr 2023 18:12:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5fb45485-0641-4bc1-b715-172efffccbc4 X-Archives-Hash: 9ebde5e74b4a8ecbe8552ab5e8325b1b commit: d40a7e25c054e8bb1448da3513480fae3fc4f109 Author: Andrew Ammerlaan gentoo org> AuthorDate: Tue Apr 11 18:11:52 2023 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Tue Apr 11 18:12:24 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d40a7e25 dev-python/shiboken2: add 5.15.9 Signed-off-by: Andrew Ammerlaan gentoo.org> dev-python/shiboken2/Manifest | 1 + dev-python/shiboken2/shiboken2-5.15.9.ebuild | 175 +++++++++++++++++++++++++++ 2 files changed, 176 insertions(+) diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest index 5fb712c853db..c9a0f9484824 100644 --- a/dev-python/shiboken2/Manifest +++ b/dev-python/shiboken2/Manifest @@ -1 +1,2 @@ DIST pyside-setup-opensource-src-5.15.8.tar.xz 3582256 BLAKE2B eef6668c612c39eac4ea29db4eee0cc6eef72034babaa14525ca63cf6e02695df27bf8a6764110c4bcc77f55c7e9fb531074916a45d7ea324265e50d9a60d592 SHA512 78e19a8e8fa413bb784f16847d5774e4362409a2bd83567177b83f1391c37305d373155fb95ea569c6c483175e62a0d3f5d91a2fd5dae85d48c8047d242b9e22 +DIST pyside-setup-opensource-src-5.15.9.tar.xz 3581660 BLAKE2B 65d5317f9ea55385bbe093cf43c214655effd877feed6409acc4f6f65768dcde8c94c4f29157f8d7dcb36d442c649290764706834885b08ecf9934b383b3e2a4 SHA512 cc63d64b909f1fd98b64a0bba61b278b1a5b60059168287546ee36204ede2df4317eb4ce5638a268d387e6db40fec203631fc4a48e4116a6b4a30d675bf876d3 diff --git a/dev-python/shiboken2/shiboken2-5.15.9.ebuild b/dev-python/shiboken2/shiboken2-5.15.9.ebuild new file mode 100644 index 000000000000..f52b4f360512 --- /dev/null +++ b/dev-python/shiboken2/shiboken2-5.15.9.ebuild @@ -0,0 +1,175 @@ +# 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_{9..11} ) + +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 ~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-2)*: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} + =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.6-fix-pyside2-compile.patch + "${FILESDIR}"/${PN}-5.15.8-py-limited-api.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 + + # 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/'$(CPP=clang clang-fullversion)'/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 +}