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 6B896158089 for ; Wed, 8 Nov 2023 19:48:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 971552BC016; Wed, 8 Nov 2023 19:48:06 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 53CB12BC019 for ; Wed, 8 Nov 2023 19:48:06 +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 84D22335CEE for ; Wed, 8 Nov 2023 19:48:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C85CE1338 for ; Wed, 8 Nov 2023 19:48:03 +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: <1699472837.a7e55d393b2d0d450d3ec950770f32f9fb3e8b13.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a7e55d393b2d0d450d3ec950770f32f9fb3e8b13 X-VCS-Branch: master Date: Wed, 8 Nov 2023 19:48:03 +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: 76d948f3-d0c6-4521-a773-26b7c03aa1c1 X-Archives-Hash: fcae1c84e34933e223eaea0bc3a26033 commit: a7e55d393b2d0d450d3ec950770f32f9fb3e8b13 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 8 19:44:30 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 8 19:47:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e55d39 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_p20231102.ebuild | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild index 3d0bb168f1bc..6839c81f4377 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.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