diff options
author | Ionen Wolkens <ionen@gentoo.org> | 2024-07-15 21:00:03 -0400 |
---|---|---|
committer | Ionen Wolkens <ionen@gentoo.org> | 2024-07-15 21:01:04 -0400 |
commit | 0927bc136427f6dd3aca6b8babfdee1641fd9c2f (patch) | |
tree | a5766e84146a03a29839975e3026b8f0cd093560 | |
parent | dev-python/pyside6: drop 6.7.1 (diff) | |
download | gentoo-0927bc136427f6dd3aca6b8babfdee1641fd9c2f.tar.gz gentoo-0927bc136427f6dd3aca6b8babfdee1641fd9c2f.tar.bz2 gentoo-0927bc136427f6dd3aca6b8babfdee1641fd9c2f.zip |
dev-python/shiboken6: drop 6.7.1
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
-rw-r--r-- | dev-python/shiboken6/Manifest | 1 | ||||
-rw-r--r-- | dev-python/shiboken6/files/shiboken6-6.7.1-add-missing-include.patch | 13 | ||||
-rw-r--r-- | dev-python/shiboken6/shiboken6-6.7.1.ebuild | 181 |
3 files changed, 0 insertions, 195 deletions
diff --git a/dev-python/shiboken6/Manifest b/dev-python/shiboken6/Manifest index a847fdbd896f..6bad2ad97ee1 100644 --- a/dev-python/shiboken6/Manifest +++ b/dev-python/shiboken6/Manifest @@ -1,2 +1 @@ -DIST pyside-setup-everywhere-src-6.7.1.tar.xz 14400976 BLAKE2B 1f6e2705aedc4151147e259da2a8fbab19a1815f19f1a36ea46dbf0bf2282a453e85a33ea8c6862072bb22699be39ab8375b48cd6d5b879de8bed5fad8cf60cb SHA512 6ca73f0b16ef43bc018aeb9e0f51d8ae91b13b79ebdfd71f5524bc0e8ef78322ba0aca81203cc5532e5096a55441fb4dabf3b628de3234b876b7a70327b714d4 DIST pyside-setup-everywhere-src-6.7.2.tar.xz 14402156 BLAKE2B 321717ba46c7ed29404ee326f852cd4032f93e23b6b32a16e4e05305ff04a00a2029ee7c1d50ad7191a836ffd9a3ae858483bac35e8254bdcaeb474e2c92df60 SHA512 4376aba85867b5a04dab9d8889f5e32cb503cb8010757c1e810e60d29755f15a002b582594d0737a4119c030b48ede26964e8b1392700a6c061d7d631cdfe73e diff --git a/dev-python/shiboken6/files/shiboken6-6.7.1-add-missing-include.patch b/dev-python/shiboken6/files/shiboken6-6.7.1-add-missing-include.patch deleted file mode 100644 index 8516809e6253..000000000000 --- a/dev-python/shiboken6/files/shiboken6-6.7.1-add-missing-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2765?filter=allopenissues -diff --git a/libshiboken/sbkmodule.cpp b/libshiboken/sbkmodule.cpp -index 47977d747..c45bf391f 100644 ---- a/libshiboken/sbkmodule.cpp -+++ b/libshiboken/sbkmodule.cpp -@@ -7,6 +7,7 @@ - #include "bindingmanager.h" - #include "sbkstring.h" - #include "sbkcppstring.h" -+#include "sbkconverter_p.h" - - #include <unordered_map> - #include <unordered_set> diff --git a/dev-python/shiboken6/shiboken6-6.7.1.ebuild b/dev-python/shiboken6/shiboken6-6.7.1.ebuild deleted file mode 100644 index 69c4efccd59c..000000000000 --- a/dev-python/shiboken6/shiboken6-6.7.1.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2024 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_{10..13} ) - -LLVM_COMPAT=( {15..18} ) - -inherit cmake flag-o-matic llvm-r1 python-r1 toolchain-funcs - -MY_PN="pyside-setup-everywhere-src" - -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_PN}-${PV}.tar.xz" -S="${WORKDIR}/${MY_PN}-${PV}/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="6/${PV}" -KEYWORDS="amd64 ~arm ~arm64" -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)*:6" - -# Since Clang is required at both build- and runtime, BDEPEND is omitted here. -RDEPEND="${PYTHON_DEPS} - =dev-qt/qtbase-${QT_PV} - $(llvm_gen_dep ' - sys-devel/clang:${LLVM_SLOT} - sys-devel/llvm:${LLVM_SLOT} - ') - docstrings? ( - >=dev-libs/libxml2-2.6.32 - >=dev-libs/libxslt-1.1.19 - ) - numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) - !dev-python/shiboken6:0 -" -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.7.1-add-missing-include.patch" -) - -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 - - 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 - - # 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/'"${clangver}"'/include"))~' \ - ApiExtractor/clangparser/compilersupport.cpp || die - - cmake_src_prepare -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/925479 - # https://bugreports.qt.io/browse/PYSIDE-2619 - filter-lto - - # 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}" - -DUSE_PYTHON_VERSION="${EPYTHON#python}" - -DFORCE_LIMITED_API=OFF - ) - # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable. - local -x LLVM_INSTALL_DIR="$(get_llvm_prefix)" - 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/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 -} |