public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/shiboken2/
Date: Thu, 30 May 2024 15:35:21 +0000 (UTC)	[thread overview]
Message-ID: <1717083288.caf2dd83fc747b450068a3f0b7ebd1b966a0f69b.andrewammerlaan@gentoo> (raw)

commit:     caf2dd83fc747b450068a3f0b7ebd1b966a0f69b
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 15:33:57 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu May 30 15:34:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caf2dd83

dev-python/shiboken2: add 5.15.14

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-python/shiboken2/Manifest                 |   1 +
 dev-python/shiboken2/shiboken2-5.15.14.ebuild | 173 ++++++++++++++++++++++++++
 2 files changed, 174 insertions(+)

diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index e0d57a9d915f..4778a534d869 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1 +1,2 @@
 DIST pyside-setup-opensource-src-5.15.13.tar.xz 3585684 BLAKE2B be464e1a4a5e1523dbc214fdb7be7c5679f33835910d6c12ba464104f3582905f22dd3ae05cbfbb0a7b2d29748335e15d3069d25c754364f5abce85b8b6c8855 SHA512 559e1d474e382ec835cdf2bc69eb27113fdb920a96a63ab0ee022c2a9d2141e5919afd566cb82701e4d2130b142aa59fcbfd60db34823a4f03b879eee5d9e3a8
+DIST pyside-setup-opensource-src-5.15.14.tar.xz 3586520 BLAKE2B ef103cf3116af2c1378018d44abf3766fed6ba545d0e5f3ea6f720047a884edc1eac2dbfce4ddd806472f2ac6355166fd0cef5427f1f85e73306544306adf003 SHA512 c6ca15cc3a3051c00519d9ccb64d48977f8e5587938f97205fe96511ec7bca1a67308325bc1d61712475514c2a1b351fbac2c84f5cee923f55eb91869f49acd5

diff --git a/dev-python/shiboken2/shiboken2-5.15.14.ebuild b/dev-python/shiboken2/shiboken2-5.15.14.ebuild
new file mode 100644
index 000000000000..79e1ac813ee6
--- /dev/null
+++ b/dev-python/shiboken2/shiboken2-5.15.14.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2024 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_{10..11} )
+
+LLVM_COMPAT=( 15 )
+
+inherit cmake llvm-r1 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="5/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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.
+RDEPEND="${PYTHON_DEPS}
+	=dev-qt/qtcore-${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
+		=dev-qt/qtxml-${QT_PV}
+		=dev-qt/qtxmlpatterns-${QT_PV}
+	)
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	vulkan? ( dev-util/vulkan-headers )
+	!dev-python/shiboken2:0
+"
+DEPEND="${RDEPEND}
+	test? ( =dev-qt/qttest-${QT_PV} )
+"
+
+DOCS=( AUTHORS )
+
+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}"
+			-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 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
+}


             reply	other threads:[~2024-05-30 15:35 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-30 15:35 Andrew Ammerlaan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-06-06 16:43 [gentoo-commits] repo/gentoo:master commit in: dev-python/shiboken2/ Andreas Sturmlechner
2024-06-01 15:59 Arthur Zamarin
2024-06-01 10:25 Arthur Zamarin
2024-04-04  4:23 Arthur Zamarin
2024-04-03 20:45 Arthur Zamarin
2024-03-24 20:38 Andrew Ammerlaan
2024-02-11 14:38 Andrew Ammerlaan
2024-02-01 23:37 Andreas Sturmlechner
2024-01-31  7:18 Joonas Niilola
2024-01-29  4:22 Ionen Wolkens
2024-01-03 12:02 Andrew Ammerlaan
2023-12-03  5:45 Arthur Zamarin
2023-10-09 10:41 Andrew Ammerlaan
2023-10-06  7:43 Andrew Ammerlaan
2023-10-03 15:27 Andrew Ammerlaan
2023-10-03 14:27 Andrew Ammerlaan
2023-09-11  6:48 Jakov Smolić
2023-07-24 22:50 Sam James
2023-07-24 21:02 Sam James
2023-07-24 12:56 Michał Górny
2023-06-14 19:59 Andrew Ammerlaan
2023-05-27 13:42 Arthur Zamarin
2023-05-26  7:18 Sam James
2023-05-23 17:50 Arthur Zamarin
2023-04-11 18:12 Andrew Ammerlaan
2023-03-05 11:05 Michał Górny
2023-03-05  7:39 Arthur Zamarin
2023-02-07 17:47 Sam James
2023-02-07 16:54 Sam James
2023-01-28 19:56 Michał Górny
2023-01-28 18:58 Arthur Zamarin
2022-12-04 23:31 Sam James
2022-12-04 21:32 Sam James
2022-11-07 11:05 Andrew Ammerlaan
2022-11-04  8:38 Michał Górny
2022-11-04  8:16 Agostino Sarubbo
2022-11-03 22:04 Sam James
2022-11-03 19:18 Arthur Zamarin
2022-10-24  5:14 Michał Górny
2022-09-23 11:26 Andrew Ammerlaan
2022-09-01 19:13 Sam James
2022-08-29 14:31 Sam James
2022-08-13 14:18 Andrew Ammerlaan
2022-08-12 15:13 Andrew Ammerlaan
2022-08-03  9:00 Michał Górny
2022-08-03  4:38 Arthur Zamarin
2022-08-02 20:27 Sam James
2022-08-02 20:27 Sam James
2022-07-18 10:22 Sam James
2022-02-25 18:53 Arthur Zamarin
2021-10-17  9:41 Michał Górny
2021-09-03  1:53 Sam James
2021-07-19 18:36 Sam James
2021-07-19 18:36 Sam James
2021-07-18 10:23 Andrew Ammerlaan
2021-07-05 22:35 Sam James
2021-06-02 17:31 Rick Farina
2021-06-01 17:07 Andrew Ammerlaan
2021-05-30  9:45 Agostino Sarubbo
2021-05-18  6:29 Agostino Sarubbo
2021-02-21  8:06 Sam James
2020-10-14 15:38 Rick Farina
2020-10-14 15:38 Rick Farina
2020-05-22 17:23 Rick Farina
2020-05-22 17:23 Rick Farina
2020-05-22 17:23 Rick Farina

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1717083288.caf2dd83fc747b450068a3f0b7ebd1b966a0f69b.andrewammerlaan@gentoo \
    --to=andrewammerlaan@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox