From 441369caa3d11703d0349d4b9746b7ad10aa6cb2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 7 Nov 2022 15:22:09 +0000 Subject: gentoo auto-resync : 07:11:2022 - 15:22:08 --- dev-python/pyside6/Manifest | 6 +- dev-python/pyside6/metadata.xml | 2 + dev-python/pyside6/pyside6-6.3.2-r1.ebuild | 210 +++++++++++++++++++++++++++ dev-python/pyside6/pyside6-6.3.2.ebuild | 210 --------------------------- dev-python/pyside6/pyside6-6.4.0.ebuild | 223 +++++++++++++++++++++++++++++ 5 files changed, 439 insertions(+), 212 deletions(-) create mode 100644 dev-python/pyside6/pyside6-6.3.2-r1.ebuild delete mode 100644 dev-python/pyside6/pyside6-6.3.2.ebuild create mode 100644 dev-python/pyside6/pyside6-6.4.0.ebuild (limited to 'dev-python/pyside6') diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest index 027703580052..b2a4dd1428b0 100644 --- a/dev-python/pyside6/Manifest +++ b/dev-python/pyside6/Manifest @@ -1,5 +1,7 @@ AUX pyside6-6.3.1-fix-designer-plugin-install-location.patch 685 BLAKE2B 2f3b3873f4f1f46b737ae85467798b25fd1634a15a391cd7fa04a1c391a56cd57a68ec4f98b51460cd805fc75cc0ee50b9addc4a757520429f6b7e66101ed609 SHA512 76ca097b42b47d3b290966fe805b1b4f58e04ab05d8e5420dfa1014e3399452a0326d964d2304068c78a6a82bcea2883d5c9e6a51b383a7f96a7520cfebdfcad AUX pyside6-6.3.1-no-strip.patch 953 BLAKE2B f88bac603a584213a864fcfc7c528f1d236ebdbfb653c3877316cd0b95c30c2f7288b1c81c6a90a3e4228536da4aa63552991fefa952f450b0b852b3e2aed94a SHA512 2920075a26fc059bdebc8eb5fa7c15de74729b7f8d1eb59197f7426afa7a65f1f78a8ebb76e946b2dfaf5817dbf090744bafaed2f2156f2d1548c2932a7ce61a DIST pyside-setup-opensource-src-6.3.2.tar.xz 7853068 BLAKE2B 5b39e2f98bca0155d3f6617be206b759b628d0126fd30d76d67352c5c78a385938ce61a3c42b75343b9fde708e9f66617122c687ea9ecffca9cd0ab3af91a2ff SHA512 8d25d20b64ac7874e9b7866f101b6bfd7b6fe1fffa602fec6113e1fdaa11608f14a58c2ae1d87b45ee3eac6a07bd55e66dbbd222727cfe6860d8f444bc2b1ff0 -EBUILD pyside6-6.3.2.ebuild 8735 BLAKE2B 202fa199e5a6e9090007340350e972216af19c660eb95f6fd92db66018a17d4c4927b504266b7d8beed97a3499c3424cee0f1c54ebe756532ed03577dad45449 SHA512 5731814b4146c6caea2fa7dc3470948fc42a4ba35bc2b38345b62dd1d430064e6052b7d9d69ee701cb29bcdd4c9a0f7dda90604cfbe1cebbffc94545aff6d6ad -MISC metadata.xml 1717 BLAKE2B 9bacda544318b48fc7b97139e22f95c2b3f9a5bc29ad4660db9ead6a89859e16eebbcc2d54d5a2639f7a1d458fcf2b39ef9eb846589cffc1d111b256678e3777 SHA512 7b18d2124bd99d77715d1ce44d2a154799d5055fef4734b06e159d73b598ef8065c0f18076fe7ff4bc59f2b995ccd7eaa125aae1fa5fc726da79c7c3f3873c3c +DIST pyside-setup-opensource-src-6.4.0.tar.xz 8551772 BLAKE2B 180d9f2182b8df04394677bbcb0765764d9de1f34064fc688a3ccae8ec37174b4a01fa70c80d98c7ca7fe6b45239225bd801c552d332e2c6fc4a3726535e72e9 SHA512 0517408f110830b888f04777c60b29479831604877da13c5a41a710888ebe53064f06d9b7b61d5c6e6a483ac5ee1639a63bb7f9844301df53e3e9ca8eafcf9e9 +EBUILD pyside6-6.3.2-r1.ebuild 8719 BLAKE2B 85fa1d95d2f903f821ac05d06c56b4f545e368a18c5676bd8b9f9beb1fead9439562ea8fce0265eb8971fc929cfdabe0fb17345b5b0bac95b4b26512da02bf44 SHA512 5ef25c71fca8b1c166be0d828395d1db6645182a702aedcb157ba8a3a423abfe7bf0cbe77ba3b93fac88ce23a613c4eafcea9d176074f76e3154ecf4fe839a89 +EBUILD pyside6-6.4.0.ebuild 9171 BLAKE2B b679ec96c272a1a2396bd46e2906a0b89f348162f658743670c2d5967d9941f5d6318a84563e979cd1956fd3a243c6ecceb9010baa62c50f398ff3944145b5e7 SHA512 7516fb3e2d006e33c2e4e9de4df6b86d58735205521a51a4750918afa0221d307e8cc67468be5db45443945cd59c293074e36452731ed385b262ca2a822d11a9 +MISC metadata.xml 1830 BLAKE2B fe8b0657824ef49182b8a5ac334539e10ff88d56f1d0ff517ce9247f0ec1c8b82158688fefde8e01c99fadcb0268e6e0109fef49830ffdec821e803e2ad23517 SHA512 4b49ec54b699673da2c9173f849f70e2a42321608c2893fa9d161a2ff51a917864042b3c0421c3723b98bcbde0d53e78e8c832f25a689dc7e3499d05446a014b diff --git a/dev-python/pyside6/metadata.xml b/dev-python/pyside6/metadata.xml index 7ae8b44a69d4..ae61fd0e0866 100644 --- a/dev-python/pyside6/metadata.xml +++ b/dev-python/pyside6/metadata.xml @@ -10,6 +10,7 @@ Bernd Waibel + Build QtCharts module Build QtConcurrent module Build QtDesigner and QtUiTools modules Build QtGui "QOpenGL*" classes @@ -17,6 +18,7 @@ Build QtHelp module Build QtMultimedia and QtMultimediaWidgets modules Build QtNetwork module + Build QtNetworkAuth module Build QtPositioning module Build QtPrintSupport module Build QtQml module diff --git a/dev-python/pyside6/pyside6-6.3.2-r1.ebuild b/dev-python/pyside6/pyside6-6.3.2-r1.ebuild new file mode 100644 index 000000000000..50a3f9039937 --- /dev/null +++ b/dev-python/pyside6/pyside6-6.3.2-r1.ebuild @@ -0,0 +1,210 @@ +# Copyright 1999-2022 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_{8..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 "PySide6/QtGui/CMakeLists.txt" and +# "PySide6/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/PySide6" +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}/sources/pyside6" + +# See "sources/pyside6/PySide6/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" +IUSE=" + dbus +concurrent designer gles2-only +gui help multimedia + +network opengl positioning printsupport qml quick quick3d + serialport +sql svg test +testlib webchannel webengine + websockets +widgets +xml +" + +# Manually reextract these requirements on version bumps by running the +# following one-liner from within "${S}": +# $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt +# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module. +REQUIRED_USE="${PYTHON_REQUIRED_USE} + designer? ( widgets ) + gles2-only? ( gui ) + help? ( widgets ) + multimedia? ( gui network ) + opengl? ( gui ) + printsupport? ( widgets ) + qml? ( network ) + quick? ( gui network opengl qml ) + quick3d? ( gui network opengl qml quick ) + sql? ( widgets ) + svg? ( gui ) + testlib? ( widgets ) + webengine? ( network gui printsupport webchannel ) + websockets? ( network ) + widgets? ( 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-2)*:6" + +RDEPEND="${PYTHON_DEPS} + ~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}] + =dev-qt/qtbase-${QT_PV}[dbus?,opengl?,gles2-only=,sql?,network?,concurrent?,widgets?,xml(+)?] + designer? ( =dev-qt/qttools-${QT_PV}[designer] ) + gui? ( =dev-qt/qtbase-${QT_PV}[gui,jpeg] ) + help? ( =dev-qt/qttools-${QT_PV}[assistant] ) + multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] ) + positioning? ( =dev-qt/qtpositioning-${QT_PV}[qml(+)?] ) + printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] ) + qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] ) + quick3d? ( =dev-qt/qtquick3d-${QT_PV} ) + serialport? ( =dev-qt/qtserialport-${QT_PV} ) + svg? ( =dev-qt/qtsvg-${QT_PV} ) + testlib? ( =dev-qt/qtbase-${QT_PV}[gui] ) + webchannel? ( =dev-qt/qtwebchannel-${QT_PV}[qml(+)?] ) + webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] ) + websockets? ( =dev-qt/qtwebsockets-${QT_PV} ) +" +DEPEND="${RDEPEND} + test? ( =dev-qt/qtbase-${QT_PV}[gui] ) +" +# testlib is toggled by the gui flag on qtbase + +PATCHES=( + "${FILESDIR}/${PN}-6.3.1-no-strip.patch" + "${FILESDIR}/${PN}-6.3.1-fix-designer-plugin-install-location.patch" +) + +src_configure() { + # See collect_module_if_found macros in PySideHelpers.cmake + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes + #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help) + #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets) + #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml) + # try to avoid pre-stripping + -DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes + -DQFP_NO_STRIP=yes + + ) + + pyside6_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 pyside6_configure +} + +src_compile() { + python_foreach_impl cmake_src_compile +} + +src_test() { + local -x PYTHONDONTWRITEBYTECODE + python_foreach_impl virtx cmake_src_test +} + +src_install() { + pyside6_install() { + cmake_src_install + python_optimize + + # Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig + # file for the current Python target. See also: + # https://github.com/leycec/raiagent/issues/73 + sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \ + "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die + + # Uniquify the PySide6 pkgconfig file for the current Python target, + # preserving an unversioned "pyside6.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 pyside6_install + + # CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing + # downstream consumers (e.g., pyside6-tools) to target one + # "libpyside6-*.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~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \ + "${ED}/usr/$(get_libdir)/cmake/PySide6-${PV}/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die +} diff --git a/dev-python/pyside6/pyside6-6.3.2.ebuild b/dev-python/pyside6/pyside6-6.3.2.ebuild deleted file mode 100644 index 6f0f4f03a176..000000000000 --- a/dev-python/pyside6/pyside6-6.3.2.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2022 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_{8..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 "PySide6/QtGui/CMakeLists.txt" and -# "PySide6/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/PySide6" -SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz" -S="${WORKDIR}/${MY_P}/sources/pyside6" - -# See "sources/pyside6/PySide6/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" -IUSE=" - dbus +concurrent designer gles2-only +gui help multimedia - +network opengl positioning printsupport qml quick quick3d - serialport +sql svg test +testlib webchannel webengine - websockets +widgets +xml -" - -# Manually reextract these requirements on version bumps by running the -# following one-liner from within "${S}": -# $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt -# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - designer? ( widgets ) - gles2-only? ( gui ) - help? ( widgets ) - multimedia? ( gui network ) - opengl? ( gui ) - printsupport? ( widgets ) - qml? ( network ) - quick? ( gui network opengl qml ) - quick3d? ( gui network opengl qml quick ) - sql? ( widgets ) - svg? ( gui ) - testlib? ( widgets ) - webengine? ( network gui printsupport webchannel ) - websockets? ( network ) - widgets? ( 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-2):6" - -RDEPEND="${PYTHON_DEPS} - >=dev-python/shiboken6-${PV}[${PYTHON_USEDEP}] - >=dev-qt/qtbase-${QT_PV}[dbus?,opengl?,gles2-only=,sql?,network?,concurrent?,widgets?,xml(+)?] - designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) - gui? ( >=dev-qt/qtbase-${QT_PV}[gui,jpeg] ) - help? ( >=dev-qt/qttools-${QT_PV}[assistant] ) - multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] ) - positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml(+)?] ) - printsupport? ( >=dev-qt/qtbase-${QT_PV}[gui,widgets] ) - qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] ) - quick3d? ( >=dev-qt/qtquick3d-${QT_PV} ) - serialport? ( >=dev-qt/qtserialport-${QT_PV} ) - svg? ( >=dev-qt/qtsvg-${QT_PV} ) - testlib? ( >=dev-qt/qtbase-${QT_PV}[gui] ) - webchannel? ( >=dev-qt/qtwebchannel-${QT_PV}[qml(+)?] ) - webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] ) - websockets? ( >=dev-qt/qtwebsockets-${QT_PV} ) -" -DEPEND="${RDEPEND} - test? ( >=dev-qt/qtbase-${QT_PV}[gui] ) -" -# testlib is toggled by the gui flag on qtbase - -PATCHES=( - "${FILESDIR}/${PN}-6.3.1-no-strip.patch" - "${FILESDIR}/${PN}-6.3.1-fix-designer-plugin-install-location.patch" -) - -src_configure() { - # See collect_module_if_found macros in PySideHelpers.cmake - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes - #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help) - #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets) - #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml) - # try to avoid pre-stripping - -DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes - -DQFP_NO_STRIP=yes - - ) - - pyside6_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 pyside6_configure -} - -src_compile() { - python_foreach_impl cmake_src_compile -} - -src_test() { - local -x PYTHONDONTWRITEBYTECODE - python_foreach_impl virtx cmake_src_test -} - -src_install() { - pyside6_install() { - cmake_src_install - python_optimize - - # Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig - # file for the current Python target. See also: - # https://github.com/leycec/raiagent/issues/73 - sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \ - "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die - - # Uniquify the PySide6 pkgconfig file for the current Python target, - # preserving an unversioned "pyside6.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 pyside6_install - - # CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing - # downstream consumers (e.g., pyside6-tools) to target one - # "libpyside6-*.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~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \ - "${ED}/usr/$(get_libdir)/cmake/PySide6-${PV}/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die -} diff --git a/dev-python/pyside6/pyside6-6.4.0.ebuild b/dev-python/pyside6/pyside6-6.4.0.ebuild new file mode 100644 index 000000000000..c388bbd9a358 --- /dev/null +++ b/dev-python/pyside6/pyside6-6.4.0.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2022 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_{8..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 "PySide6/QtGui/CMakeLists.txt" and +# "PySide6/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/PySide6" +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}/sources/pyside6" + +# See "sources/pyside6/PySide6/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" +IUSE=" + +dbus charts +concurrent designer gles2-only +gui help multimedia + +network network-auth +opengl positioning +printsupport qml quick + quick3d serialport +sql svg test +testlib webchannel webengine + websockets +widgets +xml +" + +# Manually reextract these requirements on version bumps by running the +# following one-liner from within "${S}": +# $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt +# Note that the "designer" USE flag corresponds to the "Qt6UiTools" module. +REQUIRED_USE="${PYTHON_REQUIRED_USE} + charts? ( gui widgets ) + designer? ( widgets ) + gles2-only? ( gui ) + gui? ( dbus opengl ) + help? ( network sql widgets ) + multimedia? ( gui network ) + network-auth? ( network ) + opengl? ( gui ) + printsupport? ( widgets ) + qml? ( network ) + quick? ( gui network opengl qml ) + quick3d? ( gui network opengl qml quick ) + sql? ( widgets ) + svg? ( gui ) + testlib? ( widgets ) + webchannel? ( qml ) + webengine? ( network gui printsupport quick webchannel ) + websockets? ( network ) + widgets? ( 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-2)*:6" + +RDEPEND="${PYTHON_DEPS} + ~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}] + =dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?] + charts? ( =dev-qt/qtcharts-${QT_PV} ) + designer? ( =dev-qt/qttools-${QT_PV}[designer] ) + gui? ( + =dev-qt/qtbase-${QT_PV}[gui,jpeg] + x11-libs/libxkbcommon + ) + help? ( =dev-qt/qttools-${QT_PV}[assistant] ) + multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] ) + network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} ) + positioning? ( =dev-qt/qtpositioning-${QT_PV} ) + printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] ) + qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] ) + quick3d? ( =dev-qt/qtquick3d-${QT_PV} ) + serialport? ( =dev-qt/qtserialport-${QT_PV} ) + svg? ( =dev-qt/qtsvg-${QT_PV} ) + testlib? ( =dev-qt/qtbase-${QT_PV}[gui] ) + webchannel? ( =dev-qt/qtwebchannel-${QT_PV} ) + webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] ) + websockets? ( =dev-qt/qtwebsockets-${QT_PV} ) +" +DEPEND="${RDEPEND} + test? ( =dev-qt/qtbase-${QT_PV}[gui] ) +" +# testlib is toggled by the gui flag on qtbase + +PATCHES=( + "${FILESDIR}/${PN}-6.3.1-no-strip.patch" + "${FILESDIR}/${PN}-6.3.1-fix-designer-plugin-install-location.patch" +) + +src_configure() { + # See collect_module_if_found macros in PySideHelpers.cmake + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes + #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=yes + #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets) + #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml) + # try to avoid pre-stripping + -DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes + -DQFP_NO_STRIP=yes + + ) + + pyside6_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 pyside6_configure +} + +src_compile() { + python_foreach_impl cmake_src_compile +} + +src_test() { + local -x PYTHONDONTWRITEBYTECODE + python_foreach_impl virtx cmake_src_test +} + +src_install() { + pyside6_install() { + cmake_src_install + python_optimize + + # Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig + # file for the current Python target. See also: + # https://github.com/leycec/raiagent/issues/73 + sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \ + "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die + + # Uniquify the PySide6 pkgconfig file for the current Python target, + # preserving an unversioned "pyside6.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 pyside6_install + + # CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing + # downstream consumers (e.g., pyside6-tools) to target one + # "libpyside6-*.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~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \ + "${ED}/usr/$(get_libdir)/cmake/PySide6-${PV}/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die +} -- cgit v1.2.3