diff options
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-5.15.16_p20241115-py3.13-pipes.patch | 21 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-5.15.16.9999.ebuild | 7 |
2 files changed, 25 insertions, 3 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.16_p20241115-py3.13-pipes.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.16_p20241115-py3.13-pipes.patch new file mode 100644 index 00000000..b04f6a46 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.16_p20241115-py3.13-pipes.patch @@ -0,0 +1,21 @@ +diff --git a/src/3rdparty/chromium/build/android/gyp/util/build_utils.py b/src/3rdparty/chromium/build/android/gyp/util/build_utils.py +index 022980517..e3f82704a 100644 +--- a/src/3rdparty/chromium/build/android/gyp/util/build_utils.py ++++ b/src/3rdparty/chromium/build/android/gyp/util/build_utils.py +@@ -12,7 +12,6 @@ import fnmatch + import json + import logging + import os +-import pipes + import re + import shutil + import stat +@@ -198,7 +197,7 @@ class CalledProcessError(Exception): + # A user should be able to simply copy and paste the command that failed + # into their shell. + copyable_command = '( cd {}; {} )'.format(os.path.abspath(self.cwd), +- ' '.join(map(pipes.quote, self.args))) ++ printed_cmd) + return 'Command failed: {}\n{}'.format(copyable_command, self.output) + + diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.16.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.16.9999.ebuild index eb2dc1c5..fba6c318 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.16.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.16.9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 PATCHSET="${PN}-5.15.14_p20240510-patchset" -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE="xml(+)" inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs @@ -12,7 +12,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic HOMEPAGE="https://www.qt.io/" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm64" if [[ ${PV} == ${QT5_PV}_p* ]]; then SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz" S="${WORKDIR}/${P}" @@ -103,6 +103,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.15.14_p20240510-re2.patch" # bug 913923 "${FILESDIR}/${PN}-5.15.14_p20240510-gcc15-cstdint.patch" "${FILESDIR}/${PN}-5.15.14_p20240510-gcc15-template-id-cdtor.patch" + "${FILESDIR}/${PN}-5.15.16_p20241115-py3.13-pipes.patch" # thx to Fedora ) python_check_deps() { @@ -198,7 +199,7 @@ src_prepare() { # src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++` if tc-is-clang ; then - if has_version 'sys-devel/clang[default-libcxx(-)]' || has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then + if has_version 'llvm-core/clang[default-libcxx(-)]' || has_version 'llvm-core/clang-common[default-libcxx(-)]' ; then eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch" fi fi |