commit: 1cf49ac25620add085d0a87b2adf9faafbece292 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Mon Nov 10 16:55:43 2025 +0000 Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org> CommitDate: Fri Nov 14 16:13:51 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cf49ac2
dev-python/pyside: add 6.10.0 * Don't vendor system ffmpeg. (This addresses bug #965033). * Handle automagic, shiboken links against libxml2, libxslt and libclang. Bug: https://bugs.gentoo.org/965033 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44590 Closes: https://github.com/gentoo/gentoo/pull/44590 Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org> dev-python/pyside/Manifest | 1 + .../files/pyside-6.10.0-dont-vendor-ffmpeg.patch | 18 ++++++++++++++++++ .../{pyside-6.9999.ebuild => pyside-6.10.0.ebuild} | 8 ++++++++ dev-python/pyside/pyside-6.9999.ebuild | 8 ++++++++ 4 files changed, 35 insertions(+) diff --git a/dev-python/pyside/Manifest b/dev-python/pyside/Manifest index d8177b5beb77..1141c5c8688a 100644 --- a/dev-python/pyside/Manifest +++ b/dev-python/pyside/Manifest @@ -1 +1,2 @@ +DIST pyside-setup-everywhere-src-6.10.0.tar.xz 17758096 BLAKE2B c627bd68f13e6af1b49f5857fea0d541e8d8fd4ef2577fcd22e80ee93475f19067f1e2fe85a04b786421960ba4eebb9dc9c5cf8f64b89a4a4e65f58cf005196d SHA512 023599df8423a70ff776159ba302e4a72f43f0b3928f088d6cf429a59a229b170d11671527384b17360a03764ef5b70e358a5df985780212ac7edccb8c2609b5 DIST pyside-setup-everywhere-src-6.9.3.tar.xz 16663380 BLAKE2B 10834a35c3de13657256892111e3f54dceeb4fef61618b61672018bbffa007cfac0b602bd39b3ef7a472ba47f9444c7e7cf6d43cb411de0dd26333faa0814e7a SHA512 457a447146a8e5be94940b06172a21cdc9f1407c9c48e6449d410ae3f122002f5970c3841cba6135fb4d889c58a4ed1b648f03b708f9a5cfb9f1cc93cbb9d561 diff --git a/dev-python/pyside/files/pyside-6.10.0-dont-vendor-ffmpeg.patch b/dev-python/pyside/files/pyside-6.10.0-dont-vendor-ffmpeg.patch new file mode 100644 index 000000000000..72c09ec5f9ca --- /dev/null +++ b/dev-python/pyside/files/pyside-6.10.0-dont-vendor-ffmpeg.patch @@ -0,0 +1,18 @@ +--- a/build_scripts/platforms/unix.py ++++ b/build_scripts/platforms/unix.py +@@ -234,14 +234,6 @@ def prepare_packages_posix(pyside_build, _vars, cross_build=False): + "{st_build_dir}/{st_package_name}/jar", + _vars=_vars) + +- # Some libraries specific to Linux/Android from 6.8 +- # eg: the libav* libraries are required for the multimedia module +- if config.is_internal_pyside_build() and (sys.platform != "darwin" or is_android): +- qt_multimedia_filters = [f"lib{lib}*.so*" for lib in PYSIDE_MULTIMEDIA_LIBS] +- copydir("{qt_lib_dir}", destination_qt_dir / "lib", +- _filter=qt_multimedia_filters, +- recursive=False, _vars=_vars, force_copy_symlinks=True) +- + # Copy Qt libs to package + if OPTION["STANDALONE"]: + if config.is_internal_pyside_build() or config.is_internal_shiboken_generator_build(): + diff --git a/dev-python/pyside/pyside-6.9999.ebuild b/dev-python/pyside/pyside-6.10.0.ebuild similarity index 99% copy from dev-python/pyside/pyside-6.9999.ebuild copy to dev-python/pyside/pyside-6.10.0.ebuild index 312641ec1cc7..312d36ec4578 100644 --- a/dev-python/pyside/pyside-6.9999.ebuild +++ b/dev-python/pyside/pyside-6.10.0.ebuild @@ -146,7 +146,12 @@ QT_PV="$(ver_cut 1-3)*:6" # WebEngine needs sound support, so enable either pulseaudio or alsa RDEPEND=" + dev-libs/libxml2:= + dev-libs/libxslt =dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?] + $(llvm_gen_dep ' + llvm-core/clang:${LLVM_SLOT} + ') 3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] ) bluetooth? ( =dev-qt/qtconnectivity-${QT_PV}[bluetooth] ) charts? ( =dev-qt/qtcharts-${QT_PV} ) @@ -223,6 +228,7 @@ BDEPEND=" PATCHES=( # Needs porting to newer wheel and setuptools "${FILESDIR}/${PN}-6.8.2-quick-fix-build-wheel.patch" + "${FILESDIR}/${PN}-6.10.0-dont-vendor-ffmpeg.patch" ) # Build system duplicates system libraries. TODO: fix @@ -292,6 +298,8 @@ python_prepare_all() { linux [QtGui::qpainter_test] linux + [QtCore::qrangemodel_test] + linux EOF fi } diff --git a/dev-python/pyside/pyside-6.9999.ebuild b/dev-python/pyside/pyside-6.9999.ebuild index 312641ec1cc7..312d36ec4578 100644 --- a/dev-python/pyside/pyside-6.9999.ebuild +++ b/dev-python/pyside/pyside-6.9999.ebuild @@ -146,7 +146,12 @@ QT_PV="$(ver_cut 1-3)*:6" # WebEngine needs sound support, so enable either pulseaudio or alsa RDEPEND=" + dev-libs/libxml2:= + dev-libs/libxslt =dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?] + $(llvm_gen_dep ' + llvm-core/clang:${LLVM_SLOT} + ') 3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] ) bluetooth? ( =dev-qt/qtconnectivity-${QT_PV}[bluetooth] ) charts? ( =dev-qt/qtcharts-${QT_PV} ) @@ -223,6 +228,7 @@ BDEPEND=" PATCHES=( # Needs porting to newer wheel and setuptools "${FILESDIR}/${PN}-6.8.2-quick-fix-build-wheel.patch" + "${FILESDIR}/${PN}-6.10.0-dont-vendor-ffmpeg.patch" ) # Build system duplicates system libraries. TODO: fix @@ -292,6 +298,8 @@ python_prepare_all() { linux [QtGui::qpainter_test] linux + [QtCore::qrangemodel_test] + linux EOF fi }
