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 E492A158020 for ; Tue, 29 Nov 2022 19:19:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31C2FE084A; Tue, 29 Nov 2022 19:19:55 +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 10048E084A for ; Tue, 29 Nov 2022 19:19:55 +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 25ABB34133B for ; Tue, 29 Nov 2022 19:19:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7BE5973C for ; Tue, 29 Nov 2022 19:19:52 +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: <1669749552.62ba24237fdbbb0585de46780bc15c4bfe6fc920.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 62ba24237fdbbb0585de46780bc15c4bfe6fc920 X-VCS-Branch: master Date: Tue, 29 Nov 2022 19:19:52 +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: ed98cecd-1019-4ceb-931b-8abecd58cc7b X-Archives-Hash: 45685d5477e8bfb0123bef19237c4d0d commit: 62ba24237fdbbb0585de46780bc15c4bfe6fc920 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Sep 8 09:34:47 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Nov 29 19:19:12 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=62ba2423 qt5-build.eclass: Set _QT5_GENTOOPATCHSET_REV=2 for >=Qt5Base-5.15.7 Apply gentoo-patchset before running sed over configure. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 0825d311..d4b1d0f7 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -123,7 +123,14 @@ if [[ ${PN} != qtwebengine ]]; then fi if [[ ${QT5_MODULE} == qtbase ]]; then - _QT5_GENTOOPATCHSET_REV=1 + case ${PV} in + 5.15.5) + _QT5_GENTOOPATCHSET_REV=1 + ;; + *) + _QT5_GENTOOPATCHSET_REV=2 + ;; + esac SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz" fi @@ -182,6 +189,8 @@ qt5-build_src_prepare() { if [[ ${QT5_MODULE} == qtbase ]]; then qt5_symlink_tools_to_build_dir + [[ -n ${_QT5_GENTOOPATCHSET_REV} ]] && eapply "${WORKDIR}/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}" + # Avoid unnecessary qmake recompilations sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \ -e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)" @@ -201,8 +210,6 @@ qt5-build_src_prepare() { # Respect build variables in configure tests (bug #639494) sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die - - [[ -n ${_QT5_GENTOOPATCHSET_REV} ]] && eapply "${WORKDIR}/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}" fi [[ -n ${QT5_KDEPATCHSET_REV} ]] && eapply "${WORKDIR}/${QT5_MODULE}-${PV}-gentoo-kde-${QT5_KDEPATCHSET_REV}"