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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 393FD15814C for ; Sat, 11 Nov 2023 20:24:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 817522BC06D; Sat, 11 Nov 2023 20:24:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 6BDB92BC06D for ; Sat, 11 Nov 2023 20:24:19 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B62A5335D98 for ; Sat, 11 Nov 2023 20:24:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4EF351336 for ; Sat, 11 Nov 2023 20:24:17 +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: <1699733926.6118791cd73fe2d17e693bfddecfde3011c2dcaf.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6118791cd73fe2d17e693bfddecfde3011c2dcaf X-VCS-Branch: master Date: Sat, 11 Nov 2023 20:24:17 +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: 0fa03e6d-6837-471c-af97-7701b3d50d6d X-Archives-Hash: ad835322df7796d49ec4c8cfc70098e4 commit: 6118791cd73fe2d17e693bfddecfde3011c2dcaf Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 8 19:44:30 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 11 20:18:46 2023 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6118791c dev-qt/qtwebengine: Apply ppc64 patches after eapply_user Thanks-to: Marcus Comstedt mc.pp.se> Closes: https://bugs.gentoo.org/910218 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild index 8adabbf0..3911bd56 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.11.9999.ebuild @@ -208,9 +208,6 @@ src_prepare() { qt_use_disable_mod widgets widgets src/src.pro - qt5-build_src_prepare - - # we need to generate ppc64 stuff because upstream does not ship it yet if use ppc64; then einfo "Patching for ppc64le and generating build files" eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch" @@ -218,6 +215,13 @@ src_prepare() { eapply -p0 "${WORKDIR}/${PN}-ppc64le" eapply -p1 "${WORKDIR}/${PN}-ffmpeg-ppc64le" popd > /dev/null || die + fi + + qt5-build_src_prepare + + # we need to generate ppc64 stuff because upstream does not ship it yet + if use ppc64; then + einfo "Generating ppc64le build files" pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die mkdir -vp source/config/linux/ppc64 || die mkdir -p source/libvpx/test || die