From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 998E11581F0 for ; Wed, 11 Dec 2024 20:43:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 783F9E0D3E; Wed, 11 Dec 2024 20:43:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6097E0D3E for ; Wed, 11 Dec 2024 20:43:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A0EDD343085 for ; Wed, 11 Dec 2024 20:43:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D56161EC5 for ; Wed, 11 Dec 2024 20:43:19 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1733949619.5bf25a240fda3b8f4b120e544378cad0a95b2c30.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-5.15.16_p20241115-py3.13-pipes.patch dev-qt/qtwebengine/qtwebengine-5.15.16.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5bf25a240fda3b8f4b120e544378cad0a95b2c30 X-VCS-Branch: master Date: Wed, 11 Dec 2024 20:43:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d43dadf2-b383-4f1f-b404-f145a72af4f3 X-Archives-Hash: 2af01a0db1306817a0c4933d7b66cd20 commit: 5bf25a240fda3b8f4b120e544378cad0a95b2c30 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Dec 11 20:37:52 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 11 20:40:19 2024 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5bf25a24 dev-qt/qtwebengine: pkgmove sys-devel/clang => llvm-core/clang Sync w/ ::gentoo in general and enable py3.13 here too. Signed-off-by: Andreas Sturmlechner gentoo.org> ...qtwebengine-5.15.16_p20241115-py3.13-pipes.patch | 21 +++++++++++++++++++++ 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