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 CA321158091 for ; Wed, 15 Jun 2022 17:20:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E30D7E08FE; Wed, 15 Jun 2022 17:20:19 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C9397E08FE for ; Wed, 15 Jun 2022 17:20: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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1645341EE1 for ; Wed, 15 Jun 2022 17:20:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3551A4F7 for ; Wed, 15 Jun 2022 17:20: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: <1655230852.dfaa1f6e860d5bcf3ab1d9a930baedae1bdb6d73.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: dfaa1f6e860d5bcf3ab1d9a930baedae1bdb6d73 X-VCS-Branch: master Date: Wed, 15 Jun 2022 17:20: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: 153e97f6-25e0-43ac-8cc2-2d42faa4d2fb X-Archives-Hash: af0eebeeff96f09d0a3aba1f0e9d61ab commit: dfaa1f6e860d5bcf3ab1d9a930baedae1bdb6d73 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 14 11:39:45 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 14 18:20:52 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=dfaa1f6e qt5-build.eclass: Add _QT5_GENTOOPATCHSET_REV qtbase patchset logic Usage may be extended to other QT5_MODULEs in the future. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 2272e2e2..39a72e57 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -63,6 +63,13 @@ readonly QT5_PV # The upstream package name of the module this package belongs to. # Used for SRC_URI and S. +# @ECLASS_VARIABLE: _QT5_GENTOOPATCHSET_REV +# @DEFAULT_UNSET +# @INTERNAL +# @DESCRIPTION: +# Gentoo downstream patchset version applied over qtbase. Used for SRC_URI and +# applied in src_prepare. + # @ECLASS_VARIABLE: QT5_TARGET_SUBDIRS # @DEFAULT_UNSET # @DESCRIPTION: @@ -115,6 +122,11 @@ if [[ ${PN} != qtwebengine ]]; then esac fi +if [[ ${QT5_MODULE} == qtbase ]] && [[ ${PV} == 5.15.[4-9]* ]]; then + _QT5_GENTOOPATCHSET_REV=1 + SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz" +fi + # @ECLASS_VARIABLE: QT5_BUILD_DIR # @OUTPUT_VARIABLE # @DESCRIPTION: @@ -189,6 +201,8 @@ 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}"