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 9354A158020 for ; Tue, 13 Dec 2022 13:09:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31339E086C; Tue, 13 Dec 2022 13:09:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03102E0864 for ; Tue, 13 Dec 2022 13:09:00 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D0042341104 for ; Tue, 13 Dec 2022 13:08:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2026372B for ; Tue, 13 Dec 2022 13:08:58 +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: <1670936926.35d74706cde6504cf07c5158940c968bb8f84dff.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/shiboken6/files/, dev-python/shiboken6/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/shiboken6/Manifest dev-python/shiboken6/files/shiboken6-6.4.1-bug2127.patch dev-python/shiboken6/shiboken6-6.4.1.ebuild X-VCS-Directories: dev-python/shiboken6/files/ dev-python/shiboken6/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 35d74706cde6504cf07c5158940c968bb8f84dff X-VCS-Branch: master Date: Tue, 13 Dec 2022 13:08:58 +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: edc53e53-75bb-40f0-b687-5576eb4110fb X-Archives-Hash: 6dbfec7e29c51d1fe2eebc2d49d605ca commit: 35d74706cde6504cf07c5158940c968bb8f84dff Author: Andrew Ammerlaan gentoo org> AuthorDate: Tue Dec 13 12:43:31 2022 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Tue Dec 13 13:08:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35d74706 dev-python/shiboken6: add 6.4.1 Signed-off-by: Andrew Ammerlaan gentoo.org> dev-python/shiboken6/Manifest | 1 + .../shiboken6/files/shiboken6-6.4.1-bug2127.patch | 15 ++ dev-python/shiboken6/shiboken6-6.4.1.ebuild | 170 +++++++++++++++++++++ 3 files changed, 186 insertions(+) diff --git a/dev-python/shiboken6/Manifest b/dev-python/shiboken6/Manifest index 7ec686b25ee3..7d24903ef481 100644 --- a/dev-python/shiboken6/Manifest +++ b/dev-python/shiboken6/Manifest @@ -1 +1,2 @@ DIST pyside-setup-opensource-src-6.4.0.tar.xz 8551772 BLAKE2B 180d9f2182b8df04394677bbcb0765764d9de1f34064fc688a3ccae8ec37174b4a01fa70c80d98c7ca7fe6b45239225bd801c552d332e2c6fc4a3726535e72e9 SHA512 0517408f110830b888f04777c60b29479831604877da13c5a41a710888ebe53064f06d9b7b61d5c6e6a483ac5ee1639a63bb7f9844301df53e3e9ca8eafcf9e9 +DIST pyside-setup-opensource-src-6.4.1.tar.xz 8755436 BLAKE2B 9b88115374eb690282397fbf33fa6698043c77c8defd40fd0d711dee39aa4cd56af94533cf1703b87084e8755758fe636b877071a29043ee7f4c8e406e47cf38 SHA512 330eef5d63c5225e0d3ee8be1229e81ac04ec39772766fd2dfe197291a8153c00a2cd548ce6e49a0a198b3081535c79a7e649a6e9f03dfe67df68790543ea023 diff --git a/dev-python/shiboken6/files/shiboken6-6.4.1-bug2127.patch b/dev-python/shiboken6/files/shiboken6-6.4.1-bug2127.patch new file mode 100644 index 000000000000..80007f621604 --- /dev/null +++ b/dev-python/shiboken6/files/shiboken6-6.4.1-bug2127.patch @@ -0,0 +1,15 @@ +diff --git a/shibokenmodule/files.dir/shibokensupport/signature/parser.py b/shibokenmodule/files.dir/shibokensupport/signature/parser.py +index be82a4f92..66d79ad27 100644 +--- a/shibokenmodule/files.dir/shibokensupport/signature/parser.py ++++ b/shibokenmodule/files.dir/shibokensupport/signature/parser.py +@@ -69,7 +69,7 @@ def _get_flag_enum_option(): + flag = getattr(sys, sysname) + if not isinstance(flag, int): + flag = True +- p = f"\n *** Python is at version {'.'.join(map(str, pyminver))} now." ++ p = f"\n *** Python is at version {'.'.join(map(str, pyminver or (0,)))} now." + # PYSIDE-1797: Emit a warning when we may remove pep384_issue33738.cpp + if pyminver and pyminver >= (3, 8): + warnings.warn(f"{p} The file pep384_issue33738.cpp should be removed ASAP! ***") +-- +cgit v1.2.1 diff --git a/dev-python/shiboken6/shiboken6-6.4.1.ebuild b/dev-python/shiboken6/shiboken6-6.4.1.ebuild new file mode 100644 index 000000000000..d57f4b7a2956 --- /dev/null +++ b/dev-python/shiboken6/shiboken6-6.4.1.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: Split the "/usr/bin/shiboken6" binding generator from the +# "/usr/lib64/libshiboken6-*.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/shiboken6/faq.html#is-there-any-runtime-dependency-on-the-generated-binding +# Once split, the PySide6 ebuild should be revised to require +# "/usr/bin/shiboken6" at build time and "libshiboken6-*.so" at runtime. +# TODO: Add PyPy once officially supported. See also: +# https://bugreports.qt.io/browse/PYSIDE-535 +PYTHON_COMPAT=( python3_{8..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/PySide6" +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}/sources/shiboken6" + +# The "sources/shiboken6/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 shiboken6 output to be +# arbitrarily relicensed. (TODO) +LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3" +SLOT="0" +KEYWORDS="~amd64" +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)*:6" + +# Since Clang is required at both build- and runtime, BDEPEND is omitted here. +LLVM_MAX_SLOT=15 +RDEPEND="${PYTHON_DEPS} + =dev-qt/qtbase-${QT_PV} + =dev-libs/libxml2-2.6.32 + >=dev-libs/libxslt-1.1.19 + ) + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + vulkan? ( dev-util/vulkan-headers ) +" +DEPEND="${RDEPEND} + test? ( =dev-qt/qtbase-${QT_PV}[gui] ) +" +# testlib is toggled by the gui flag on qtbase + +DOCS=( AUTHORS ) + +PATCHES=( + "${FILESDIR}/${PN}-6.3.1-no-strip.patch" + "${FILESDIR}/${PN}-6.4.1-bug2127.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 + + # Shiboken6 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 + + # Shiboken6 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. + # PySide6 does *NOT* care whether the end user has done so or not, as + # PySide6 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) + ) + + shiboken6_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 shiboken6_configure +} + +src_compile() { + python_foreach_impl cmake_src_compile +} + +src_test() { + python_foreach_impl cmake_src_test +} + +src_install() { + shiboken6_install() { + cmake_src_install + python_optimize + + # Uniquify the "shiboken6" executable for the current Python target, + # preserving an unversioned "shiboken6" file arbitrarily associated + # with the last Python target. + cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die + + # Uniquify the Shiboken6 pkgconfig file for the current Python target, + # preserving an unversioned "shiboken6.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 shiboken6_install + + # CMakeLists.txt installs a "Shiboken6Targets-gentoo.cmake" file forcing + # downstream consumers (e.g., PySide6) to target one "libshiboken6-*.so" + # library and one "shiboken6" 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~shiboken6-python[[:digit:]]\+\.[[:digit:]]\+~shiboken6${PYTHON_CONFIG_SUFFIX}~g' \ + -e 's~/bin/shiboken6~/bin/shiboken6${PYTHON_CONFIG_SUFFIX}~g' \ + "${ED}/usr/$(get_libdir)"/cmake/Shiboken6-${PV}/Shiboken6Targets-${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 +}